Changes to eliminate inconsistent PostgresDataStore construction.