More changes to include Emacs before v. 24