We're not seeing eye to eye here yet, since I don't accept your example scenario and you don't accept mine. Let's keep discussing. Meanwhile, here's an updated patch.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных