Adapt to reworked editing support.

Change-Id: Ifb1dbd40f2ec521a7631f005017ad2fc7c31997e