Meanwhile any feedback on the idea of pushing all of this
consolidation and cleanup work through one of our trees
instead of having all of these difficult dependencies
between the two?

I'll leave that between you, paulus and stephen as I'm working on
something else at the moment :-)

Ben.