Fixing Java 7 diamond notation