Cleanup in preparation for editor consolidation/refactor.