Patch Set 2: Looks good to me, approved; IP review completed

Fixed up commit message typos, and tried to shorten the code a bit by reducing unnecessary constructs.  Robin, if you are OK with this, please submit it.