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

(4 inline comments)

I'm almost happy with this.  A couple of style nits, and two bugs that should be fixed, and then we can get PMC approval to merge it.