Remove some redundant generics.