Cleaned up WhereConditionWrapper