More Java 7 generics warnings cleanup