> If this isn't the right approach I am happy to rework the patch to
> better match the rest of the software.

Thanks for pointing out this issue and for the patch!  I don't know what
Carsten will do with this, but having two solutions is certainly good :)

Best,

-- 
Bastien