Also kill ExtensionTarget indirection causing duplication.

Change-Id: I24f7e6d85df6acf2ededaade20dd1a788d916594