Be more careful in M-o handling.  See Issue #108