Did away with some generics silliness.