Handle difference between Emacs 23/24.