Patch Set 2: I would prefer that you didn't submit this

This needs work before it should be considered for merge or even significant review.  I just want to have it out as a way to test subtree split/rewrite on the command line.