Splitting out emacs v24 stuff.