I think it's fine the way it is, with regards to v10 check. Can you post a rebased patch?
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных