Move ffip back to C-o now that we have C-x C-j.
More fully diminish lots of modes.
Use undo-tree globally.