Yet more work on the parse tree...