Cleanup based on feedback from #emacs
Cleanup of elisp.