Change handling of manual dictionary keys

bootstrap/MvK_rules.mvc

@@ -441,7 +441,6 @@ Rule Call_Call_Params_N8 {
         value = "'call'"
     }
     Match N8_15 {}
-    Create N8_16 {}
 
     MatchEdge (N8_0, N8_1) {
         value = "username"
@@ -494,9 +493,8 @@ Rule Call_Call_Params_N8 {
     MatchEdge (N8_12, N8_11) {
         value = "'params'"
     }
-    CreateEdge (N8_15, N8_16) {}
+    CreateEdge N8_16 (N8_15, N8_10) {}
     CreateEdge (N8_16, N8_9) {}
-    CreateEdge (N8_16, N8_10) {}
 }
 
 Rule Call_Params_First_Multi_N9 {
@@ -708,7 +706,6 @@ Rule Call_Params_Last_N11 {
     Match N11_5 {}
     Match N11_6 {}
     Match N11_7 {}
-    Create N11_8 {}
     Create N11_9 {}
     Match N11_10 {}
     Match N11_11 {}
@@ -778,8 +775,6 @@ Rule Call_Params_Last_N11 {
     MatchEdge (N11_6, N11_7) {
         value = "a"
     }
-    CreateEdge (N11_8, N11_7) {}
-    CreateEdge (N11_8, N11_9) {}
     CreateEdge (N11_9, N11_10) {
         value = "'value'"
     }
@@ -804,7 +799,8 @@ Rule Call_Params_Last_N11 {
     CreateEdge (N11_18, N11_17) {
         value = "'prev'"
     }
-    CreateEdge (N11_20, N11_8) {}
+    CreateEdge N11_8 (N11_20, N11_9) {}
+    CreateEdge (N11_8, N11_7) {}
 }
 
 Rule Call_Params_Next_N12 {
@@ -816,7 +812,6 @@ Rule Call_Params_Next_N12 {
     Match N12_5 {}
     Match N12_6 {}
     Match N12_7 {}
-    Create N12_8 {}
     Create N12_9 {}
     Match N12_10 {}
     Match N12_11 {}
@@ -884,8 +879,6 @@ Rule Call_Params_Next_N12 {
     MatchEdge (N12_6, N12_7) {
         value = "a"
     }
-    CreateEdge (N12_8, N12_7) {}
-    CreateEdge (N12_8, N12_9) {}
     CreateEdge (N12_9, N12_10) {
         value = "'value'"
     }
@@ -901,7 +894,6 @@ Rule Call_Params_Next_N12 {
     MatchEdge (N12_12, N12_11) {
         value = "'next_param'"
     }
-    CreateEdge (N12_13, N12_8) {}
     CreateEdge (N12_15, N12_17) {
         value = "'prev'"
     }
@@ -911,6 +903,8 @@ Rule Call_Params_Next_N12 {
     CreateEdge (N12_17, N12_19) {
         value = "'inst'"
     }
+    CreateEdge N12_8 (N12_13, N12_9) {}
+    CreateEdge (N12_8, N12_7) {}
 }
 
 Rule Call_Resolve_No_Params_N13 {