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

This looks pretty good.  Most of my comments are style nits,
the actual way its put together is fairly elegant.

If you fix the style nits, I think its ready for inclusion.