psql: minor syntax changes