Moved things around in preparation for subtree split