Fix generics for java6 inference