Hello,

Here is a simplification of the last patch.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738