Patch Set 2: Looks good to me, but someone else must approve

(3 inline comments)

Looks good to me, only some minor things in formatting that I would do differently (see inline comments). Please feel free to ignore them.