SERVER-6405: trivial prep cleanup of Database class