Cleanup and key bindings fixes in init.el.