I'll plan to push this tomorrow with the above change (and a few additional comments to explain what all is going on..).
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных