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

Seems this change is independent of the other ones in the series and could be applied at any time. (Just an observation, not a suggestion)