Hi,

Here is a new version of the patch that I hope addresses all of your
comments Stefan.