Emacs bindings improved.
Refactoring.