Thanks for the quick reply. That fix (and reasoning) makes sense to me. For what it's worth, the patch looks good to me as well.
pgsql-bugs by date:
Соглашаюсь с условиями обработки персональных данных