Unified CBL_QueryRow with CBLQueryRow

More simplification/refactoring!