Preparing to refactor out Predicate and PredicateList.