[emacs] Make this a bit more robust (I hope).