A couple of tweaks to improve tree output.