Changed AST structures from list2 to tree2 so retain original structure needed for parsing.