diff --git a/tools/test/p4src/p4-16/default.p4 b/tools/test/p4src/p4-16/default.p4
index 302d068..b977d91 100644
--- a/tools/test/p4src/p4-16/default.p4
+++ b/tools/test/p4src/p4-16/default.p4
@@ -34,7 +34,7 @@
     direct_counter(CounterType.packets) table0_counter;
     direct_counter(CounterType.packets) ecmp_counter;
 
-    action do_ecmp(inout metadata_t meta, ecmp_group_id_t ecmp_group_id) {
+    action do_ecmp(ecmp_group_id_t ecmp_group_id) {
         meta.ecmp_group_id = ecmp_group_id;
     }
 
@@ -53,16 +53,16 @@
         actions = {
             set_egress_port(standard_metadata);
             send_to_cpu(standard_metadata);
-            do_ecmp(meta);
+            do_ecmp();
             drop(standard_metadata);
         }
         counters = table0_counter;
+        default_action = drop(standard_metadata);
     }
 
     action_selector(HashAlgorithm.crc16, 32w64, 32w16) ecmp_selector;
     table ecmp {
         support_timeout = false;
-
         key = {
             meta.ecmp_group_id             : exact;
             // Not for matching.
diff --git a/tools/test/p4src/p4-16/p4c-out/default.json b/tools/test/p4src/p4-16/p4c-out/default.json
index 94f2125..c35cf25 100644
--- a/tools/test/p4src/p4-16/p4c-out/default.json
+++ b/tools/test/p4src/p4-16/p4c-out/default.json
@@ -39,18 +39,8 @@
       ]
     },
     {
-      "name" : "intrinsic_metadata_t",
-      "id" : 2,
-      "fields" : [
-        ["ingress_global_timestamp", 32, false],
-        ["lf_field_list", 32, false],
-        ["mcast_grp", 16, false],
-        ["egress_rid", 16, false]
-      ]
-    },
-    {
       "name" : "ethernet_t",
-      "id" : 3,
+      "id" : 2,
       "fields" : [
         ["dstAddr", 48, false],
         ["srcAddr", 48, false],
@@ -59,7 +49,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 4,
+      "id" : 3,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -77,7 +67,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 5,
+      "id" : 4,
       "fields" : [
         ["srcPort", 16, false],
         ["dstPort", 16, false],
@@ -94,7 +84,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 6,
+      "id" : 5,
       "fields" : [
         ["srcPort", 16, false],
         ["dstPort", 16, false],
@@ -104,7 +94,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 7,
+      "id" : 6,
       "fields" : [
         ["egress_port", 9, false],
         ["_padding_0", 7, false]
@@ -112,11 +102,21 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 8,
+      "id" : 7,
       "fields" : [
         ["ingress_port", 9, false],
         ["_padding_1", 7, false]
       ]
+    },
+    {
+      "name" : "intrinsic_metadata_t",
+      "id" : 8,
+      "fields" : [
+        ["ingress_global_timestamp", 32, false],
+        ["lf_field_list", 32, false],
+        ["mcast_grp", 16, false],
+        ["egress_rid", 16, false]
+      ]
     }
   ],
   "headers" : [
@@ -149,71 +149,64 @@
       "pi_omit" : true
     },
     {
-      "name" : "meta_1_intrinsic_metadata",
-      "id" : 4,
-      "header_type" : "intrinsic_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
-    },
-    {
       "name" : "scalars",
-      "id" : 5,
+      "id" : 4,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 6,
+      "id" : 5,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 7,
+      "id" : 6,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 8,
+      "id" : 7,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 9,
+      "id" : 8,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 10,
+      "id" : 9,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 11,
+      "id" : 10,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 12,
+      "id" : 11,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intrinsic_metadata",
-      "id" : 13,
+      "id" : 12,
       "header_type" : "intrinsic_metadata_t",
       "metadata" : true,
       "pi_omit" : true
@@ -225,12 +218,12 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6]
   ],
   "enums" : [],
   "parsers" : [
@@ -410,7 +403,7 @@
       "name" : "deparser",
       "id" : 0,
       "source_info" : {
-        "filename" : "./include/parsers.p4",
+        "filename" : "include/parsers.p4",
         "line" : 64,
         "column" : 8,
         "source_fragment" : "DeparserImpl"
@@ -436,7 +429,7 @@
       "name" : "port_counters_control.egress_port_counter",
       "id" : 2,
       "source_info" : {
-        "filename" : "./include/port_counters.p4",
+        "filename" : "include/port_counters.p4",
         "line" : 22,
         "column" : 38,
         "source_fragment" : "egress_port_counter"
@@ -448,7 +441,7 @@
       "name" : "port_counters_control.ingress_port_counter",
       "id" : 3,
       "source_info" : {
-        "filename" : "./include/port_counters.p4",
+        "filename" : "include/port_counters.p4",
         "line" : 23,
         "column" : 38,
         "source_fragment" : "ingress_port_counter"
@@ -484,7 +477,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -503,7 +496,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -522,7 +515,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -541,7 +534,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -560,7 +553,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -579,7 +572,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -598,7 +591,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -617,7 +610,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -636,7 +629,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -655,7 +648,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -674,7 +667,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -693,7 +686,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -712,7 +705,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -731,7 +724,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -750,7 +743,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -769,7 +762,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -788,7 +781,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -807,7 +800,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 27,
             "column" : 4,
             "source_fragment" : "standard_metadata.egress_spec = port"
@@ -826,7 +819,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -845,7 +838,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -864,7 +857,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -883,7 +876,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -902,7 +895,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -921,7 +914,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -940,7 +933,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -959,7 +952,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -978,7 +971,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -997,7 +990,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1016,7 +1009,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1035,7 +1028,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1054,7 +1047,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1073,7 +1066,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1092,7 +1085,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1111,7 +1104,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1130,7 +1123,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1161,7 +1154,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1180,7 +1173,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1199,7 +1192,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1218,7 +1211,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1237,7 +1230,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1256,7 +1249,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1275,7 +1268,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1294,7 +1287,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1313,7 +1306,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1332,7 +1325,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1351,7 +1344,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1370,7 +1363,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1389,7 +1382,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1408,7 +1401,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1427,7 +1420,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1446,7 +1439,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1465,7 +1458,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1484,7 +1477,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 27,
             "column" : 4,
             "source_fragment" : "standard_metadata.egress_spec = port"
@@ -1503,7 +1496,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1522,7 +1515,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1541,7 +1534,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1560,7 +1553,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1579,7 +1572,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1598,7 +1591,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1617,7 +1610,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1636,7 +1629,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1655,7 +1648,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1674,7 +1667,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1693,7 +1686,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1712,7 +1705,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1731,7 +1724,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1750,7 +1743,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1769,7 +1762,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1788,7 +1781,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1807,7 +1800,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 26,
             "column" : 49,
             "source_fragment" : "standard_metadata, port_t port) { ..."
@@ -1833,7 +1826,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1852,7 +1845,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1871,7 +1864,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1890,7 +1883,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1909,7 +1902,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1928,7 +1921,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1947,7 +1940,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1966,7 +1959,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -1985,7 +1978,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2004,7 +1997,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2023,7 +2016,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2042,7 +2035,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2061,7 +2054,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2080,7 +2073,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2099,7 +2092,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2118,7 +2111,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2137,7 +2130,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2156,7 +2149,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/defines.p4",
+            "filename" : "include/defines.p4",
             "line" : 29,
             "column" : 24,
             "source_fragment" : "255; ..."
@@ -2175,7 +2168,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2194,7 +2187,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2213,7 +2206,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2232,7 +2225,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2251,7 +2244,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2270,7 +2263,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2289,7 +2282,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2308,7 +2301,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2327,7 +2320,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2346,7 +2339,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2365,7 +2358,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2384,7 +2377,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2403,7 +2396,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2422,7 +2415,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2441,7 +2434,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2460,7 +2453,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2479,7 +2472,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 22,
             "column" : 45,
             "source_fragment" : "standard_metadata) { ..."
@@ -2505,7 +2498,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2524,7 +2517,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2543,7 +2536,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2562,7 +2555,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2581,7 +2574,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2600,7 +2593,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2619,7 +2612,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2638,7 +2631,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2657,7 +2650,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2676,7 +2669,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2695,7 +2688,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2714,7 +2707,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2733,7 +2726,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2752,7 +2745,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2771,7 +2764,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2790,7 +2783,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2809,7 +2802,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2828,7 +2821,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/defines.p4",
+            "filename" : "include/defines.p4",
             "line" : 30,
             "column" : 25,
             "source_fragment" : "511; ..."
@@ -2847,7 +2840,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2866,7 +2859,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2885,7 +2878,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2904,7 +2897,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2923,7 +2916,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2942,7 +2935,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2961,7 +2954,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2980,7 +2973,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -2999,7 +2992,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3018,7 +3011,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3037,7 +3030,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3056,7 +3049,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3075,7 +3068,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3094,7 +3087,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3113,7 +3106,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3132,7 +3125,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3151,7 +3144,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/actions.p4",
+            "filename" : "include/actions.p4",
             "line" : 30,
             "column" : 38,
             "source_fragment" : "standard_metadata) { ..."
@@ -3166,14 +3159,8 @@
       "primitives" : []
     },
     {
-      "name" : "NoAction",
-      "id" : 5,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "do_ecmp",
-      "id" : 6,
+      "id" : 5,
       "runtime_data" : [
         {
           "name" : "ecmp_group_id",
@@ -3186,158 +3173,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "ingress_global_timestamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "ingress_global_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "lf_field_list"]
-            },
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "lf_field_list"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "mcast_grp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "mcast_grp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "egress_rid"]
-            },
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "egress_rid"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "ingress_global_timestamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "ingress_global_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "lf_field_list"]
-            },
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "lf_field_list"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "mcast_grp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "mcast_grp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["intrinsic_metadata", "egress_rid"]
-            },
-            {
-              "type" : "field",
-              "value" : ["meta_1_intrinsic_metadata", "egress_rid"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "default.p4",
-            "line" : 37,
-            "column" : 36,
-            "source_fragment" : "meta, ecmp_group_id_t ecmp_group_id) { ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["scalars", "metadata_t.ecmp_group_id"]
             },
             {
@@ -3348,15 +3183,15 @@
           "source_info" : {
             "filename" : "default.p4",
             "line" : 38,
-            "column" : 29,
-            "source_fragment" : "ecmp_group_id; ..."
+            "column" : 8,
+            "source_fragment" : "meta.ecmp_group_id = ecmp_group_id"
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 7,
+      "id" : 6,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3372,7 +3207,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 23,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
@@ -3382,7 +3217,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 8,
+      "id" : 7,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3424,7 +3259,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/port_counters.p4",
+            "filename" : "include/port_counters.p4",
             "line" : 27,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
@@ -3469,7 +3304,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/port_counters.p4",
+            "filename" : "include/port_counters.p4",
             "line" : 28,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
@@ -3479,7 +3314,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 9,
+      "id" : 8,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3491,7 +3326,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 32,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
@@ -3510,7 +3345,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 33,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
@@ -3520,7 +3355,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 10,
+      "id" : 9,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3532,7 +3367,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 30,
             "column" : 8,
             "source_fragment" : "hdr.packet_out.setInvalid()"
@@ -3563,14 +3398,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [7],
+          "action_ids" : [6],
           "actions" : ["act"],
           "base_default_next" : "node_4",
           "next_tables" : {
             "act" : "node_4"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 6,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3612,18 +3447,17 @@
           "max_size" : 1024,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [0, 2, 6, 3, 4],
-          "actions" : ["set_egress_port", "send_to_cpu", "do_ecmp", "drop", "NoAction"],
+          "action_ids" : [0, 2, 5, 3],
+          "actions" : ["set_egress_port", "send_to_cpu", "do_ecmp", "drop"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "do_ecmp" : "ecmp",
             "set_egress_port" : "node_7",
             "send_to_cpu" : "node_7",
-            "drop" : "node_7",
-            "NoAction" : "node_7"
+            "drop" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 4,
+            "action_id" : 3,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -3634,7 +3468,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "default.p4",
-            "line" : 63,
+            "line" : 64,
             "column" : 10,
             "source_fragment" : "ecmp"
           },
@@ -3651,7 +3485,7 @@
           "max_size" : 1024,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [1, 5],
+          "action_ids" : [1, 4],
           "actions" : ["set_egress_port", "NoAction"],
           "base_default_next" : "node_7",
           "next_tables" : {
@@ -3669,14 +3503,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [8],
+          "action_ids" : [7],
           "actions" : ["act_0"],
           "base_default_next" : null,
           "next_tables" : {
             "act_0" : null
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 7,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3728,7 +3562,7 @@
           "name" : "node_2",
           "id" : 0,
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 22,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
@@ -3780,7 +3614,7 @@
           "name" : "node_7",
           "id" : 2,
           "source_info" : {
-            "filename" : "./include/port_counters.p4",
+            "filename" : "include/port_counters.p4",
             "line" : 26,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 254"
@@ -3825,14 +3659,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [10],
+          "action_ids" : [9],
           "actions" : ["act_2"],
           "base_default_next" : "node_12",
           "next_tables" : {
             "act_2" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3848,14 +3682,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [9],
+          "action_ids" : [8],
           "actions" : ["act_1"],
           "base_default_next" : null,
           "next_tables" : {
             "act_1" : null
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3868,7 +3702,7 @@
           "name" : "node_12",
           "id" : 3,
           "source_info" : {
-            "filename" : "./include/packet_io.p4",
+            "filename" : "include/packet_io.p4",
             "line" : 31,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == CPU_PORT"
diff --git a/tools/test/p4src/p4-16/p4c-out/default.p4info b/tools/test/p4src/p4-16/p4c-out/default.p4info
index 7c0211e..957149e 100644
--- a/tools/test/p4src/p4-16/p4c-out/default.p4info
+++ b/tools/test/p4src/p4-16/p4c-out/default.p4info
@@ -40,10 +40,6 @@
   action_refs {
     id: 16793508
   }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
   direct_resource_ids: 301990488
   size: 1024
 }