Tweaks to trees that were caused by parser rewriting