postgresql84: A bit more cleanup
Merge pull request #302 from pyhalov/postgresql84

postgresql84: A bit more cleanup