Thank you for pointing that. Sure, both cases are better. I've added second case as well as comments. Patch is attached.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных