Use diamond operator

Java 7 introduces the "[diamond operator](http://docs.oracle.com/javase/7/docs/technotes/guides/language/type-inference-generic-instance-creation.html)" that makes code with generics less verbose. The code base claims to be Java 8 but does not seem to make use of the diamond operator.