The attached patch seems reasonable and works nicely for me. Happy to modify it if necessary.

-Steve