postgresql84: A bit more cleanup