Java 7 upgrade: Remove redundant generic type specifications