Would you mind adding a comment with this link in it to the code?  These are the kinds of things you need to document or the next maintainer forgets and removes it :)

After that, looks great for merging.  Thanks for the fix!