diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index b3120502..71d074eb 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -516,12 +516,10 @@ class PythonParser(GenericASTBuilder):
 
         mapexpr ::= BUILD_MAP kvlist
 
-        kvlist ::= kvlist kv
         kvlist ::= kvlist kv2
         kvlist ::= kvlist kv3
         kvlist ::=
 
-        kv ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
         kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
         kv3 ::= expr expr STORE_MAP
 
diff --git a/uncompyle6/parsers/parse21.py b/uncompyle6/parsers/parse21.py
index 7e52626a..179c900e 100644
--- a/uncompyle6/parsers/parse21.py
+++ b/uncompyle6/parsers/parse21.py
@@ -20,6 +20,9 @@ class Python21Parser(Python22Parser):
         forstmt   ::= SETUP_LOOP expr _for designator
                       l_stmts_opt _jump_back
                       POP_BLOCK COME_FROM
+
+        kvlist ::= kvlist kv
+        kv     ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
         """
 
     def p_import21(self, args):