! Yet more Postgres fixes (including fixing stuff I inadvertantly broke in #1004).

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>