OK, I've updated the patch per your suggestions. I've also made 
the commit apply to the emacs-28 branch, as opposed to the master 
branch.