diff --git a/semantics/cpp/language/common/class.k b/semantics/cpp/language/common/class.k
index 124d2091b..af92f596d 100644
--- a/semantics/cpp/language/common/class.k
+++ b/semantics/cpp/language/common/class.k
@@ -35,9 +35,11 @@ module CPP-CLASS-BASIC-SYNTAX
 
      syntax Class ::= ClassQualifier "::" ClassSpecifier [klabel(classId)]
 
-     // TODO(chathhorn): commenting these out because they seem to be redundant (with the above production for Class)
-     // and cause parsing ambiguities.
-     syntax InnerClass ::= Class // TODO(chathhorn): added by me to replace the stuff below.
+     // TODO(chathhorn): the stuff below causes parsing ambiguities with the Class production above. Need to resolve in
+     // a better way.
+     syntax InnerClass ::= Class // TODO(chathhorn): added as an interim fix.
+     syntax LocalInnerClass ::= Class // TODO(chathhorn): added as an interim fix.
+
      // syntax LocalClass ::= LocalQualifier "::" ClassSpecifier [klabel(classId)]
 
      // syntax Class ::= LocalClass