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

(5 inline comments)

Incomplete review, but I have a feeling some of my comments might be more general across the classes, and its dinner time, so I'm giving up early...