Redo a bit about how parse tree is structured