More work on editor infrastructure.