[emacs] fix up a few defer-related issues