[BZ 1069545] More updates to the tree build structure.