Minor internal fixes to OData::Query::Criteria.