Ping!  Divya, could you please try Stefan's suggestions and report
back?
FWIW, I think the change is an improvement in any case, so we could
install it.  Since it's in a "core" file, it might be too risky for
`emacs-30`, so I'm thinking of installing it in `master`, WDYT?
Fine by me, thanks.

Pushed to `master`, thanks.


        Stefan