Upgrade to new PGSQL_USES