Fix build failure due to use of diamond operating in Java6 version.