On top of emacs-28 branch (49a14c4375ce4c2c).

The fix is "minimal", in the sense that it doesn't try to refactor/modify unrelated code.

-- 
Olivier Certner