Factor predicate expression types into a separate file