Editor: More simplification.