Renaming Predicate.evaluate() to Predicate.test(). Minor refactoring.