Version two of the patches attached.
-- 
PGP and more: https://people.pragmatique.xyz/ng0/