Further Emacs retransitioning