API refactoring for the tree is (tentatively) complete.