Now that predicates can be composed, simplify several of