[Thanks for the ping. Without it, i would probably not be aware of the message
which was primarily intented for me, since I'm not (at the present) following the
bug tracker list. Next time, you can add me to the special X-Debbugs-CC: header]
To your patch, I think it is quite acceptable. I've pushed it to emacs-29.
I'll keep the bug open, since there is also the second problem which I still don't
quite understand, but it looks like a bug, too. But I think I have enough information
to investigate on my own for now.
João