fixes latest pull request

* override treeBuilder in less intrusive way
* use better equivalent of makeAnonymousNew