Java 7-ify the generics.