Another checkpoint for major editor refactor.