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

(1 inline comment)

LGTM, but I think there is a redundant line of code here that we can safely remove.  I assume you will be doing a subsequent change to handle racily clean stuff.