If pg_upgrade is in contrib now, how about removing the relevant filesfrom the main code? They're already obsolete, no?
regards, tom lane