Switch to Java 7 style inferred generic arguments for constructors