[JDK6] Remove diamond brackets