Emacs: Fixes for execution-model.