> Yes, that does seem to fail.
 >
 > You're anticipating this will be fixed by the broader changes you alluded
 > to earlier?

Yes.  So please remove that one-line change from Emacs 26.  I'll post
the new patch here in a few days, against Emacs 27.  Maybe you can
upgrade then.

Thanks for testing, martin