... btw, the buildfarm says you forgot contrib/ while fixing thecollateral damage from these changes.
regards, tom lane