More cleanup in tree dupl

That's complexity's last bastion... and it's under siege!