Tweak psql parsing.