Simplify TreeWalker some more