Removed several instances of type parameters hiding existing ones.

Change-Id: Ic219274e65f4f2febc24769e4b924582f47f8ef2