refactor name change of with-all-predicates to all-predicates?, same for with-any-predicates