Here is a revised patch with all requested changed.

I changed the modifier to /m.  I know it was only a suggestion
Michael, but it grew on me.

Ok to check in?