Java 5 --> Java 7 for diamond types. Can be reverted if necessary.