jks@iki.fi (Jouni K. Seppänen) writes:

> I'll take another look at this once I have some more time.

Here's an updated patch.