Sundry changes to work with pre-release Emacs 24.4