Simplify the recent refactoring of TreeT