Cleaned up PostgreSQL syntax even more.