More work towards prepared statements
Slightly cleaner types for PGQuery