[BZ 1069545] Updates to the tree build structure.