Change 'eligibleForCleanup' to use the conjunction of cleanup predicates, not disjunction