Eliminate use of DataTreeFactory.create(TreeType)