Adapt to reworked editing support.

Change-Id: Ifd7aac59802154e80be4245db77045acabc8e9f0