Began refactoring OData::Query.