Make some small adjustments to the "listDatabases" change. See #822.