Fix subtree tagging.