Editor: More rework.