More work on the parse tree