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

(10 inline comments)

worked on some of your comments. Can't propose that new version yet but still wanted to tell you about which things are done and where I have questions.