> another attempt...

Committed as a combination of your previous and present patch.  Please
have a look.

Thanks, martin