Frediano and I had a slight collision in patch processing. This set of three patches should build on the patches he committed to bring the tree to the state intended by the last patch series.