Start switching over the code to using new tree directive.