Hi Denis,

>
> I went ahead and applied both patches, but I reworked the 
> implementation afterward.  I tried to explain the reasoning in the 
> commit message, let me know if I succeeded :) 

I would have preferred to get comments on the patches.

Tomasz