Stephen Berman <stephen.berman@gmx.net> writes:

[...]

> I hope you haven't spent time on that yet, because it occurred to me
> that the following patch might suffice:

:-D I did not spend to much time but, in the mean time, came up with
this one: