Add cyclic forward dependency handling (minus predicate deps)