Added more node types to the tree walker.