>These are unrelated changes, so please don't mix them with the changes
>that really fix the problem at hand.
I am sorry tha's my fault.  I should always do atomic changes.

>It is up to the user to type a correct command, and Emacs
>shouldn't try second-guessing those commands.  So let's only remove a
>single instance of these characters at the end, as the original code
>did.
I was 'baby sitting' the user (and my self). Yeah, too much care, 
Emacs users can protect themselves very well ;-)

Attached atomic commits without the extra care.