Introduce PredicateAdder and refactor XxxSelectorBuilder.