Current parse tree is mostly derived from the grammar rather than having any though put into it.
Would be nicer to have a more logical parse tree as an officially supported part of the API, for people who want to modify it or add other output formats.