Editor: Yet more refactoring.