This trims down the code, and is in preparation for hardening pg_upgrade against auto-oid assignment.
Attach a file by drag & drop or click to upload
