Removed 2 more occurrences of the PostgreSQL 9.1+ format() function