Improve consistency of new editor events