Change logic to avoid a 1.6 compiler bug that doesn't properly handle generics. Eclipse compiler and JDK > 1.6 work properly, even with target runtime = 1.6, so I didn't see it locally. had to compile with the same version of the JDK as the build machine to see the problem.