Adapt to reworked editing support.

Change-Id: Ifb4b4071742bd1013a970f49e6cca5f7e48712da