Thanks for the feedback. 

What I emailed earlier was just a buffer diff.

I'll convert that to a proper commit with comments and commit message, and commit.

    Btw this is safe enough to commit to maint?

Thanks.