Fix Issue #117 again.  Now the shortcuts work.  Worry about anything
with M-O though...