This patch reduces some unsightly #ifdefs, and fixes two typos incomments in the psql code. This doesn't make any functional change, sofeel free to save it for 7.5
-Neil