Add in type to diamonds to bring back Java 1.7 support.