Hi,

Here is a new version of the patch that, I think, addresses all the
issues raised by Stefan.