Also made the variables introduced with the psql client consistent with the existing ones. Fixes #1208