Ensure compatibility with emacs23 (and maybe less)