I've pushed the patch on the wip-ring branch, it seems to work.
Let me know if you think it's read to merge onto master.

-- 
Pierre Neidhardt
https://ambrevar.xyz/