Improve selection of correct editing support.

Change-Id: Icc2da08c2bd329d111f4ddd0e36bab0853084244