> Thanks for the hints! Two-part v12 attached fixes these.
Here is a v13, which is just a rebase after 1aba62ec.
-- Fabien.