#1479 need to look at value, not key

value-fixture/src/org/immutables/fixture/generics/MultimapSafeVarargs.java

@@ -0,0 +1,22 @@
+package org.immutables.fixture.generics;
+
+import com.google.common.collect.Multimap;
+import org.immutables.value.Value;
+
+@Value.Enclosing
+public interface MultimapSafeVarargs {
+  @Value.Immutable
+  interface ParamKey {
+    Multimap<Val<String>, String> vals();
+  }
+  @Value.Immutable
+  interface ParamVal {
+    Multimap<String, Val<String>> vals();
+  }
+  @Value.Immutable
+  interface ParamBoth {
+    Multimap<Val<String>, Val<String>> vals();
+  }
+
+  interface Val<T> {}
+}

value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java

@@ -993,7 +993,8 @@ public boolean hasTypeAnnotations() {
   }
 
   public boolean isNonRawElementType() {
-    return getElementType().indexOf('<') > 0;
+    List<String> args = typeParameters();
+    return !args.isEmpty() && args.get(args.size() - 1).indexOf('<') > 0;
   }
 
   public boolean isNonRawSecondaryElementType() {