"Paul D. Nelson" <ultrono@gmail.com> writes:

>
> The attached patch addresses the issue for me.  Thoughts?
>

Here's a more complete version, addressing related issues.  This feels a
bit like plugging a leak with a band-aid, so other suggestions would
also be welcome.