Mark Mitchell agreed this seemed like the right fix go, so I went ahead and prepared this patch (that I took the liberty to attribute to you; I hope you don't mind :-), that I'm bootstrapping as I write this. It does indeed fix this particular bug report. Ok to install in branch and mainline if bootstrap succeeds?