Merge "Refactor code to make predicates negatable"