Removing Emacs 21 compatibility code as it fails to compile on Emacs 24. Feel free to add code that works for both version if you still need support for Emacs 21.