Refine key-bindings.el and related stuff