Moving to Java7 generic syntax.