WINDUP-113: Simplified CriteriaBuilders into unified Query API.