Simplify this pass by using a depth-first iterator to ensure that all