Fix generics calls that javac couldn't compile.