Misc cleanups on ext_tx expt.

Change-Id: I599d9fb00a2accdf24def65df52bef56d014a0b6