Remove more java 7 generics.