In the future, I'd ask for two separate patch files for these different files' 
changes; they were not terribly related, so could be split out.

But life is short; shipping this for now!