> I don't think I have a clear idea of what is being proposed for
 > emacs-26.

I propose the attached changes.

martin