Use diamond notation for ClassValue subclass