Some elisp improvements