Simplify predicate enum handling