Beginning of age predicate refactoring, but test failing.