Editor: Yet more rework.