I had forgotten until I reread Lundh's note. I made the same assumption about 'master window'. Certainly 'conservative' is safest. Lita has not posted a patch, but since she is a (paid) summer intern (until mid August), I expect she will. If not, you can help finish this off before the next release cycle, which should be at least 3 months away. If you notice that nothing has happened by mid-August, please ping either or both issues.