rework predicate visitors to simplify