Hi Maxim,

a follow-up to my previous reply containing my proposal materialised to
a patch.