fix expression_tree_walker