Adapt to changes in editing support.

Change-Id: Iaca3d10a65d6c4f61d9445abc4f011e8343bb589