Refactoring entity predicates to be functors instead of
static function objects.