Convert to M() and CX() macros. Then swap M and C-X.
All the C-X bindings are now inline.