Patch Set 1: (3 inline comments)

looks quite good, I have only minor comments.

Shawn I don't understand your comment. These commands normally don't print somewhere and I also don't see a todo for that in this change