pg_dump and pg_restore -r had managed to diverge on the ordering of

different object types.  Fix, and centralize logic to try to prevent
the same mistake in future.