More work on parameterized queries, all tests for repos passing now.