more elisp-speaking bugfixes