Remove magic consistency predicates
Replaced FunctionalSet with Guava ImmutableSet