Per discussion on-hackers. psql is converted to use the new code.

Follows a suggestion from Heikki Linnakangas.