Implemented OData::Query.
Fixed OData::Query to handle collections correctly.
Refactored some internal OData::EntitySet methods to rely on OData::Query.