diff --git a/com.ibm.wala.cast/source/c/include/cast_constants.h b/com.ibm.wala.cast/source/c/include/cast_constants.h
index a06123acf..bf052f6f7 100644
--- a/com.ibm.wala.cast/source/c/include/cast_constants.h
+++ b/com.ibm.wala.cast/source/c/include/cast_constants.h
@@ -87,6 +87,13 @@ _CAstNodeType(IS_DEFINED_EXPR);
 _CAstNodeType(INCLUDE)
 _CAstNodeType(NAMED_ENTITY_REF);
 _CAstNodeType(MACRO_VAR);
+_CAstNodeType(COMPREHENSION_EXPR);
+_CAstNodeType(NEW_ENCLOSING);
+_CAstNodeType(NARY_EXPR);
+_CAstNodeType(SPECIAL_PARENT_SCOPE);
+_CAstNodeType(YIELD_STMT);
+_CAstNodeType(FORIN_LOOP);
+_CAstNodeType(TYPE_LITERAL_EXPR);
 
 #undef _CODE_CONSTANTS
 #undef _CPP_CONSTANTS
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java
index 0b966ace0..4f91230e9 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java
@@ -37,7 +37,7 @@ public final class ConstantKey<T> implements InstanceKey {
   public boolean equals(Object obj) {
     if (obj instanceof ConstantKey) {
       ConstantKey other = (ConstantKey) obj;
-      return value == null ? other.value == null : value.equals(other.value);
+      return valueClass.equals(other.valueClass) ? (value == null ? other.value == null : value.equals(other.value)) : false;
     } else {
       return false;
     }