This version of the patch looks not entirely unreasonable to me. I'll set this as Ready for Committer in case David or Tom or someone else want to have a look and potentially commit it.
-- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/
