Add a new generic CompareOperator enum and use it instead of the filter CompareOp enum everywhere BUT inside CompareFilter.