> If a simpler fix is less clean, we could install a simpler change on
> emacs-29 and a cleaner one on master.

And this for master, once the patch above is merged: