Using Java 7's Diamond again