Hopefully fix the Emacs 23 breakage