Minor tree refactoring.