From 434c3c3ef3ae751b0a9f2d5934c2d2e986e65e81 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Mon, 17 Jan 2022 16:22:07 -0500
Subject: [PATCH] Removed the deprecated "fl" attribute in XML output; use
 "loc" attribute instead.

---
 Changes                                     |    1 +
 docs/guide/deprecations.rst                 |    4 -
 docs/xml.rst                                |    3 -
 src/V3EmitXml.cpp                           |    9 +-
 src/V3FileLine.h                            |    1 -
 test_regress/t/t_clk_concat.pl              |    6 +-
 test_regress/t/t_clk_concat_vlt.pl          |    8 +-
 test_regress/t/t_dedupe_clk_gate.pl         |    2 +-
 test_regress/t/t_dpi_var.pl                 |    8 +-
 test_regress/t/t_dpi_var_vlt.pl             |    8 +-
 test_regress/t/t_func_dotted_inl0.pl        |    8 +-
 test_regress/t/t_func_dotted_inl0_vlt.pl    |    8 +-
 test_regress/t/t_func_dotted_inl2.pl        |    4 +-
 test_regress/t/t_func_dotted_inl2_vlt.pl    |    4 +-
 test_regress/t/t_inst_tree_inl0_pub0.pl     |   12 +-
 test_regress/t/t_inst_tree_inl1_pub0.pl     |    6 +-
 test_regress/t/t_inst_tree_inl1_pub1.pl     |    6 +-
 test_regress/t/t_trace_public_sig_vlt.pl    |    2 +-
 test_regress/t/t_unopt_combo_isolate.pl     |   10 +-
 test_regress/t/t_unopt_combo_isolate_vlt.pl |   10 +-
 test_regress/t/t_var_port_xml.out           |  128 +-
 test_regress/t/t_xml_debugcheck.out         | 1886 +++++++++----------
 test_regress/t/t_xml_first.out              |   96 +-
 test_regress/t/t_xml_flat.out               |  154 +-
 test_regress/t/t_xml_flat_no_inline_mod.out |   36 +-
 test_regress/t/t_xml_flat_pub_mod.out       |   36 +-
 test_regress/t/t_xml_flat_vlvbound.out      |  284 +--
 test_regress/t/t_xml_output.out             |   10 +-
 test_regress/t/t_xml_tag.out                |   98 +-
 29 files changed, 1420 insertions(+), 1428 deletions(-)

diff --git a/Changes b/Changes
index 2af61c435..9dd89e277 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,7 @@ Verilator 4.219 devel
 **Minor:**
 
 * Removed the deprecated lint_off flag -msg; use -rule instead.
+* Removed the deprecated "fl" attribute in XML output; use "loc" attribute instead.
 
 
 Verilator 4.218 2022-01-17
diff --git a/docs/guide/deprecations.rst b/docs/guide/deprecations.rst
index a012241f4..71db142ee 100644
--- a/docs/guide/deprecations.rst
+++ b/docs/guide/deprecations.rst
@@ -16,10 +16,6 @@ Verilated_heavy.h
   "verilated.h". Verilated_heavy.h is planned for removal no sooner than
   July 2022.
 
-XML locations
-  The XML "fl" attribute has been replaced with the "loc" attribute.  "fl"
-  is planned for removal no sooner than January 2021.
-
 Option `--cdc`
   The experimental `--cdc` option is believed to be generally unused and is
   planned for removeal no sooner than January 2023.
diff --git a/docs/xml.rst b/docs/xml.rst
index 725ada846..9a0656680 100644
--- a/docs/xml.rst
+++ b/docs/xml.rst
@@ -46,9 +46,6 @@ The XML document consists of 4 sections within the top level
    hierarchy. Each instance is represented with the ``<cell>`` element
    with the following attributes:
 
-   -  ``fl`` (deprecated): The file id and line number where the module
-      was instanced. Use ``loc`` instead.
-
    -  ``loc``: The file id, first line number, last line number, first
       column number and last column number of the identifier where the
       module was instanced, separated by commas.
diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp
index e5d23f7f8..d77a959ad 100644
--- a/src/V3EmitXml.cpp
+++ b/src/V3EmitXml.cpp
@@ -61,7 +61,7 @@ class EmitXmlFileVisitor final : public VNVisitor {
     void outputTag(AstNode* nodep, const string& tagin) {
         string tag = tagin;
         if (tag == "") tag = VString::downcase(nodep->typeName());
-        puts("<" + tag + " " + nodep->fileline()->xml());
+        puts("<" + tag);
         puts(" " + nodep->fileline()->xmlDetailedLocation());
         if (VN_IS(nodep, NodeDType)) {
             puts(" id=");
@@ -386,8 +386,7 @@ private:
         if (nodep->level() >= 0
             && nodep->level() <= 2) {  // ==2 because we don't add wrapper when in XML mode
             m_os << "<cells>\n";
-            m_os << "<cell " << nodep->fileline()->xml() << " "
-                 << nodep->fileline()->xmlDetailedLocation()  //
+            m_os << "<cell " << nodep->fileline()->xmlDetailedLocation()  //
                  << " name=\"" << nodep->prettyName() << "\""
                  << " submodname=\"" << nodep->prettyName() << "\""
                  << " hier=\"" << nodep->prettyName() << "\"";
@@ -405,8 +404,8 @@ private:
     virtual void visit(AstCell* nodep) override {
         if (nodep->modp()->dead()) return;
         if (!m_hasChildren) m_os << ">\n";
-        m_os << "<cell " << nodep->fileline()->xml() << " "
-             << nodep->fileline()->xmlDetailedLocation() << " name=\"" << nodep->name() << "\""
+        m_os << "<cell " << nodep->fileline()->xmlDetailedLocation() << " name=\"" << nodep->name()
+             << "\""
              << " submodname=\"" << nodep->modName() << "\""
              << " hier=\"" << m_hier + nodep->name() << "\"";
         const std::string hier = m_hier;
diff --git a/src/V3FileLine.h b/src/V3FileLine.h
index c61167982..dbc437588 100644
--- a/src/V3FileLine.h
+++ b/src/V3FileLine.h
@@ -200,7 +200,6 @@ public:
     string filebasenameNoExt() const;
     string firstColumnLetters() const;
     string profileFuncname() const;
-    string xml() const { return "fl=\"" + filenameLetters() + cvtToStr(lastLineno()) + "\""; }
     string xmlDetailedLocation() const;
     string lineDirectiveStrg(int enterExit) const;
 
diff --git a/test_regress/t/t_clk_concat.pl b/test_regress/t/t_clk_concat.pl
index cebae1cb9..6506f7873 100755
--- a/test_regress/t/t_clk_concat.pl
+++ b/test_regress/t/t_clk_concat.pl
@@ -17,9 +17,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="d74" loc=".*?" name="clk0" .*dir="input" .*vartype="logic" origName="clk0" clocker="true" public="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d75" loc=".*?" name="clk1" .*dir="input" .*vartype="logic" origName="clk1" clocker="true" public="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d76" loc=".*?" name="clk2" .*dir="input" .*vartype="logic" origName="clk2" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,74,.*?" name="clk0" .*dir="input" .*vartype="logic" origName="clk0" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,75,.*?" name="clk1" .*dir="input" .*vartype="logic" origName="clk1" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,76,.*?" name="clk2" .*dir="input" .*vartype="logic" origName="clk2" clocker="true" public="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_clk_concat_vlt.pl b/test_regress/t/t_clk_concat_vlt.pl
index 9808ed638..aada588d7 100755
--- a/test_regress/t/t_clk_concat_vlt.pl
+++ b/test_regress/t/t_clk_concat_vlt.pl
@@ -18,10 +18,10 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e78" loc=".*?" name="clk0" .*dir="input" .*vartype="logic" origName="clk0" clocker="true" public="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e79" loc=".*?" name="clk1" .*dir="input" .*vartype="logic" origName="clk1" clocker="true" public="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e80" loc=".*?" name="clk2" .*dir="input" .*vartype="logic" origName="clk2" clocker="true" public="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e82" loc=".*?" name="data_in" .*dir="input" .*vartype="logic" origName="data_in" clocker="false" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,78,.*?" name="clk0" .*dir="input" .*vartype="logic" origName="clk0" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,79,.*?" name="clk1" .*dir="input" .*vartype="logic" origName="clk1" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,80,.*?" name="clk2" .*dir="input" .*vartype="logic" origName="clk2" clocker="true" public="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,82,.*?" name="data_in" .*dir="input" .*vartype="logic" origName="data_in" clocker="false" public="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_dedupe_clk_gate.pl b/test_regress/t/t_dedupe_clk_gate.pl
index c4a09eb65..ccc0816ac 100755
--- a/test_regress/t/t_dedupe_clk_gate.pl
+++ b/test_regress/t/t_dedupe_clk_gate.pl
@@ -17,7 +17,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e44" loc=".*?" name="t.f0.clock_gate.clken_latched" dtype_id="1" vartype="logic" origName="clken_latched" clock_enable="true" latched="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,44,.*?" name="t.f0.clock_gate.clken_latched" dtype_id="1" vartype="logic" origName="clken_latched" clock_enable="true" latched="true"\/\>/i);
     file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 4);
 }
 
diff --git a/test_regress/t/t_dpi_var.pl b/test_regress/t/t_dpi_var.pl
index 7f3485f5a..f96ebbdda 100755
--- a/test_regress/t/t_dpi_var.pl
+++ b/test_regress/t/t_dpi_var.pl
@@ -18,10 +18,10 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="d56" loc=".*?" name="formatted" dtype_id="\d+" dir="input" vartype="string" origName="formatted" sformat="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d77" loc=".*?" name="t.sub.in" dtype_id="\d+" vartype="int" origName="in" public="true" public_flat_rd="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d78" loc=".*?" name="t.sub.fr_a" dtype_id="\d+" vartype="int" origName="fr_a" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d79" loc=".*?" name="t.sub.fr_b" dtype_id="\d+" vartype="int" origName="fr_b" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,56,.*?" name="formatted" dtype_id="\d+" dir="input" vartype="string" origName="formatted" sformat="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,77,.*?" name="t.sub.in" dtype_id="\d+" vartype="int" origName="in" public="true" public_flat_rd="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,78,.*?" name="t.sub.fr_a" dtype_id="\d+" vartype="int" origName="fr_a" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,79,.*?" name="t.sub.fr_b" dtype_id="\d+" vartype="int" origName="fr_b" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_dpi_var_vlt.pl b/test_regress/t/t_dpi_var_vlt.pl
index 476882c77..10c8d696f 100755
--- a/test_regress/t/t_dpi_var_vlt.pl
+++ b/test_regress/t/t_dpi_var_vlt.pl
@@ -20,10 +20,10 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e58" loc=".*?" name="formatted" dtype_id="\d+" dir="input" vartype="string" origName="formatted" sformat="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e81" loc=".*?" name="t.sub.in" dtype_id="\d+" vartype="int" origName="in" public="true" public_flat_rd="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e82" loc=".*?" name="t.sub.fr_a" dtype_id="\d+" vartype="int" origName="fr_a" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e83" loc=".*?" name="t.sub.fr_b" dtype_id="\d+" vartype="int" origName="fr_b" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,58,.*?" name="formatted" dtype_id="\d+" dir="input" vartype="string" origName="formatted" sformat="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,81,.*?" name="t.sub.in" dtype_id="\d+" vartype="int" origName="in" public="true" public_flat_rd="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,82,.*?" name="t.sub.fr_a" dtype_id="\d+" vartype="int" origName="fr_a" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,83,.*?" name="t.sub.fr_b" dtype_id="\d+" vartype="int" origName="fr_b" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_func_dotted_inl0.pl b/test_regress/t/t_func_dotted_inl0.pl
index 000ae222d..f286aa790 100755
--- a/test_regress/t/t_func_dotted_inl0.pl
+++ b/test_regress/t/t_func_dotted_inl0.pl
@@ -18,10 +18,10 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<module fl="d84" loc=".*?" name="ma" origName="ma" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="d99" loc=".*?" name="mb" origName="mb" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="d127" loc=".*?" name="mc" origName="mc" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="d127" loc=".*?" name="mc__PB1" origName="mc" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="d,84,.*?" name="ma" origName="ma" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="d,99,.*?" name="mb" origName="mb" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="d,127,.*?" name="mc" origName="mc" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="d,127,.*?" name="mc__PB1" origName="mc" public="true"\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_func_dotted_inl0_vlt.pl b/test_regress/t/t_func_dotted_inl0_vlt.pl
index 321df222d..711fb0708 100755
--- a/test_regress/t/t_func_dotted_inl0_vlt.pl
+++ b/test_regress/t/t_func_dotted_inl0_vlt.pl
@@ -18,10 +18,10 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<module fl="e84" loc=".*?" name="ma" origName="ma" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e99" loc=".*?" name="mb" origName="mb" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e127" loc=".*?" name="mc" origName="mc" public="true"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e127" loc=".*?" name="mc__PB1" origName="mc" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,84,.*?" name="ma" origName="ma" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,99,.*?" name="mb" origName="mb" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,127,.*?" name="mc" origName="mc" public="true"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,127,.*?" name="mc__PB1" origName="mc" public="true"\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_func_dotted_inl2.pl b/test_regress/t/t_func_dotted_inl2.pl
index 6f6d98c4c..2dede96b9 100755
--- a/test_regress/t/t_func_dotted_inl2.pl
+++ b/test_regress/t/t_func_dotted_inl2.pl
@@ -18,8 +18,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<instance fl="d87" loc=".*?" name="t.ma0.mb0" defName="mb" origName="mb0"\/\>/i);
-    file_grep("$out_filename", qr/\<module fl="d99" loc=".*?" name="mb" origName="mb"\>/i);
+    file_grep("$out_filename", qr/\<instance loc="d,87,.*?" name="t.ma0.mb0" defName="mb" origName="mb0"\/\>/i);
+    file_grep("$out_filename", qr/\<module loc="d,99,.*?" name="mb" origName="mb"\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_func_dotted_inl2_vlt.pl b/test_regress/t/t_func_dotted_inl2_vlt.pl
index 378a9e7ae..5e8ee23b4 100755
--- a/test_regress/t/t_func_dotted_inl2_vlt.pl
+++ b/test_regress/t/t_func_dotted_inl2_vlt.pl
@@ -18,8 +18,8 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<instance fl="e87" loc=".*?" name="t.ma0.mb0" defName="mb" origName="mb0"\/\>/i);
-    file_grep("$out_filename", qr/\<module fl="e99" loc=".*?" name="mb" origName="mb"\>/i);
+    file_grep("$out_filename", qr/\<instance loc="e,87,.*?" name="t.ma0.mb0" defName="mb" origName="mb0"\/\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,99,.*?" name="mb" origName="mb"\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_inst_tree_inl0_pub0.pl b/test_regress/t/t_inst_tree_inl0_pub0.pl
index 6037619f7..8f0584454 100755
--- a/test_regress/t/t_inst_tree_inl0_pub0.pl
+++ b/test_regress/t/t_inst_tree_inl0_pub0.pl
@@ -18,12 +18,12 @@ compile(
 );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<module fl="e56" loc=".*?" name="l1" origName="l1"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e62" loc=".*?" name="l2" origName="l2"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e69" loc=".*?" name="l3" origName="l3"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e76" loc=".*?" name="l4" origName="l4"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e83" loc=".*?" name="l5__P2" origName="l5"\>/i);
-    file_grep("$out_filename", qr/\<module fl="e83" loc=".*?" name="l5__P1" origName="l5"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,56,.*?" name="l1" origName="l1"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,62,.*?" name="l2" origName="l2"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,69,.*?" name="l3" origName="l3"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,76,.*?" name="l4" origName="l4"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,83,.*?" name="l5__P2" origName="l5"\>/i);
+    file_grep("$out_filename", qr/\<module loc="e,83,.*?" name="l5__P1" origName="l5"\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_inst_tree_inl1_pub0.pl b/test_regress/t/t_inst_tree_inl1_pub0.pl
index 9a8a6aa92..9e8e50970 100755
--- a/test_regress/t/t_inst_tree_inl1_pub0.pl
+++ b/test_regress/t/t_inst_tree_inl1_pub0.pl
@@ -18,9 +18,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e70" loc=".*?" name="t.u.u0.u0.z1" dtype_id="\d+" vartype="logic" origName="z1"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e70" loc=".*?" name="t.u.u0.u1.z1" dtype_id="\d+" vartype="logic" origName="z1"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e70" loc=".*?" name="t.u.u1.u0.z0" dtype_id="\d+" vartype="logic" origName="z0"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,70,.*?" name="t.u.u0.u0.z1" dtype_id="\d+" vartype="logic" origName="z1"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,70,.*?" name="t.u.u0.u1.z1" dtype_id="\d+" vartype="logic" origName="z1"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,70,.*?" name="t.u.u1.u0.z0" dtype_id="\d+" vartype="logic" origName="z0"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_inst_tree_inl1_pub1.pl b/test_regress/t/t_inst_tree_inl1_pub1.pl
index ed87d615c..2c8ff9ac9 100755
--- a/test_regress/t/t_inst_tree_inl1_pub1.pl
+++ b/test_regress/t/t_inst_tree_inl1_pub1.pl
@@ -19,9 +19,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e70" loc=".*?" name="u.u0.u0.z0" dtype_id="\d+" vartype="logic" origName="z0" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e85" loc=".*?" name="u.u0.u0.u0.u0.z1" dtype_id="\d+" vartype="logic" origName="z1" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e83" loc=".*?" name="u.u0.u1.u0.u0.z" dtype_id="\d+" vartype="logic" origName="z" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,70,.*?" name="u.u0.u0.z0" dtype_id="\d+" vartype="logic" origName="z0" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,85,.*?" name="u.u0.u0.u0.u0.z1" dtype_id="\d+" vartype="logic" origName="z1" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,83,.*?" name="u.u0.u1.u0.u0.z" dtype_id="\d+" vartype="logic" origName="z" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_trace_public_sig_vlt.pl b/test_regress/t/t_trace_public_sig_vlt.pl
index c29e1cdc2..2bf507248 100755
--- a/test_regress/t/t_trace_public_sig_vlt.pl
+++ b/test_regress/t/t_trace_public_sig_vlt.pl
@@ -22,7 +22,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$out_filename", qr/\<var fl="e47" loc=".*?" name="GSR" dtype_id="1" vartype="logic" origName="GSR" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,47,.*?" name="GSR" dtype_id="1" vartype="logic" origName="GSR" public="true" public_flat_rd="true" public_flat_rw="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_unopt_combo_isolate.pl b/test_regress/t/t_unopt_combo_isolate.pl
index cd9c893bb..cbc33dab8 100755
--- a/test_regress/t/t_unopt_combo_isolate.pl
+++ b/test_regress/t/t_unopt_combo_isolate.pl
@@ -19,11 +19,11 @@ compile(
 
 if ($Self->{vlt_all}) {
     file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+5/i);
-    file_grep("$out_filename", qr/\<var fl="d23" loc=".*?" name="t.b" dtype_id="\d+" vartype="logic" origName="b" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d99" loc=".*?" name="__Vfunc_t.file.get_31_16__0__Vfuncout" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d100" loc=".*?" name="__Vfunc_t.file.get_31_16__0__t_crc" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d112" loc=".*?" name="__Vtask_t.file.set_b_d__1__t_crc" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_crc" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="d113" loc=".*?" name="__Vtask_t.file.set_b_d__1__t_c" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_c" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,23,.*?" name="t.b" dtype_id="\d+" vartype="logic" origName="b" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,99,.*?" name="__Vfunc_t.file.get_31_16__0__Vfuncout" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,100,.*?" name="__Vfunc_t.file.get_31_16__0__t_crc" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,112,.*?" name="__Vtask_t.file.set_b_d__1__t_crc" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_crc" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="d,113,.*?" name="__Vtask_t.file.set_b_d__1__t_c" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_c" isolate_assignments="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_unopt_combo_isolate_vlt.pl b/test_regress/t/t_unopt_combo_isolate_vlt.pl
index a71d1a004..f8aa4fcc3 100755
--- a/test_regress/t/t_unopt_combo_isolate_vlt.pl
+++ b/test_regress/t/t_unopt_combo_isolate_vlt.pl
@@ -19,11 +19,11 @@ compile(
 
 if ($Self->{vlt_all}) {
     file_grep($Self->{stats}, qr/Optimizations, isolate_assignments blocks\s+5/i);
-    file_grep("$out_filename", qr/\<var fl="e23" loc=".*?" name="t.b" dtype_id="\d+" vartype="logic" origName="b" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e104" loc=".*?" name="__Vfunc_t.file.get_31_16__0__Vfuncout" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e105" loc=".*?" name="__Vfunc_t.file.get_31_16__0__t_crc" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e115" loc=".*?" name="__Vtask_t.file.set_b_d__1__t_crc" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_crc" isolate_assignments="true"\/\>/i);
-    file_grep("$out_filename", qr/\<var fl="e116" loc=".*?" name="__Vtask_t.file.set_b_d__1__t_c" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_c" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,23,.*?" name="t.b" dtype_id="\d+" vartype="logic" origName="b" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,104,.*?" name="__Vfunc_t.file.get_31_16__0__Vfuncout" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__Vfuncout" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,105,.*?" name="__Vfunc_t.file.get_31_16__0__t_crc" dtype_id="\d+" vartype="logic" origName="__Vfunc_t__DOT__file__DOT__get_31_16__0__t_crc" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,115,.*?" name="__Vtask_t.file.set_b_d__1__t_crc" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_crc" isolate_assignments="true"\/\>/i);
+    file_grep("$out_filename", qr/\<var loc="e,116,.*?" name="__Vtask_t.file.set_b_d__1__t_c" dtype_id="\d+" vartype="logic" origName="__Vtask_t__DOT__file__DOT__set_b_d__1__t_c" isolate_assignments="true"\/\>/i);
 }
 
 execute(
diff --git a/test_regress/t/t_var_port_xml.out b/test_regress/t/t_var_port_xml.out
index 5ca861df1..abbbdb652 100644
--- a/test_regress/t/t_var_port_xml.out
+++ b/test_regress/t/t_var_port_xml.out
@@ -11,119 +11,119 @@
     <file id="d" filename="t/t_var_port_xml.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d18" loc="d,18,8,18,11" name="mh2" submodname="mh2" hier="mh2"/>
+    <cell loc="d,18,8,18,11" name="mh2" submodname="mh2" hier="mh2"/>
   </cells>
   <cells>
-    <cell fl="d24" loc="d,24,8,24,11" name="mh5" submodname="mh5" hier="mh5"/>
+    <cell loc="d,24,8,24,11" name="mh5" submodname="mh5" hier="mh5"/>
   </cells>
   <cells>
-    <cell fl="d26" loc="d,26,8,26,11" name="mh6" submodname="mh6" hier="mh6"/>
+    <cell loc="d,26,8,26,11" name="mh6" submodname="mh6" hier="mh6"/>
   </cells>
   <cells>
-    <cell fl="d28" loc="d,28,8,28,11" name="mh7" submodname="mh7" hier="mh7"/>
+    <cell loc="d,28,8,28,11" name="mh7" submodname="mh7" hier="mh7"/>
   </cells>
   <cells>
-    <cell fl="d30" loc="d,30,8,30,11" name="mh8" submodname="mh8" hier="mh8"/>
+    <cell loc="d,30,8,30,11" name="mh8" submodname="mh8" hier="mh8"/>
   </cells>
   <cells>
-    <cell fl="d32" loc="d,32,8,32,11" name="mh9" submodname="mh9" hier="mh9"/>
+    <cell loc="d,32,8,32,11" name="mh9" submodname="mh9" hier="mh9"/>
   </cells>
   <cells>
-    <cell fl="d34" loc="d,34,8,34,12" name="mh10" submodname="mh10" hier="mh10"/>
+    <cell loc="d,34,8,34,12" name="mh10" submodname="mh10" hier="mh10"/>
   </cells>
   <cells>
-    <cell fl="d36" loc="d,36,8,36,12" name="mh11" submodname="mh11" hier="mh11"/>
+    <cell loc="d,36,8,36,12" name="mh11" submodname="mh11" hier="mh11"/>
   </cells>
   <cells>
-    <cell fl="d38" loc="d,38,8,38,12" name="mh12" submodname="mh12" hier="mh12"/>
+    <cell loc="d,38,8,38,12" name="mh12" submodname="mh12" hier="mh12"/>
   </cells>
   <cells>
-    <cell fl="d40" loc="d,40,8,40,12" name="mh13" submodname="mh13" hier="mh13"/>
+    <cell loc="d,40,8,40,12" name="mh13" submodname="mh13" hier="mh13"/>
   </cells>
   <cells>
-    <cell fl="d50" loc="d,50,8,50,12" name="mh17" submodname="mh17" hier="mh17"/>
+    <cell loc="d,50,8,50,12" name="mh17" submodname="mh17" hier="mh17"/>
   </cells>
   <cells>
-    <cell fl="d52" loc="d,52,8,52,12" name="mh18" submodname="mh18" hier="mh18"/>
+    <cell loc="d,52,8,52,12" name="mh18" submodname="mh18" hier="mh18"/>
   </cells>
   <cells>
-    <cell fl="d54" loc="d,54,8,54,12" name="mh19" submodname="mh19" hier="mh19"/>
+    <cell loc="d,54,8,54,12" name="mh19" submodname="mh19" hier="mh19"/>
   </cells>
   <cells>
-    <cell fl="d56" loc="d,56,8,56,12" name="mh20" submodname="mh20" hier="mh20"/>
+    <cell loc="d,56,8,56,12" name="mh20" submodname="mh20" hier="mh20"/>
   </cells>
   <cells>
-    <cell fl="d58" loc="d,58,8,58,12" name="mh21" submodname="mh21" hier="mh21"/>
+    <cell loc="d,58,8,58,12" name="mh21" submodname="mh21" hier="mh21"/>
   </cells>
   <netlist>
-    <module fl="d18" loc="d,18,8,18,11" name="mh2" origName="mh2">
-      <var fl="d18" loc="d,18,27,18,47" name="x_inout_wire_integer" dtype_id="1" dir="inout" pinIndex="1" vartype="integer" origName="x_inout_wire_integer"/>
+    <module loc="d,18,8,18,11" name="mh2" origName="mh2">
+      <var loc="d,18,27,18,47" name="x_inout_wire_integer" dtype_id="1" dir="inout" pinIndex="1" vartype="integer" origName="x_inout_wire_integer"/>
     </module>
-    <module fl="d24" loc="d,24,8,24,11" name="mh5" origName="mh5">
-      <var fl="d24" loc="d,24,19,24,37" name="x_input_wire_logic" dtype_id="2" dir="input" pinIndex="1" vartype="logic" origName="x_input_wire_logic"/>
+    <module loc="d,24,8,24,11" name="mh5" origName="mh5">
+      <var loc="d,24,19,24,37" name="x_input_wire_logic" dtype_id="2" dir="input" pinIndex="1" vartype="logic" origName="x_input_wire_logic"/>
     </module>
-    <module fl="d26" loc="d,26,8,26,11" name="mh6" origName="mh6">
-      <var fl="d26" loc="d,26,23,26,40" name="x_input_var_logic" dtype_id="2" dir="input" pinIndex="1" vartype="logic" origName="x_input_var_logic"/>
+    <module loc="d,26,8,26,11" name="mh6" origName="mh6">
+      <var loc="d,26,23,26,40" name="x_input_var_logic" dtype_id="2" dir="input" pinIndex="1" vartype="logic" origName="x_input_var_logic"/>
     </module>
-    <module fl="d28" loc="d,28,8,28,11" name="mh7" origName="mh7">
-      <var fl="d28" loc="d,28,31,28,50" name="x_input_var_integer" dtype_id="1" dir="input" pinIndex="1" vartype="integer" origName="x_input_var_integer"/>
+    <module loc="d,28,8,28,11" name="mh7" origName="mh7">
+      <var loc="d,28,31,28,50" name="x_input_var_integer" dtype_id="1" dir="input" pinIndex="1" vartype="integer" origName="x_input_var_integer"/>
     </module>
-    <module fl="d30" loc="d,30,8,30,11" name="mh8" origName="mh8">
-      <var fl="d30" loc="d,30,20,30,39" name="x_output_wire_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic"/>
+    <module loc="d,30,8,30,11" name="mh8" origName="mh8">
+      <var loc="d,30,20,30,39" name="x_output_wire_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic"/>
     </module>
-    <module fl="d32" loc="d,32,8,32,11" name="mh9" origName="mh9">
-      <var fl="d32" loc="d,32,24,32,42" name="x_output_var_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_var_logic"/>
+    <module loc="d,32,8,32,11" name="mh9" origName="mh9">
+      <var loc="d,32,24,32,42" name="x_output_var_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_var_logic"/>
     </module>
-    <module fl="d34" loc="d,34,8,34,12" name="mh10" origName="mh10">
-      <var fl="d34" loc="d,34,33,34,62" name="x_output_wire_logic_signed_p6" dtype_id="3" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic_signed_p6"/>
+    <module loc="d,34,8,34,12" name="mh10" origName="mh10">
+      <var loc="d,34,33,34,62" name="x_output_wire_logic_signed_p6" dtype_id="3" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic_signed_p6"/>
     </module>
-    <module fl="d36" loc="d,36,8,36,12" name="mh11" origName="mh11">
-      <var fl="d36" loc="d,36,28,36,48" name="x_output_var_integer" dtype_id="1" dir="output" pinIndex="1" vartype="integer" origName="x_output_var_integer"/>
+    <module loc="d,36,8,36,12" name="mh11" origName="mh11">
+      <var loc="d,36,28,36,48" name="x_output_var_integer" dtype_id="1" dir="output" pinIndex="1" vartype="integer" origName="x_output_var_integer"/>
     </module>
-    <module fl="d38" loc="d,38,8,38,12" name="mh12" origName="mh12">
-      <var fl="d38" loc="d,38,23,38,37" name="x_ref_logic_p6" dtype_id="4" dir="ref" pinIndex="1" vartype="logic" origName="x_ref_logic_p6"/>
+    <module loc="d,38,8,38,12" name="mh12" origName="mh12">
+      <var loc="d,38,23,38,37" name="x_ref_logic_p6" dtype_id="4" dir="ref" pinIndex="1" vartype="logic" origName="x_ref_logic_p6"/>
     </module>
-    <module fl="d40" loc="d,40,8,40,12" name="mh13" origName="mh13">
-      <var fl="d40" loc="d,40,17,40,35" name="x_ref_var_logic_u6" dtype_id="5" dir="ref" pinIndex="1" vartype="port" origName="x_ref_var_logic_u6"/>
+    <module loc="d,40,8,40,12" name="mh13" origName="mh13">
+      <var loc="d,40,17,40,35" name="x_ref_var_logic_u6" dtype_id="5" dir="ref" pinIndex="1" vartype="port" origName="x_ref_var_logic_u6"/>
     </module>
-    <module fl="d50" loc="d,50,8,50,12" name="mh17" origName="mh17">
-      <var fl="d50" loc="d,50,31,50,50" name="x_input_var_integer" dtype_id="1" dir="input" pinIndex="1" vartype="integer" origName="x_input_var_integer"/>
-      <var fl="d50" loc="d,50,57,50,75" name="y_input_wire_logic" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="y_input_wire_logic"/>
+    <module loc="d,50,8,50,12" name="mh17" origName="mh17">
+      <var loc="d,50,31,50,50" name="x_input_var_integer" dtype_id="1" dir="input" pinIndex="1" vartype="integer" origName="x_input_var_integer"/>
+      <var loc="d,50,57,50,75" name="y_input_wire_logic" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="y_input_wire_logic"/>
     </module>
-    <module fl="d52" loc="d,52,8,52,12" name="mh18" origName="mh18">
-      <var fl="d52" loc="d,52,24,52,42" name="x_output_var_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_var_logic"/>
-      <var fl="d52" loc="d,52,50,52,68" name="y_input_wire_logic" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="y_input_wire_logic"/>
+    <module loc="d,52,8,52,12" name="mh18" origName="mh18">
+      <var loc="d,52,24,52,42" name="x_output_var_logic" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="x_output_var_logic"/>
+      <var loc="d,52,50,52,68" name="y_input_wire_logic" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="y_input_wire_logic"/>
     </module>
-    <module fl="d54" loc="d,54,8,54,12" name="mh19" origName="mh19">
-      <var fl="d54" loc="d,54,33,54,62" name="x_output_wire_logic_signed_p6" dtype_id="3" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic_signed_p6"/>
-      <var fl="d54" loc="d,54,72,54,92" name="y_output_var_integer" dtype_id="1" dir="output" pinIndex="2" vartype="integer" origName="y_output_var_integer"/>
+    <module loc="d,54,8,54,12" name="mh19" origName="mh19">
+      <var loc="d,54,33,54,62" name="x_output_wire_logic_signed_p6" dtype_id="3" dir="output" pinIndex="1" vartype="logic" origName="x_output_wire_logic_signed_p6"/>
+      <var loc="d,54,72,54,92" name="y_output_var_integer" dtype_id="1" dir="output" pinIndex="2" vartype="integer" origName="y_output_var_integer"/>
     </module>
-    <module fl="d56" loc="d,56,8,56,12" name="mh20" origName="mh20">
-      <var fl="d56" loc="d,56,23,56,41" name="x_ref_var_logic_p6" dtype_id="4" dir="ref" pinIndex="1" vartype="logic" origName="x_ref_var_logic_p6"/>
-      <var fl="d56" loc="d,56,43,56,61" name="y_ref_var_logic_p6" dtype_id="4" dir="ref" pinIndex="2" vartype="logic" origName="y_ref_var_logic_p6"/>
+    <module loc="d,56,8,56,12" name="mh20" origName="mh20">
+      <var loc="d,56,23,56,41" name="x_ref_var_logic_p6" dtype_id="4" dir="ref" pinIndex="1" vartype="logic" origName="x_ref_var_logic_p6"/>
+      <var loc="d,56,43,56,61" name="y_ref_var_logic_p6" dtype_id="4" dir="ref" pinIndex="2" vartype="logic" origName="y_ref_var_logic_p6"/>
     </module>
-    <module fl="d58" loc="d,58,8,58,12" name="mh21" origName="mh21">
-      <var fl="d58" loc="d,58,17,58,33" name="ref_var_logic_u6" dtype_id="6" dir="ref" pinIndex="1" vartype="port" origName="ref_var_logic_u6"/>
-      <var fl="d58" loc="d,58,41,58,56" name="y_ref_var_logic" dtype_id="2" dir="ref" pinIndex="2" vartype="logic" origName="y_ref_var_logic"/>
+    <module loc="d,58,8,58,12" name="mh21" origName="mh21">
+      <var loc="d,58,17,58,33" name="ref_var_logic_u6" dtype_id="6" dir="ref" pinIndex="1" vartype="port" origName="ref_var_logic_u6"/>
+      <var loc="d,58,41,58,56" name="y_ref_var_logic" dtype_id="2" dir="ref" pinIndex="2" vartype="logic" origName="y_ref_var_logic"/>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <unpackarraydtype fl="d58" loc="d,58,34,58,35" id="6" sub_dtype_id="2">
-        <range fl="d58" loc="d,58,34,58,35">
-          <const fl="d58" loc="d,58,35,58,36" name="32&apos;sh5" dtype_id="7"/>
-          <const fl="d58" loc="d,58,37,58,38" name="32&apos;sh0" dtype_id="7"/>
+    <typetable loc="a,0,0,0,0">
+      <unpackarraydtype loc="d,58,34,58,35" id="6" sub_dtype_id="2">
+        <range loc="d,58,34,58,35">
+          <const loc="d,58,35,58,36" name="32&apos;sh5" dtype_id="7"/>
+          <const loc="d,58,37,58,38" name="32&apos;sh0" dtype_id="7"/>
         </range>
       </unpackarraydtype>
-      <basicdtype fl="d58" loc="d,58,41,58,56" id="2" name="logic"/>
-      <unpackarraydtype fl="d40" loc="d,40,36,40,37" id="5" sub_dtype_id="2">
-        <range fl="d40" loc="d,40,36,40,37">
-          <const fl="d40" loc="d,40,37,40,38" name="32&apos;sh5" dtype_id="7"/>
-          <const fl="d40" loc="d,40,39,40,40" name="32&apos;sh0" dtype_id="7"/>
+      <basicdtype loc="d,58,41,58,56" id="2" name="logic"/>
+      <unpackarraydtype loc="d,40,36,40,37" id="5" sub_dtype_id="2">
+        <range loc="d,40,36,40,37">
+          <const loc="d,40,37,40,38" name="32&apos;sh5" dtype_id="7"/>
+          <const loc="d,40,39,40,40" name="32&apos;sh0" dtype_id="7"/>
         </range>
       </unpackarraydtype>
-      <basicdtype fl="d38" loc="d,38,17,38,18" id="4" name="logic" left="5" right="0"/>
-      <basicdtype fl="d34" loc="d,34,27,34,28" id="3" name="logic" left="5" right="0" signed="true"/>
-      <basicdtype fl="d18" loc="d,18,19,18,26" id="1" name="integer" left="31" right="0" signed="true"/>
-      <basicdtype fl="d40" loc="d,40,37,40,38" id="7" name="logic" left="31" right="0" signed="true"/>
+      <basicdtype loc="d,38,17,38,18" id="4" name="logic" left="5" right="0"/>
+      <basicdtype loc="d,34,27,34,28" id="3" name="logic" left="5" right="0" signed="true"/>
+      <basicdtype loc="d,18,19,18,26" id="1" name="integer" left="31" right="0" signed="true"/>
+      <basicdtype loc="d,40,37,40,38" id="7" name="logic" left="31" right="0" signed="true"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_debugcheck.out b/test_regress/t/t_xml_debugcheck.out
index e2b4221fe..7df0425da 100644
--- a/test_regress/t/t_xml_debugcheck.out
+++ b/test_regress/t/t_xml_debugcheck.out
@@ -11,171 +11,171 @@
     <file id="d" filename="t/t_enum_type_methods.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d10" loc="d,10,8,10,9" name="$root" submodname="$root" hier="$root">
-      <cell fl="a0" loc="a,0,0,0,0" name="__PVT____024unit" submodname="__024unit" hier="$root.__PVT____024unit"/>
+    <cell loc="d,10,8,10,9" name="$root" submodname="$root" hier="$root">
+      <cell loc="a,0,0,0,0" name="__PVT____024unit" submodname="__024unit" hier="$root.__PVT____024unit"/>
     </cell>
   </cells>
   <cells>
-    <cell fl="a0" loc="a,0,0,0,0" name="$unit" submodname="$unit" hier="$unit"/>
+    <cell loc="a,0,0,0,0" name="$unit" submodname="$unit" hier="$unit"/>
   </cells>
   <netlist>
-    <module fl="d10" loc="d,10,8,10,9" name="$root" origName="$root" topModule="1" public="true">
-      <var fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk" clocker="true" public="true"/>
-      <var fl="d23" loc="d,23,9,23,10" name="t.e" dtype_id="2" vartype="my_t" origName="e"/>
-      <var fl="d14" loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="1" vartype="logic" origName="__Vclklast__TOP__clk"/>
-      <var fl="d22" loc="d,22,13,22,16" name="t.cyc" dtype_id="3" vartype="integer" origName="cyc"/>
-      <instance fl="a0" loc="a,0,0,0,0" name="$unit" defName="__024unit" origName="__024unit"/>
-      <topscope fl="d10" loc="d,10,8,10,9">
-        <scope fl="d10" loc="d,10,8,10,9" name="TOP"/>
+    <module loc="d,10,8,10,9" name="$root" origName="$root" topModule="1" public="true">
+      <var loc="d,14,10,14,13" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk" clocker="true" public="true"/>
+      <var loc="d,23,9,23,10" name="t.e" dtype_id="2" vartype="my_t" origName="e"/>
+      <var loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="1" vartype="logic" origName="__Vclklast__TOP__clk"/>
+      <var loc="d,22,13,22,16" name="t.cyc" dtype_id="3" vartype="integer" origName="cyc"/>
+      <instance loc="a,0,0,0,0" name="$unit" defName="__024unit" origName="__024unit"/>
+      <topscope loc="d,10,8,10,9">
+        <scope loc="d,10,8,10,9" name="TOP"/>
       </topscope>
-      <cfunc fl="d60" loc="d,60,4,60,10" name="_sequent__TOP__1">
-        <var fl="d22" loc="d,22,13,22,16" name="__Vdly__t.cyc" dtype_id="3" vartype="integer" origName="__Vdly__t__DOT__cyc"/>
-        <var fl="d23" loc="d,23,9,23,10" name="__Vdly__t.e" dtype_id="2" vartype="my_t" origName="__Vdly__t__DOT__e"/>
-        <var fl="d67" loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4" vartype="string" origName="__Vtemp_h########__0"/>
-        <var fl="d77" loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4" vartype="string" origName="__Vtemp_h########__1"/>
-        <var fl="d87" loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4" vartype="string" origName="__Vtemp_h########__2"/>
-        <assignpre fl="d64" loc="d,64,3,64,4" dtype_id="5">
-          <varref fl="d64" loc="d,64,3,64,4" name="t.e" dtype_id="5"/>
-          <varref fl="d64" loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
+      <cfunc loc="d,60,4,60,10" name="_sequent__TOP__1">
+        <var loc="d,22,13,22,16" name="__Vdly__t.cyc" dtype_id="3" vartype="integer" origName="__Vdly__t__DOT__cyc"/>
+        <var loc="d,23,9,23,10" name="__Vdly__t.e" dtype_id="2" vartype="my_t" origName="__Vdly__t__DOT__e"/>
+        <var loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4" vartype="string" origName="__Vtemp_h########__0"/>
+        <var loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4" vartype="string" origName="__Vtemp_h########__1"/>
+        <var loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4" vartype="string" origName="__Vtemp_h########__2"/>
+        <assignpre loc="d,64,3,64,4" dtype_id="5">
+          <varref loc="d,64,3,64,4" name="t.e" dtype_id="5"/>
+          <varref loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
         </assignpre>
-        <assignpre fl="d61" loc="d,61,7,61,10" dtype_id="3">
-          <varref fl="d61" loc="d,61,7,61,10" name="t.cyc" dtype_id="3"/>
-          <varref fl="d61" loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
+        <assignpre loc="d,61,7,61,10" dtype_id="3">
+          <varref loc="d,61,7,61,10" name="t.cyc" dtype_id="3"/>
+          <varref loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
         </assignpre>
-        <assigndly fl="d61" loc="d,61,11,61,13" dtype_id="3">
-          <add fl="d61" loc="d,61,18,61,19" dtype_id="3">
-            <ccast fl="d61" loc="d,61,20,61,21" dtype_id="6">
-              <const fl="d61" loc="d,61,20,61,21" name="32&apos;sh1" dtype_id="7"/>
+        <assigndly loc="d,61,11,61,13" dtype_id="3">
+          <add loc="d,61,18,61,19" dtype_id="3">
+            <ccast loc="d,61,20,61,21" dtype_id="6">
+              <const loc="d,61,20,61,21" name="32&apos;sh1" dtype_id="7"/>
             </ccast>
-            <varref fl="d61" loc="d,61,14,61,17" name="t.cyc" dtype_id="3"/>
+            <varref loc="d,61,14,61,17" name="t.cyc" dtype_id="3"/>
           </add>
-          <varref fl="d61" loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
+          <varref loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
         </assigndly>
-        <if fl="d62" loc="d,62,7,62,9">
-          <eq fl="d62" loc="d,62,14,62,16" dtype_id="8">
-            <const fl="d62" loc="d,62,16,62,17" name="32&apos;sh0" dtype_id="7"/>
-            <varref fl="d62" loc="d,62,11,62,14" name="t.cyc" dtype_id="3"/>
+        <if loc="d,62,7,62,9">
+          <eq loc="d,62,14,62,16" dtype_id="8">
+            <const loc="d,62,16,62,17" name="32&apos;sh0" dtype_id="7"/>
+            <varref loc="d,62,11,62,14" name="t.cyc" dtype_id="3"/>
           </eq>
           <begin>
-            <assigndly fl="d64" loc="d,64,5,64,7" dtype_id="5">
-              <const fl="d64" loc="d,64,8,64,11" name="4&apos;h1" dtype_id="5"/>
-              <varref fl="d64" loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
+            <assigndly loc="d,64,5,64,7" dtype_id="5">
+              <const loc="d,64,8,64,11" name="4&apos;h1" dtype_id="5"/>
+              <varref loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
             </assigndly>
           </begin>
           <begin>
-            <if fl="d66" loc="d,66,12,66,14">
-              <eq fl="d66" loc="d,66,19,66,21" dtype_id="8">
-                <const fl="d66" loc="d,66,21,66,22" name="32&apos;sh1" dtype_id="7"/>
-                <varref fl="d66" loc="d,66,16,66,19" name="t.cyc" dtype_id="3"/>
+            <if loc="d,66,12,66,14">
+              <eq loc="d,66,19,66,21" dtype_id="8">
+                <const loc="d,66,21,66,22" name="32&apos;sh1" dtype_id="7"/>
+                <varref loc="d,66,16,66,19" name="t.cyc" dtype_id="3"/>
               </eq>
               <begin>
-                <if fl="d67" loc="d,67,6,67,8">
-                  <neqn fl="d67" loc="d,67,19,67,22" dtype_id="8">
-                    <const fl="d67" loc="d,67,24,67,29" name="&quot;E01&quot;" dtype_id="4"/>
-                    <arraysel fl="d67" loc="d,67,13,67,17" dtype_id="4">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                      <and fl="d67" loc="d,67,13,67,17" dtype_id="10">
-                        <const fl="d67" loc="d,67,13,67,17" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d67" loc="d,67,11,67,12" dtype_id="10">
-                          <varref fl="d67" loc="d,67,11,67,12" name="t.e" dtype_id="10"/>
+                <if loc="d,67,6,67,8">
+                  <neqn loc="d,67,19,67,22" dtype_id="8">
+                    <const loc="d,67,24,67,29" name="&quot;E01&quot;" dtype_id="4"/>
+                    <arraysel loc="d,67,13,67,17" dtype_id="4">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                      <and loc="d,67,13,67,17" dtype_id="10">
+                        <const loc="d,67,13,67,17" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,67,11,67,12" dtype_id="10">
+                          <varref loc="d,67,11,67,12" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
                   </neqn>
                   <begin>
-                    <assign fl="d67" loc="d,67,119,67,123" dtype_id="4">
-                      <arraysel fl="d67" loc="d,67,119,67,123" dtype_id="4">
-                        <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                        <and fl="d67" loc="d,67,119,67,123" dtype_id="10">
-                          <const fl="d67" loc="d,67,119,67,123" name="32&apos;h7" dtype_id="6"/>
-                          <ccast fl="d67" loc="d,67,117,67,118" dtype_id="10">
-                            <varref fl="d67" loc="d,67,117,67,118" name="t.e" dtype_id="10"/>
+                    <assign loc="d,67,119,67,123" dtype_id="4">
+                      <arraysel loc="d,67,119,67,123" dtype_id="4">
+                        <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                        <and loc="d,67,119,67,123" dtype_id="10">
+                          <const loc="d,67,119,67,123" name="32&apos;h7" dtype_id="6"/>
+                          <ccast loc="d,67,117,67,118" dtype_id="10">
+                            <varref loc="d,67,117,67,118" name="t.e" dtype_id="10"/>
                           </ccast>
                         </and>
                       </arraysel>
-                      <varref fl="d67" loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4"/>
+                      <varref loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4"/>
                     </assign>
-                    <display fl="d67" loc="d,67,38,67,44" displaytype="$write">
-                      <sformatf fl="d67" loc="d,67,38,67,44" name="%%Error: t/t_enum_type_methods.v:67:  got=&apos;%@&apos; exp=&apos;E01&apos;&#10;" dtype_id="4">
-                        <varref fl="d67" loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4"/>
+                    <display loc="d,67,38,67,44" displaytype="$write">
+                      <sformatf loc="d,67,38,67,44" name="%%Error: t/t_enum_type_methods.v:67:  got=&apos;%@&apos; exp=&apos;E01&apos;&#10;" dtype_id="4">
+                        <varref loc="d,67,119,67,123" name="__Vtemp_h########__0" dtype_id="4"/>
                       </sformatf>
                     </display>
-                    <stop fl="d67" loc="d,67,136,67,141"/>
+                    <stop loc="d,67,136,67,141"/>
                   </begin>
                 </if>
-                <if fl="d68" loc="d,68,6,68,8">
-                  <neq fl="d68" loc="d,68,19,68,22" dtype_id="8">
-                    <const fl="d68" loc="d,68,24,68,27" name="4&apos;h3" dtype_id="5"/>
-                    <arraysel fl="d68" loc="d,68,13,68,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d68" loc="d,68,13,68,17" dtype_id="10">
-                        <const fl="d68" loc="d,68,13,68,17" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d68" loc="d,68,11,68,12" dtype_id="10">
-                          <varref fl="d68" loc="d,68,11,68,12" name="t.e" dtype_id="10"/>
+                <if loc="d,68,6,68,8">
+                  <neq loc="d,68,19,68,22" dtype_id="8">
+                    <const loc="d,68,24,68,27" name="4&apos;h3" dtype_id="5"/>
+                    <arraysel loc="d,68,13,68,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,68,13,68,17" dtype_id="10">
+                        <const loc="d,68,13,68,17" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,68,11,68,12" dtype_id="10">
+                          <varref loc="d,68,11,68,12" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d68" loc="d,68,36,68,42" displaytype="$write">
-                      <sformatf fl="d68" loc="d,68,36,68,42" name="%%Error: t/t_enum_type_methods.v:68:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                        <arraysel fl="d68" loc="d,68,117,68,121" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d68" loc="d,68,117,68,121" dtype_id="10">
-                            <const fl="d68" loc="d,68,117,68,121" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d68" loc="d,68,115,68,116" dtype_id="10">
-                              <varref fl="d68" loc="d,68,115,68,116" name="t.e" dtype_id="10"/>
+                    <display loc="d,68,36,68,42" displaytype="$write">
+                      <sformatf loc="d,68,36,68,42" name="%%Error: t/t_enum_type_methods.v:68:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                        <arraysel loc="d,68,117,68,121" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,68,117,68,121" dtype_id="10">
+                            <const loc="d,68,117,68,121" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,68,115,68,116" dtype_id="10">
+                              <varref loc="d,68,115,68,116" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d68" loc="d,68,132,68,137"/>
+                    <stop loc="d,68,132,68,137"/>
                   </begin>
                 </if>
-                <if fl="d69" loc="d,69,6,69,8">
-                  <neq fl="d69" loc="d,69,22,69,25" dtype_id="8">
-                    <const fl="d69" loc="d,69,27,69,30" name="4&apos;h3" dtype_id="5"/>
-                    <arraysel fl="d69" loc="d,69,13,69,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d69" loc="d,69,13,69,17" dtype_id="10">
-                        <const fl="d69" loc="d,69,13,69,17" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d69" loc="d,69,11,69,12" dtype_id="10">
-                          <varref fl="d69" loc="d,69,11,69,12" name="t.e" dtype_id="10"/>
+                <if loc="d,69,6,69,8">
+                  <neq loc="d,69,22,69,25" dtype_id="8">
+                    <const loc="d,69,27,69,30" name="4&apos;h3" dtype_id="5"/>
+                    <arraysel loc="d,69,13,69,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,69,13,69,17" dtype_id="10">
+                        <const loc="d,69,13,69,17" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,69,11,69,12" dtype_id="10">
+                          <varref loc="d,69,11,69,12" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d69" loc="d,69,39,69,45" displaytype="$write">
-                      <sformatf fl="d69" loc="d,69,39,69,45" name="%%Error: t/t_enum_type_methods.v:69:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                        <arraysel fl="d69" loc="d,69,120,69,124" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d69" loc="d,69,120,69,124" dtype_id="10">
-                            <const fl="d69" loc="d,69,120,69,124" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d69" loc="d,69,118,69,119" dtype_id="10">
-                              <varref fl="d69" loc="d,69,118,69,119" name="t.e" dtype_id="10"/>
+                    <display loc="d,69,39,69,45" displaytype="$write">
+                      <sformatf loc="d,69,39,69,45" name="%%Error: t/t_enum_type_methods.v:69:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                        <arraysel loc="d,69,120,69,124" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,69,120,69,124" dtype_id="10">
+                            <const loc="d,69,120,69,124" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,69,118,69,119" dtype_id="10">
+                              <varref loc="d,69,118,69,119" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d69" loc="d,69,138,69,143"/>
+                    <stop loc="d,69,138,69,143"/>
                   </begin>
                 </if>
-                <if fl="d70" loc="d,70,6,70,8">
-                  <neq fl="d70" loc="d,70,22,70,25" dtype_id="8">
-                    <const fl="d70" loc="d,70,27,70,30" name="4&apos;h4" dtype_id="5"/>
-                    <arraysel fl="d70" loc="d,70,13,70,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d70" loc="d,70,13,70,17" dtype_id="10">
-                        <const fl="d70" loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
-                        <arraysel fl="d70" loc="d,70,13,70,17" dtype_id="10">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d70" loc="d,70,13,70,17" dtype_id="10">
-                            <const fl="d70" loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d70" loc="d,70,11,70,12" dtype_id="10">
-                              <varref fl="d70" loc="d,70,11,70,12" name="t.e" dtype_id="10"/>
+                <if loc="d,70,6,70,8">
+                  <neq loc="d,70,22,70,25" dtype_id="8">
+                    <const loc="d,70,27,70,30" name="4&apos;h4" dtype_id="5"/>
+                    <arraysel loc="d,70,13,70,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,70,13,70,17" dtype_id="10">
+                        <const loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
+                        <arraysel loc="d,70,13,70,17" dtype_id="10">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,70,13,70,17" dtype_id="10">
+                            <const loc="d,70,13,70,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,70,11,70,12" dtype_id="10">
+                              <varref loc="d,70,11,70,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
@@ -183,18 +183,18 @@
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d70" loc="d,70,39,70,45" displaytype="$write">
-                      <sformatf fl="d70" loc="d,70,39,70,45" name="%%Error: t/t_enum_type_methods.v:70:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                        <arraysel fl="d70" loc="d,70,120,70,124" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d70" loc="d,70,120,70,124" dtype_id="10">
-                            <const fl="d70" loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
-                            <arraysel fl="d70" loc="d,70,120,70,124" dtype_id="10">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d70" loc="d,70,120,70,124" dtype_id="10">
-                                <const fl="d70" loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d70" loc="d,70,118,70,119" dtype_id="10">
-                                  <varref fl="d70" loc="d,70,118,70,119" name="t.e" dtype_id="10"/>
+                    <display loc="d,70,39,70,45" displaytype="$write">
+                      <sformatf loc="d,70,39,70,45" name="%%Error: t/t_enum_type_methods.v:70:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                        <arraysel loc="d,70,120,70,124" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,70,120,70,124" dtype_id="10">
+                            <const loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
+                            <arraysel loc="d,70,120,70,124" dtype_id="10">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,70,120,70,124" dtype_id="10">
+                                <const loc="d,70,120,70,124" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,70,118,70,119" dtype_id="10">
+                                  <varref loc="d,70,118,70,119" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
@@ -202,82 +202,82 @@
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d70" loc="d,70,138,70,143"/>
+                    <stop loc="d,70,138,70,143"/>
                   </begin>
                 </if>
-                <if fl="d71" loc="d,71,6,71,8">
-                  <neq fl="d71" loc="d,71,19,71,22" dtype_id="8">
-                    <const fl="d71" loc="d,71,24,71,27" name="4&apos;h4" dtype_id="5"/>
-                    <arraysel fl="d71" loc="d,71,13,71,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                      <and fl="d71" loc="d,71,13,71,17" dtype_id="10">
-                        <const fl="d71" loc="d,71,13,71,17" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d71" loc="d,71,11,71,12" dtype_id="10">
-                          <varref fl="d71" loc="d,71,11,71,12" name="t.e" dtype_id="10"/>
+                <if loc="d,71,6,71,8">
+                  <neq loc="d,71,19,71,22" dtype_id="8">
+                    <const loc="d,71,24,71,27" name="4&apos;h4" dtype_id="5"/>
+                    <arraysel loc="d,71,13,71,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                      <and loc="d,71,13,71,17" dtype_id="10">
+                        <const loc="d,71,13,71,17" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,71,11,71,12" dtype_id="10">
+                          <varref loc="d,71,11,71,12" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d71" loc="d,71,36,71,42" displaytype="$write">
-                      <sformatf fl="d71" loc="d,71,36,71,42" name="%%Error: t/t_enum_type_methods.v:71:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                        <arraysel fl="d71" loc="d,71,117,71,121" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d71" loc="d,71,117,71,121" dtype_id="10">
-                            <const fl="d71" loc="d,71,117,71,121" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d71" loc="d,71,115,71,116" dtype_id="10">
-                              <varref fl="d71" loc="d,71,115,71,116" name="t.e" dtype_id="10"/>
+                    <display loc="d,71,36,71,42" displaytype="$write">
+                      <sformatf loc="d,71,36,71,42" name="%%Error: t/t_enum_type_methods.v:71:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                        <arraysel loc="d,71,117,71,121" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,71,117,71,121" dtype_id="10">
+                            <const loc="d,71,117,71,121" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,71,115,71,116" dtype_id="10">
+                              <varref loc="d,71,115,71,116" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d71" loc="d,71,132,71,137"/>
+                    <stop loc="d,71,132,71,137"/>
                   </begin>
                 </if>
-                <if fl="d72" loc="d,72,6,72,8">
-                  <neq fl="d72" loc="d,72,22,72,25" dtype_id="8">
-                    <const fl="d72" loc="d,72,27,72,30" name="4&apos;h4" dtype_id="5"/>
-                    <arraysel fl="d72" loc="d,72,13,72,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                      <and fl="d72" loc="d,72,13,72,17" dtype_id="10">
-                        <const fl="d72" loc="d,72,13,72,17" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d72" loc="d,72,11,72,12" dtype_id="10">
-                          <varref fl="d72" loc="d,72,11,72,12" name="t.e" dtype_id="10"/>
+                <if loc="d,72,6,72,8">
+                  <neq loc="d,72,22,72,25" dtype_id="8">
+                    <const loc="d,72,27,72,30" name="4&apos;h4" dtype_id="5"/>
+                    <arraysel loc="d,72,13,72,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                      <and loc="d,72,13,72,17" dtype_id="10">
+                        <const loc="d,72,13,72,17" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,72,11,72,12" dtype_id="10">
+                          <varref loc="d,72,11,72,12" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d72" loc="d,72,39,72,45" displaytype="$write">
-                      <sformatf fl="d72" loc="d,72,39,72,45" name="%%Error: t/t_enum_type_methods.v:72:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                        <arraysel fl="d72" loc="d,72,120,72,124" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d72" loc="d,72,120,72,124" dtype_id="10">
-                            <const fl="d72" loc="d,72,120,72,124" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d72" loc="d,72,118,72,119" dtype_id="10">
-                              <varref fl="d72" loc="d,72,118,72,119" name="t.e" dtype_id="10"/>
+                    <display loc="d,72,39,72,45" displaytype="$write">
+                      <sformatf loc="d,72,39,72,45" name="%%Error: t/t_enum_type_methods.v:72:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                        <arraysel loc="d,72,120,72,124" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,72,120,72,124" dtype_id="10">
+                            <const loc="d,72,120,72,124" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,72,118,72,119" dtype_id="10">
+                              <varref loc="d,72,118,72,119" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d72" loc="d,72,138,72,143"/>
+                    <stop loc="d,72,138,72,143"/>
                   </begin>
                 </if>
-                <if fl="d73" loc="d,73,6,73,8">
-                  <neq fl="d73" loc="d,73,22,73,25" dtype_id="8">
-                    <const fl="d73" loc="d,73,27,73,30" name="4&apos;h3" dtype_id="5"/>
-                    <arraysel fl="d73" loc="d,73,13,73,17" dtype_id="5">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                      <and fl="d73" loc="d,73,13,73,17" dtype_id="10">
-                        <const fl="d73" loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
-                        <arraysel fl="d73" loc="d,73,13,73,17" dtype_id="10">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d73" loc="d,73,13,73,17" dtype_id="10">
-                            <const fl="d73" loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d73" loc="d,73,11,73,12" dtype_id="10">
-                              <varref fl="d73" loc="d,73,11,73,12" name="t.e" dtype_id="10"/>
+                <if loc="d,73,6,73,8">
+                  <neq loc="d,73,22,73,25" dtype_id="8">
+                    <const loc="d,73,27,73,30" name="4&apos;h3" dtype_id="5"/>
+                    <arraysel loc="d,73,13,73,17" dtype_id="5">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                      <and loc="d,73,13,73,17" dtype_id="10">
+                        <const loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
+                        <arraysel loc="d,73,13,73,17" dtype_id="10">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,73,13,73,17" dtype_id="10">
+                            <const loc="d,73,13,73,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,73,11,73,12" dtype_id="10">
+                              <varref loc="d,73,11,73,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
@@ -285,18 +285,18 @@
                     </arraysel>
                   </neq>
                   <begin>
-                    <display fl="d73" loc="d,73,39,73,45" displaytype="$write">
-                      <sformatf fl="d73" loc="d,73,39,73,45" name="%%Error: t/t_enum_type_methods.v:73:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                        <arraysel fl="d73" loc="d,73,120,73,124" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d73" loc="d,73,120,73,124" dtype_id="10">
-                            <const fl="d73" loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
-                            <arraysel fl="d73" loc="d,73,120,73,124" dtype_id="10">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d73" loc="d,73,120,73,124" dtype_id="10">
-                                <const fl="d73" loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d73" loc="d,73,118,73,119" dtype_id="10">
-                                  <varref fl="d73" loc="d,73,118,73,119" name="t.e" dtype_id="10"/>
+                    <display loc="d,73,39,73,45" displaytype="$write">
+                      <sformatf loc="d,73,39,73,45" name="%%Error: t/t_enum_type_methods.v:73:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                        <arraysel loc="d,73,120,73,124" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,73,120,73,124" dtype_id="10">
+                            <const loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
+                            <arraysel loc="d,73,120,73,124" dtype_id="10">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,73,120,73,124" dtype_id="10">
+                                <const loc="d,73,120,73,124" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,73,118,73,119" dtype_id="10">
+                                  <varref loc="d,73,118,73,119" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
@@ -304,128 +304,128 @@
                         </arraysel>
                       </sformatf>
                     </display>
-                    <stop fl="d73" loc="d,73,138,73,143"/>
+                    <stop loc="d,73,138,73,143"/>
                   </begin>
                 </if>
-                <assigndly fl="d74" loc="d,74,5,74,7" dtype_id="5">
-                  <const fl="d74" loc="d,74,8,74,11" name="4&apos;h3" dtype_id="5"/>
-                  <varref fl="d74" loc="d,74,3,74,4" name="__Vdly__t.e" dtype_id="5"/>
+                <assigndly loc="d,74,5,74,7" dtype_id="5">
+                  <const loc="d,74,8,74,11" name="4&apos;h3" dtype_id="5"/>
+                  <varref loc="d,74,3,74,4" name="__Vdly__t.e" dtype_id="5"/>
                 </assigndly>
               </begin>
               <begin>
-                <if fl="d76" loc="d,76,12,76,14">
-                  <eq fl="d76" loc="d,76,19,76,21" dtype_id="8">
-                    <const fl="d76" loc="d,76,21,76,22" name="32&apos;sh2" dtype_id="7"/>
-                    <varref fl="d76" loc="d,76,16,76,19" name="t.cyc" dtype_id="3"/>
+                <if loc="d,76,12,76,14">
+                  <eq loc="d,76,19,76,21" dtype_id="8">
+                    <const loc="d,76,21,76,22" name="32&apos;sh2" dtype_id="7"/>
+                    <varref loc="d,76,16,76,19" name="t.cyc" dtype_id="3"/>
                   </eq>
                   <begin>
-                    <if fl="d77" loc="d,77,6,77,8">
-                      <neqn fl="d77" loc="d,77,19,77,22" dtype_id="8">
-                        <const fl="d77" loc="d,77,24,77,29" name="&quot;E03&quot;" dtype_id="4"/>
-                        <arraysel fl="d77" loc="d,77,13,77,17" dtype_id="4">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                          <and fl="d77" loc="d,77,13,77,17" dtype_id="10">
-                            <const fl="d77" loc="d,77,13,77,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d77" loc="d,77,11,77,12" dtype_id="10">
-                              <varref fl="d77" loc="d,77,11,77,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,77,6,77,8">
+                      <neqn loc="d,77,19,77,22" dtype_id="8">
+                        <const loc="d,77,24,77,29" name="&quot;E03&quot;" dtype_id="4"/>
+                        <arraysel loc="d,77,13,77,17" dtype_id="4">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                          <and loc="d,77,13,77,17" dtype_id="10">
+                            <const loc="d,77,13,77,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,77,11,77,12" dtype_id="10">
+                              <varref loc="d,77,11,77,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </neqn>
                       <begin>
-                        <assign fl="d77" loc="d,77,119,77,123" dtype_id="4">
-                          <arraysel fl="d77" loc="d,77,119,77,123" dtype_id="4">
-                            <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                            <and fl="d77" loc="d,77,119,77,123" dtype_id="10">
-                              <const fl="d77" loc="d,77,119,77,123" name="32&apos;h7" dtype_id="6"/>
-                              <ccast fl="d77" loc="d,77,117,77,118" dtype_id="10">
-                                <varref fl="d77" loc="d,77,117,77,118" name="t.e" dtype_id="10"/>
+                        <assign loc="d,77,119,77,123" dtype_id="4">
+                          <arraysel loc="d,77,119,77,123" dtype_id="4">
+                            <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                            <and loc="d,77,119,77,123" dtype_id="10">
+                              <const loc="d,77,119,77,123" name="32&apos;h7" dtype_id="6"/>
+                              <ccast loc="d,77,117,77,118" dtype_id="10">
+                                <varref loc="d,77,117,77,118" name="t.e" dtype_id="10"/>
                               </ccast>
                             </and>
                           </arraysel>
-                          <varref fl="d77" loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4"/>
+                          <varref loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4"/>
                         </assign>
-                        <display fl="d77" loc="d,77,38,77,44" displaytype="$write">
-                          <sformatf fl="d77" loc="d,77,38,77,44" name="%%Error: t/t_enum_type_methods.v:77:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="4">
-                            <varref fl="d77" loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4"/>
+                        <display loc="d,77,38,77,44" displaytype="$write">
+                          <sformatf loc="d,77,38,77,44" name="%%Error: t/t_enum_type_methods.v:77:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="4">
+                            <varref loc="d,77,119,77,123" name="__Vtemp_h########__1" dtype_id="4"/>
                           </sformatf>
                         </display>
-                        <stop fl="d77" loc="d,77,136,77,141"/>
+                        <stop loc="d,77,136,77,141"/>
                       </begin>
                     </if>
-                    <if fl="d78" loc="d,78,6,78,8">
-                      <neq fl="d78" loc="d,78,19,78,22" dtype_id="8">
-                        <const fl="d78" loc="d,78,24,78,27" name="4&apos;h4" dtype_id="5"/>
-                        <arraysel fl="d78" loc="d,78,13,78,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d78" loc="d,78,13,78,17" dtype_id="10">
-                            <const fl="d78" loc="d,78,13,78,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d78" loc="d,78,11,78,12" dtype_id="10">
-                              <varref fl="d78" loc="d,78,11,78,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,78,6,78,8">
+                      <neq loc="d,78,19,78,22" dtype_id="8">
+                        <const loc="d,78,24,78,27" name="4&apos;h4" dtype_id="5"/>
+                        <arraysel loc="d,78,13,78,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,78,13,78,17" dtype_id="10">
+                            <const loc="d,78,13,78,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,78,11,78,12" dtype_id="10">
+                              <varref loc="d,78,11,78,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d78" loc="d,78,36,78,42" displaytype="$write">
-                          <sformatf fl="d78" loc="d,78,36,78,42" name="%%Error: t/t_enum_type_methods.v:78:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                            <arraysel fl="d78" loc="d,78,117,78,121" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d78" loc="d,78,117,78,121" dtype_id="10">
-                                <const fl="d78" loc="d,78,117,78,121" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d78" loc="d,78,115,78,116" dtype_id="10">
-                                  <varref fl="d78" loc="d,78,115,78,116" name="t.e" dtype_id="10"/>
+                        <display loc="d,78,36,78,42" displaytype="$write">
+                          <sformatf loc="d,78,36,78,42" name="%%Error: t/t_enum_type_methods.v:78:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                            <arraysel loc="d,78,117,78,121" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,78,117,78,121" dtype_id="10">
+                                <const loc="d,78,117,78,121" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,78,115,78,116" dtype_id="10">
+                                  <varref loc="d,78,115,78,116" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d78" loc="d,78,132,78,137"/>
+                        <stop loc="d,78,132,78,137"/>
                       </begin>
                     </if>
-                    <if fl="d79" loc="d,79,6,79,8">
-                      <neq fl="d79" loc="d,79,22,79,25" dtype_id="8">
-                        <const fl="d79" loc="d,79,27,79,30" name="4&apos;h4" dtype_id="5"/>
-                        <arraysel fl="d79" loc="d,79,13,79,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d79" loc="d,79,13,79,17" dtype_id="10">
-                            <const fl="d79" loc="d,79,13,79,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d79" loc="d,79,11,79,12" dtype_id="10">
-                              <varref fl="d79" loc="d,79,11,79,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,79,6,79,8">
+                      <neq loc="d,79,22,79,25" dtype_id="8">
+                        <const loc="d,79,27,79,30" name="4&apos;h4" dtype_id="5"/>
+                        <arraysel loc="d,79,13,79,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,79,13,79,17" dtype_id="10">
+                            <const loc="d,79,13,79,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,79,11,79,12" dtype_id="10">
+                              <varref loc="d,79,11,79,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d79" loc="d,79,39,79,45" displaytype="$write">
-                          <sformatf fl="d79" loc="d,79,39,79,45" name="%%Error: t/t_enum_type_methods.v:79:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                            <arraysel fl="d79" loc="d,79,120,79,124" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d79" loc="d,79,120,79,124" dtype_id="10">
-                                <const fl="d79" loc="d,79,120,79,124" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d79" loc="d,79,118,79,119" dtype_id="10">
-                                  <varref fl="d79" loc="d,79,118,79,119" name="t.e" dtype_id="10"/>
+                        <display loc="d,79,39,79,45" displaytype="$write">
+                          <sformatf loc="d,79,39,79,45" name="%%Error: t/t_enum_type_methods.v:79:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                            <arraysel loc="d,79,120,79,124" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,79,120,79,124" dtype_id="10">
+                                <const loc="d,79,120,79,124" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,79,118,79,119" dtype_id="10">
+                                  <varref loc="d,79,118,79,119" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d79" loc="d,79,138,79,143"/>
+                        <stop loc="d,79,138,79,143"/>
                       </begin>
                     </if>
-                    <if fl="d80" loc="d,80,6,80,8">
-                      <neq fl="d80" loc="d,80,22,80,25" dtype_id="8">
-                        <const fl="d80" loc="d,80,27,80,30" name="4&apos;h1" dtype_id="5"/>
-                        <arraysel fl="d80" loc="d,80,13,80,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d80" loc="d,80,13,80,17" dtype_id="10">
-                            <const fl="d80" loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
-                            <arraysel fl="d80" loc="d,80,13,80,17" dtype_id="10">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d80" loc="d,80,13,80,17" dtype_id="10">
-                                <const fl="d80" loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d80" loc="d,80,11,80,12" dtype_id="10">
-                                  <varref fl="d80" loc="d,80,11,80,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,80,6,80,8">
+                      <neq loc="d,80,22,80,25" dtype_id="8">
+                        <const loc="d,80,27,80,30" name="4&apos;h1" dtype_id="5"/>
+                        <arraysel loc="d,80,13,80,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,80,13,80,17" dtype_id="10">
+                            <const loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
+                            <arraysel loc="d,80,13,80,17" dtype_id="10">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,80,13,80,17" dtype_id="10">
+                                <const loc="d,80,13,80,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,80,11,80,12" dtype_id="10">
+                                  <varref loc="d,80,11,80,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
@@ -433,18 +433,18 @@
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d80" loc="d,80,39,80,45" displaytype="$write">
-                          <sformatf fl="d80" loc="d,80,39,80,45" name="%%Error: t/t_enum_type_methods.v:80:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                            <arraysel fl="d80" loc="d,80,120,80,124" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d80" loc="d,80,120,80,124" dtype_id="10">
-                                <const fl="d80" loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
-                                <arraysel fl="d80" loc="d,80,120,80,124" dtype_id="10">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                  <and fl="d80" loc="d,80,120,80,124" dtype_id="10">
-                                    <const fl="d80" loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d80" loc="d,80,118,80,119" dtype_id="10">
-                                      <varref fl="d80" loc="d,80,118,80,119" name="t.e" dtype_id="10"/>
+                        <display loc="d,80,39,80,45" displaytype="$write">
+                          <sformatf loc="d,80,39,80,45" name="%%Error: t/t_enum_type_methods.v:80:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                            <arraysel loc="d,80,120,80,124" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,80,120,80,124" dtype_id="10">
+                                <const loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
+                                <arraysel loc="d,80,120,80,124" dtype_id="10">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                  <and loc="d,80,120,80,124" dtype_id="10">
+                                    <const loc="d,80,120,80,124" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,80,118,80,119" dtype_id="10">
+                                      <varref loc="d,80,118,80,119" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
@@ -452,82 +452,82 @@
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d80" loc="d,80,138,80,143"/>
+                        <stop loc="d,80,138,80,143"/>
                       </begin>
                     </if>
-                    <if fl="d81" loc="d,81,6,81,8">
-                      <neq fl="d81" loc="d,81,19,81,22" dtype_id="8">
-                        <const fl="d81" loc="d,81,24,81,27" name="4&apos;h1" dtype_id="5"/>
-                        <arraysel fl="d81" loc="d,81,13,81,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d81" loc="d,81,13,81,17" dtype_id="10">
-                            <const fl="d81" loc="d,81,13,81,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d81" loc="d,81,11,81,12" dtype_id="10">
-                              <varref fl="d81" loc="d,81,11,81,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,81,6,81,8">
+                      <neq loc="d,81,19,81,22" dtype_id="8">
+                        <const loc="d,81,24,81,27" name="4&apos;h1" dtype_id="5"/>
+                        <arraysel loc="d,81,13,81,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,81,13,81,17" dtype_id="10">
+                            <const loc="d,81,13,81,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,81,11,81,12" dtype_id="10">
+                              <varref loc="d,81,11,81,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d81" loc="d,81,36,81,42" displaytype="$write">
-                          <sformatf fl="d81" loc="d,81,36,81,42" name="%%Error: t/t_enum_type_methods.v:81:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                            <arraysel fl="d81" loc="d,81,117,81,121" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d81" loc="d,81,117,81,121" dtype_id="10">
-                                <const fl="d81" loc="d,81,117,81,121" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d81" loc="d,81,115,81,116" dtype_id="10">
-                                  <varref fl="d81" loc="d,81,115,81,116" name="t.e" dtype_id="10"/>
+                        <display loc="d,81,36,81,42" displaytype="$write">
+                          <sformatf loc="d,81,36,81,42" name="%%Error: t/t_enum_type_methods.v:81:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                            <arraysel loc="d,81,117,81,121" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,81,117,81,121" dtype_id="10">
+                                <const loc="d,81,117,81,121" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,81,115,81,116" dtype_id="10">
+                                  <varref loc="d,81,115,81,116" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d81" loc="d,81,132,81,137"/>
+                        <stop loc="d,81,132,81,137"/>
                       </begin>
                     </if>
-                    <if fl="d82" loc="d,82,6,82,8">
-                      <neq fl="d82" loc="d,82,22,82,25" dtype_id="8">
-                        <const fl="d82" loc="d,82,27,82,30" name="4&apos;h1" dtype_id="5"/>
-                        <arraysel fl="d82" loc="d,82,13,82,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d82" loc="d,82,13,82,17" dtype_id="10">
-                            <const fl="d82" loc="d,82,13,82,17" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d82" loc="d,82,11,82,12" dtype_id="10">
-                              <varref fl="d82" loc="d,82,11,82,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,82,6,82,8">
+                      <neq loc="d,82,22,82,25" dtype_id="8">
+                        <const loc="d,82,27,82,30" name="4&apos;h1" dtype_id="5"/>
+                        <arraysel loc="d,82,13,82,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,82,13,82,17" dtype_id="10">
+                            <const loc="d,82,13,82,17" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,82,11,82,12" dtype_id="10">
+                              <varref loc="d,82,11,82,12" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d82" loc="d,82,39,82,45" displaytype="$write">
-                          <sformatf fl="d82" loc="d,82,39,82,45" name="%%Error: t/t_enum_type_methods.v:82:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                            <arraysel fl="d82" loc="d,82,120,82,124" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d82" loc="d,82,120,82,124" dtype_id="10">
-                                <const fl="d82" loc="d,82,120,82,124" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d82" loc="d,82,118,82,119" dtype_id="10">
-                                  <varref fl="d82" loc="d,82,118,82,119" name="t.e" dtype_id="10"/>
+                        <display loc="d,82,39,82,45" displaytype="$write">
+                          <sformatf loc="d,82,39,82,45" name="%%Error: t/t_enum_type_methods.v:82:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                            <arraysel loc="d,82,120,82,124" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,82,120,82,124" dtype_id="10">
+                                <const loc="d,82,120,82,124" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,82,118,82,119" dtype_id="10">
+                                  <varref loc="d,82,118,82,119" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d82" loc="d,82,138,82,143"/>
+                        <stop loc="d,82,138,82,143"/>
                       </begin>
                     </if>
-                    <if fl="d83" loc="d,83,6,83,8">
-                      <neq fl="d83" loc="d,83,22,83,25" dtype_id="8">
-                        <const fl="d83" loc="d,83,27,83,30" name="4&apos;h4" dtype_id="5"/>
-                        <arraysel fl="d83" loc="d,83,13,83,17" dtype_id="5">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                          <and fl="d83" loc="d,83,13,83,17" dtype_id="10">
-                            <const fl="d83" loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
-                            <arraysel fl="d83" loc="d,83,13,83,17" dtype_id="10">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d83" loc="d,83,13,83,17" dtype_id="10">
-                                <const fl="d83" loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d83" loc="d,83,11,83,12" dtype_id="10">
-                                  <varref fl="d83" loc="d,83,11,83,12" name="t.e" dtype_id="10"/>
+                    <if loc="d,83,6,83,8">
+                      <neq loc="d,83,22,83,25" dtype_id="8">
+                        <const loc="d,83,27,83,30" name="4&apos;h4" dtype_id="5"/>
+                        <arraysel loc="d,83,13,83,17" dtype_id="5">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                          <and loc="d,83,13,83,17" dtype_id="10">
+                            <const loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
+                            <arraysel loc="d,83,13,83,17" dtype_id="10">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,83,13,83,17" dtype_id="10">
+                                <const loc="d,83,13,83,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,83,11,83,12" dtype_id="10">
+                                  <varref loc="d,83,11,83,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
@@ -535,18 +535,18 @@
                         </arraysel>
                       </neq>
                       <begin>
-                        <display fl="d83" loc="d,83,39,83,45" displaytype="$write">
-                          <sformatf fl="d83" loc="d,83,39,83,45" name="%%Error: t/t_enum_type_methods.v:83:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                            <arraysel fl="d83" loc="d,83,120,83,124" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d83" loc="d,83,120,83,124" dtype_id="10">
-                                <const fl="d83" loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
-                                <arraysel fl="d83" loc="d,83,120,83,124" dtype_id="10">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                  <and fl="d83" loc="d,83,120,83,124" dtype_id="10">
-                                    <const fl="d83" loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d83" loc="d,83,118,83,119" dtype_id="10">
-                                      <varref fl="d83" loc="d,83,118,83,119" name="t.e" dtype_id="10"/>
+                        <display loc="d,83,39,83,45" displaytype="$write">
+                          <sformatf loc="d,83,39,83,45" name="%%Error: t/t_enum_type_methods.v:83:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                            <arraysel loc="d,83,120,83,124" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,83,120,83,124" dtype_id="10">
+                                <const loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
+                                <arraysel loc="d,83,120,83,124" dtype_id="10">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                  <and loc="d,83,120,83,124" dtype_id="10">
+                                    <const loc="d,83,120,83,124" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,83,118,83,119" dtype_id="10">
+                                      <varref loc="d,83,118,83,119" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
@@ -554,128 +554,128 @@
                             </arraysel>
                           </sformatf>
                         </display>
-                        <stop fl="d83" loc="d,83,138,83,143"/>
+                        <stop loc="d,83,138,83,143"/>
                       </begin>
                     </if>
-                    <assigndly fl="d84" loc="d,84,5,84,7" dtype_id="5">
-                      <const fl="d84" loc="d,84,8,84,11" name="4&apos;h4" dtype_id="5"/>
-                      <varref fl="d84" loc="d,84,3,84,4" name="__Vdly__t.e" dtype_id="5"/>
+                    <assigndly loc="d,84,5,84,7" dtype_id="5">
+                      <const loc="d,84,8,84,11" name="4&apos;h4" dtype_id="5"/>
+                      <varref loc="d,84,3,84,4" name="__Vdly__t.e" dtype_id="5"/>
                     </assigndly>
                   </begin>
                   <begin>
-                    <if fl="d86" loc="d,86,12,86,14">
-                      <eq fl="d86" loc="d,86,19,86,21" dtype_id="8">
-                        <const fl="d86" loc="d,86,21,86,22" name="32&apos;sh3" dtype_id="7"/>
-                        <varref fl="d86" loc="d,86,16,86,19" name="t.cyc" dtype_id="3"/>
+                    <if loc="d,86,12,86,14">
+                      <eq loc="d,86,19,86,21" dtype_id="8">
+                        <const loc="d,86,21,86,22" name="32&apos;sh3" dtype_id="7"/>
+                        <varref loc="d,86,16,86,19" name="t.cyc" dtype_id="3"/>
                       </eq>
                       <begin>
-                        <if fl="d87" loc="d,87,6,87,8">
-                          <neqn fl="d87" loc="d,87,19,87,22" dtype_id="8">
-                            <const fl="d87" loc="d,87,24,87,29" name="&quot;E04&quot;" dtype_id="4"/>
-                            <arraysel fl="d87" loc="d,87,13,87,17" dtype_id="4">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                              <and fl="d87" loc="d,87,13,87,17" dtype_id="10">
-                                <const fl="d87" loc="d,87,13,87,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d87" loc="d,87,11,87,12" dtype_id="10">
-                                  <varref fl="d87" loc="d,87,11,87,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,87,6,87,8">
+                          <neqn loc="d,87,19,87,22" dtype_id="8">
+                            <const loc="d,87,24,87,29" name="&quot;E04&quot;" dtype_id="4"/>
+                            <arraysel loc="d,87,13,87,17" dtype_id="4">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                              <and loc="d,87,13,87,17" dtype_id="10">
+                                <const loc="d,87,13,87,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,87,11,87,12" dtype_id="10">
+                                  <varref loc="d,87,11,87,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </neqn>
                           <begin>
-                            <assign fl="d87" loc="d,87,119,87,123" dtype_id="4">
-                              <arraysel fl="d87" loc="d,87,119,87,123" dtype_id="4">
-                                <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                                <and fl="d87" loc="d,87,119,87,123" dtype_id="10">
-                                  <const fl="d87" loc="d,87,119,87,123" name="32&apos;h7" dtype_id="6"/>
-                                  <ccast fl="d87" loc="d,87,117,87,118" dtype_id="10">
-                                    <varref fl="d87" loc="d,87,117,87,118" name="t.e" dtype_id="10"/>
+                            <assign loc="d,87,119,87,123" dtype_id="4">
+                              <arraysel loc="d,87,119,87,123" dtype_id="4">
+                                <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                                <and loc="d,87,119,87,123" dtype_id="10">
+                                  <const loc="d,87,119,87,123" name="32&apos;h7" dtype_id="6"/>
+                                  <ccast loc="d,87,117,87,118" dtype_id="10">
+                                    <varref loc="d,87,117,87,118" name="t.e" dtype_id="10"/>
                                   </ccast>
                                 </and>
                               </arraysel>
-                              <varref fl="d87" loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4"/>
+                              <varref loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4"/>
                             </assign>
-                            <display fl="d87" loc="d,87,38,87,44" displaytype="$write">
-                              <sformatf fl="d87" loc="d,87,38,87,44" name="%%Error: t/t_enum_type_methods.v:87:  got=&apos;%@&apos; exp=&apos;E04&apos;&#10;" dtype_id="4">
-                                <varref fl="d87" loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4"/>
+                            <display loc="d,87,38,87,44" displaytype="$write">
+                              <sformatf loc="d,87,38,87,44" name="%%Error: t/t_enum_type_methods.v:87:  got=&apos;%@&apos; exp=&apos;E04&apos;&#10;" dtype_id="4">
+                                <varref loc="d,87,119,87,123" name="__Vtemp_h########__2" dtype_id="4"/>
                               </sformatf>
                             </display>
-                            <stop fl="d87" loc="d,87,136,87,141"/>
+                            <stop loc="d,87,136,87,141"/>
                           </begin>
                         </if>
-                        <if fl="d88" loc="d,88,6,88,8">
-                          <neq fl="d88" loc="d,88,19,88,22" dtype_id="8">
-                            <const fl="d88" loc="d,88,24,88,27" name="4&apos;h1" dtype_id="5"/>
-                            <arraysel fl="d88" loc="d,88,13,88,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d88" loc="d,88,13,88,17" dtype_id="10">
-                                <const fl="d88" loc="d,88,13,88,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d88" loc="d,88,11,88,12" dtype_id="10">
-                                  <varref fl="d88" loc="d,88,11,88,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,88,6,88,8">
+                          <neq loc="d,88,19,88,22" dtype_id="8">
+                            <const loc="d,88,24,88,27" name="4&apos;h1" dtype_id="5"/>
+                            <arraysel loc="d,88,13,88,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,88,13,88,17" dtype_id="10">
+                                <const loc="d,88,13,88,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,88,11,88,12" dtype_id="10">
+                                  <varref loc="d,88,11,88,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d88" loc="d,88,36,88,42" displaytype="$write">
-                              <sformatf fl="d88" loc="d,88,36,88,42" name="%%Error: t/t_enum_type_methods.v:88:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                                <arraysel fl="d88" loc="d,88,117,88,121" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                  <and fl="d88" loc="d,88,117,88,121" dtype_id="10">
-                                    <const fl="d88" loc="d,88,117,88,121" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d88" loc="d,88,115,88,116" dtype_id="10">
-                                      <varref fl="d88" loc="d,88,115,88,116" name="t.e" dtype_id="10"/>
+                            <display loc="d,88,36,88,42" displaytype="$write">
+                              <sformatf loc="d,88,36,88,42" name="%%Error: t/t_enum_type_methods.v:88:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                                <arraysel loc="d,88,117,88,121" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                  <and loc="d,88,117,88,121" dtype_id="10">
+                                    <const loc="d,88,117,88,121" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,88,115,88,116" dtype_id="10">
+                                      <varref loc="d,88,115,88,116" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d88" loc="d,88,132,88,137"/>
+                            <stop loc="d,88,132,88,137"/>
                           </begin>
                         </if>
-                        <if fl="d89" loc="d,89,6,89,8">
-                          <neq fl="d89" loc="d,89,22,89,25" dtype_id="8">
-                            <const fl="d89" loc="d,89,27,89,30" name="4&apos;h1" dtype_id="5"/>
-                            <arraysel fl="d89" loc="d,89,13,89,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d89" loc="d,89,13,89,17" dtype_id="10">
-                                <const fl="d89" loc="d,89,13,89,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d89" loc="d,89,11,89,12" dtype_id="10">
-                                  <varref fl="d89" loc="d,89,11,89,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,89,6,89,8">
+                          <neq loc="d,89,22,89,25" dtype_id="8">
+                            <const loc="d,89,27,89,30" name="4&apos;h1" dtype_id="5"/>
+                            <arraysel loc="d,89,13,89,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,89,13,89,17" dtype_id="10">
+                                <const loc="d,89,13,89,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,89,11,89,12" dtype_id="10">
+                                  <varref loc="d,89,11,89,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d89" loc="d,89,39,89,45" displaytype="$write">
-                              <sformatf fl="d89" loc="d,89,39,89,45" name="%%Error: t/t_enum_type_methods.v:89:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                                <arraysel fl="d89" loc="d,89,120,89,124" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                  <and fl="d89" loc="d,89,120,89,124" dtype_id="10">
-                                    <const fl="d89" loc="d,89,120,89,124" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d89" loc="d,89,118,89,119" dtype_id="10">
-                                      <varref fl="d89" loc="d,89,118,89,119" name="t.e" dtype_id="10"/>
+                            <display loc="d,89,39,89,45" displaytype="$write">
+                              <sformatf loc="d,89,39,89,45" name="%%Error: t/t_enum_type_methods.v:89:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                                <arraysel loc="d,89,120,89,124" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                  <and loc="d,89,120,89,124" dtype_id="10">
+                                    <const loc="d,89,120,89,124" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,89,118,89,119" dtype_id="10">
+                                      <varref loc="d,89,118,89,119" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d89" loc="d,89,138,89,143"/>
+                            <stop loc="d,89,138,89,143"/>
                           </begin>
                         </if>
-                        <if fl="d90" loc="d,90,6,90,8">
-                          <neq fl="d90" loc="d,90,22,90,25" dtype_id="8">
-                            <const fl="d90" loc="d,90,27,90,30" name="4&apos;h3" dtype_id="5"/>
-                            <arraysel fl="d90" loc="d,90,13,90,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                              <and fl="d90" loc="d,90,13,90,17" dtype_id="10">
-                                <const fl="d90" loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
-                                <arraysel fl="d90" loc="d,90,13,90,17" dtype_id="10">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                  <and fl="d90" loc="d,90,13,90,17" dtype_id="10">
-                                    <const fl="d90" loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d90" loc="d,90,11,90,12" dtype_id="10">
-                                      <varref fl="d90" loc="d,90,11,90,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,90,6,90,8">
+                          <neq loc="d,90,22,90,25" dtype_id="8">
+                            <const loc="d,90,27,90,30" name="4&apos;h3" dtype_id="5"/>
+                            <arraysel loc="d,90,13,90,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                              <and loc="d,90,13,90,17" dtype_id="10">
+                                <const loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
+                                <arraysel loc="d,90,13,90,17" dtype_id="10">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                  <and loc="d,90,13,90,17" dtype_id="10">
+                                    <const loc="d,90,13,90,17" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,90,11,90,12" dtype_id="10">
+                                      <varref loc="d,90,11,90,12" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
@@ -683,18 +683,18 @@
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d90" loc="d,90,39,90,45" displaytype="$write">
-                              <sformatf fl="d90" loc="d,90,39,90,45" name="%%Error: t/t_enum_type_methods.v:90:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                                <arraysel fl="d90" loc="d,90,120,90,124" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                  <and fl="d90" loc="d,90,120,90,124" dtype_id="10">
-                                    <const fl="d90" loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
-                                    <arraysel fl="d90" loc="d,90,120,90,124" dtype_id="10">
-                                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                                      <and fl="d90" loc="d,90,120,90,124" dtype_id="10">
-                                        <const fl="d90" loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
-                                        <ccast fl="d90" loc="d,90,118,90,119" dtype_id="10">
-                                          <varref fl="d90" loc="d,90,118,90,119" name="t.e" dtype_id="10"/>
+                            <display loc="d,90,39,90,45" displaytype="$write">
+                              <sformatf loc="d,90,39,90,45" name="%%Error: t/t_enum_type_methods.v:90:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                                <arraysel loc="d,90,120,90,124" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                  <and loc="d,90,120,90,124" dtype_id="10">
+                                    <const loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
+                                    <arraysel loc="d,90,120,90,124" dtype_id="10">
+                                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                                      <and loc="d,90,120,90,124" dtype_id="10">
+                                        <const loc="d,90,120,90,124" name="32&apos;h7" dtype_id="6"/>
+                                        <ccast loc="d,90,118,90,119" dtype_id="10">
+                                          <varref loc="d,90,118,90,119" name="t.e" dtype_id="10"/>
                                         </ccast>
                                       </and>
                                     </arraysel>
@@ -702,82 +702,82 @@
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d90" loc="d,90,138,90,143"/>
+                            <stop loc="d,90,138,90,143"/>
                           </begin>
                         </if>
-                        <if fl="d91" loc="d,91,6,91,8">
-                          <neq fl="d91" loc="d,91,19,91,22" dtype_id="8">
-                            <const fl="d91" loc="d,91,24,91,27" name="4&apos;h3" dtype_id="5"/>
-                            <arraysel fl="d91" loc="d,91,13,91,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d91" loc="d,91,13,91,17" dtype_id="10">
-                                <const fl="d91" loc="d,91,13,91,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d91" loc="d,91,11,91,12" dtype_id="10">
-                                  <varref fl="d91" loc="d,91,11,91,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,91,6,91,8">
+                          <neq loc="d,91,19,91,22" dtype_id="8">
+                            <const loc="d,91,24,91,27" name="4&apos;h3" dtype_id="5"/>
+                            <arraysel loc="d,91,13,91,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,91,13,91,17" dtype_id="10">
+                                <const loc="d,91,13,91,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,91,11,91,12" dtype_id="10">
+                                  <varref loc="d,91,11,91,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d91" loc="d,91,36,91,42" displaytype="$write">
-                              <sformatf fl="d91" loc="d,91,36,91,42" name="%%Error: t/t_enum_type_methods.v:91:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                                <arraysel fl="d91" loc="d,91,117,91,121" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                  <and fl="d91" loc="d,91,117,91,121" dtype_id="10">
-                                    <const fl="d91" loc="d,91,117,91,121" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d91" loc="d,91,115,91,116" dtype_id="10">
-                                      <varref fl="d91" loc="d,91,115,91,116" name="t.e" dtype_id="10"/>
+                            <display loc="d,91,36,91,42" displaytype="$write">
+                              <sformatf loc="d,91,36,91,42" name="%%Error: t/t_enum_type_methods.v:91:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                                <arraysel loc="d,91,117,91,121" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                  <and loc="d,91,117,91,121" dtype_id="10">
+                                    <const loc="d,91,117,91,121" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,91,115,91,116" dtype_id="10">
+                                      <varref loc="d,91,115,91,116" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d91" loc="d,91,132,91,137"/>
+                            <stop loc="d,91,132,91,137"/>
                           </begin>
                         </if>
-                        <if fl="d92" loc="d,92,6,92,8">
-                          <neq fl="d92" loc="d,92,22,92,25" dtype_id="8">
-                            <const fl="d92" loc="d,92,27,92,30" name="4&apos;h3" dtype_id="5"/>
-                            <arraysel fl="d92" loc="d,92,13,92,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d92" loc="d,92,13,92,17" dtype_id="10">
-                                <const fl="d92" loc="d,92,13,92,17" name="32&apos;h7" dtype_id="6"/>
-                                <ccast fl="d92" loc="d,92,11,92,12" dtype_id="10">
-                                  <varref fl="d92" loc="d,92,11,92,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,92,6,92,8">
+                          <neq loc="d,92,22,92,25" dtype_id="8">
+                            <const loc="d,92,27,92,30" name="4&apos;h3" dtype_id="5"/>
+                            <arraysel loc="d,92,13,92,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,92,13,92,17" dtype_id="10">
+                                <const loc="d,92,13,92,17" name="32&apos;h7" dtype_id="6"/>
+                                <ccast loc="d,92,11,92,12" dtype_id="10">
+                                  <varref loc="d,92,11,92,12" name="t.e" dtype_id="10"/>
                                 </ccast>
                               </and>
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d92" loc="d,92,39,92,45" displaytype="$write">
-                              <sformatf fl="d92" loc="d,92,39,92,45" name="%%Error: t/t_enum_type_methods.v:92:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                                <arraysel fl="d92" loc="d,92,120,92,124" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                  <and fl="d92" loc="d,92,120,92,124" dtype_id="10">
-                                    <const fl="d92" loc="d,92,120,92,124" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d92" loc="d,92,118,92,119" dtype_id="10">
-                                      <varref fl="d92" loc="d,92,118,92,119" name="t.e" dtype_id="10"/>
+                            <display loc="d,92,39,92,45" displaytype="$write">
+                              <sformatf loc="d,92,39,92,45" name="%%Error: t/t_enum_type_methods.v:92:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                                <arraysel loc="d,92,120,92,124" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                  <and loc="d,92,120,92,124" dtype_id="10">
+                                    <const loc="d,92,120,92,124" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,92,118,92,119" dtype_id="10">
+                                      <varref loc="d,92,118,92,119" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d92" loc="d,92,138,92,143"/>
+                            <stop loc="d,92,138,92,143"/>
                           </begin>
                         </if>
-                        <if fl="d93" loc="d,93,6,93,8">
-                          <neq fl="d93" loc="d,93,22,93,25" dtype_id="8">
-                            <const fl="d93" loc="d,93,27,93,30" name="4&apos;h1" dtype_id="5"/>
-                            <arraysel fl="d93" loc="d,93,13,93,17" dtype_id="5">
-                              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                              <and fl="d93" loc="d,93,13,93,17" dtype_id="10">
-                                <const fl="d93" loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
-                                <arraysel fl="d93" loc="d,93,13,93,17" dtype_id="10">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                  <and fl="d93" loc="d,93,13,93,17" dtype_id="10">
-                                    <const fl="d93" loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
-                                    <ccast fl="d93" loc="d,93,11,93,12" dtype_id="10">
-                                      <varref fl="d93" loc="d,93,11,93,12" name="t.e" dtype_id="10"/>
+                        <if loc="d,93,6,93,8">
+                          <neq loc="d,93,22,93,25" dtype_id="8">
+                            <const loc="d,93,27,93,30" name="4&apos;h1" dtype_id="5"/>
+                            <arraysel loc="d,93,13,93,17" dtype_id="5">
+                              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                              <and loc="d,93,13,93,17" dtype_id="10">
+                                <const loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
+                                <arraysel loc="d,93,13,93,17" dtype_id="10">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                  <and loc="d,93,13,93,17" dtype_id="10">
+                                    <const loc="d,93,13,93,17" name="32&apos;h7" dtype_id="6"/>
+                                    <ccast loc="d,93,11,93,12" dtype_id="10">
+                                      <varref loc="d,93,11,93,12" name="t.e" dtype_id="10"/>
                                     </ccast>
                                   </and>
                                 </arraysel>
@@ -785,18 +785,18 @@
                             </arraysel>
                           </neq>
                           <begin>
-                            <display fl="d93" loc="d,93,39,93,45" displaytype="$write">
-                              <sformatf fl="d93" loc="d,93,39,93,45" name="%%Error: t/t_enum_type_methods.v:93:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                                <arraysel fl="d93" loc="d,93,120,93,124" dtype_id="5">
-                                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                  <and fl="d93" loc="d,93,120,93,124" dtype_id="10">
-                                    <const fl="d93" loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
-                                    <arraysel fl="d93" loc="d,93,120,93,124" dtype_id="10">
-                                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                                      <and fl="d93" loc="d,93,120,93,124" dtype_id="10">
-                                        <const fl="d93" loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
-                                        <ccast fl="d93" loc="d,93,118,93,119" dtype_id="10">
-                                          <varref fl="d93" loc="d,93,118,93,119" name="t.e" dtype_id="10"/>
+                            <display loc="d,93,39,93,45" displaytype="$write">
+                              <sformatf loc="d,93,39,93,45" name="%%Error: t/t_enum_type_methods.v:93:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                                <arraysel loc="d,93,120,93,124" dtype_id="5">
+                                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                  <and loc="d,93,120,93,124" dtype_id="10">
+                                    <const loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
+                                    <arraysel loc="d,93,120,93,124" dtype_id="10">
+                                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                                      <and loc="d,93,120,93,124" dtype_id="10">
+                                        <const loc="d,93,120,93,124" name="32&apos;h7" dtype_id="6"/>
+                                        <ccast loc="d,93,118,93,119" dtype_id="10">
+                                          <varref loc="d,93,118,93,119" name="t.e" dtype_id="10"/>
                                         </ccast>
                                       </and>
                                     </arraysel>
@@ -804,25 +804,25 @@
                                 </arraysel>
                               </sformatf>
                             </display>
-                            <stop fl="d93" loc="d,93,138,93,143"/>
+                            <stop loc="d,93,138,93,143"/>
                           </begin>
                         </if>
-                        <assigndly fl="d94" loc="d,94,5,94,7" dtype_id="5">
-                          <const fl="d94" loc="d,94,8,94,11" name="4&apos;h1" dtype_id="5"/>
-                          <varref fl="d94" loc="d,94,3,94,4" name="__Vdly__t.e" dtype_id="5"/>
+                        <assigndly loc="d,94,5,94,7" dtype_id="5">
+                          <const loc="d,94,8,94,11" name="4&apos;h1" dtype_id="5"/>
+                          <varref loc="d,94,3,94,4" name="__Vdly__t.e" dtype_id="5"/>
                         </assigndly>
                       </begin>
                       <begin>
-                        <if fl="d96" loc="d,96,12,96,14">
-                          <eq fl="d96" loc="d,96,19,96,21" dtype_id="8">
-                            <const fl="d96" loc="d,96,21,96,23" name="32&apos;sh63" dtype_id="7"/>
-                            <varref fl="d96" loc="d,96,16,96,19" name="t.cyc" dtype_id="3"/>
+                        <if loc="d,96,12,96,14">
+                          <eq loc="d,96,19,96,21" dtype_id="8">
+                            <const loc="d,96,21,96,23" name="32&apos;sh63" dtype_id="7"/>
+                            <varref loc="d,96,16,96,19" name="t.cyc" dtype_id="3"/>
                           </eq>
                           <begin>
-                            <display fl="d97" loc="d,97,3,97,9" displaytype="$write">
-                              <sformatf fl="d97" loc="d,97,3,97,9" name="*-* All Finished *-*&#10;" dtype_id="4"/>
+                            <display loc="d,97,3,97,9" displaytype="$write">
+                              <sformatf loc="d,97,3,97,9" name="*-* All Finished *-*&#10;" dtype_id="4"/>
                             </display>
-                            <finish fl="d98" loc="d,98,3,98,10"/>
+                            <finish loc="d,98,3,98,10"/>
                           </begin>
                         </if>
                       </begin>
@@ -833,70 +833,70 @@
             </if>
           </begin>
         </if>
-        <assignpost fl="d61" loc="d,61,7,61,10" dtype_id="3">
-          <varref fl="d61" loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
-          <varref fl="d61" loc="d,61,7,61,10" name="t.cyc" dtype_id="3"/>
+        <assignpost loc="d,61,7,61,10" dtype_id="3">
+          <varref loc="d,61,7,61,10" name="__Vdly__t.cyc" dtype_id="3"/>
+          <varref loc="d,61,7,61,10" name="t.cyc" dtype_id="3"/>
         </assignpost>
-        <assignpost fl="d64" loc="d,64,3,64,4" dtype_id="5">
-          <varref fl="d64" loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
-          <varref fl="d64" loc="d,64,3,64,4" name="t.e" dtype_id="5"/>
+        <assignpost loc="d,64,3,64,4" dtype_id="5">
+          <varref loc="d,64,3,64,4" name="__Vdly__t.e" dtype_id="5"/>
+          <varref loc="d,64,3,64,4" name="t.e" dtype_id="5"/>
         </assignpost>
       </cfunc>
-      <cfunc fl="d22" loc="d,22,19,22,20" name="_initial__TOP__2">
-        <var fl="d27" loc="d,27,11,27,14" name="t.all" dtype_id="4" vartype="string" origName="t__DOT__all"/>
-        <var fl="d51" loc="d,51,17,51,18" name="t.unnamedblk1.e" dtype_id="2" vartype="my_t" origName="t__DOT__unnamedblk1__DOT__e"/>
-        <var fl="d48" loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4" vartype="string" origName="__Vtemp_h########__0"/>
-        <assign fl="d22" loc="d,22,19,22,20" dtype_id="3">
-          <const fl="d22" loc="d,22,19,22,20" name="32&apos;sh0" dtype_id="7"/>
-          <varref fl="d22" loc="d,22,19,22,20" name="t.cyc" dtype_id="3"/>
+      <cfunc loc="d,22,19,22,20" name="_initial__TOP__2">
+        <var loc="d,27,11,27,14" name="t.all" dtype_id="4" vartype="string" origName="t__DOT__all"/>
+        <var loc="d,51,17,51,18" name="t.unnamedblk1.e" dtype_id="2" vartype="my_t" origName="t__DOT__unnamedblk1__DOT__e"/>
+        <var loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4" vartype="string" origName="__Vtemp_h########__0"/>
+        <assign loc="d,22,19,22,20" dtype_id="3">
+          <const loc="d,22,19,22,20" name="32&apos;sh0" dtype_id="7"/>
+          <varref loc="d,22,19,22,20" name="t.cyc" dtype_id="3"/>
         </assign>
-        <assign fl="d31" loc="d,31,9,31,10" dtype_id="5">
-          <const fl="d31" loc="d,31,11,31,14" name="4&apos;h3" dtype_id="5"/>
-          <varref fl="d31" loc="d,31,7,31,8" name="t.e" dtype_id="5"/>
+        <assign loc="d,31,9,31,10" dtype_id="5">
+          <const loc="d,31,11,31,14" name="4&apos;h3" dtype_id="5"/>
+          <varref loc="d,31,7,31,8" name="t.e" dtype_id="5"/>
         </assign>
-        <if fl="d37" loc="d,37,10,37,12">
-          <neq fl="d37" loc="d,37,26,37,29" dtype_id="8">
-            <const fl="d37" loc="d,37,31,37,34" name="4&apos;h4" dtype_id="5"/>
-            <arraysel fl="d37" loc="d,37,17,37,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d37" loc="d,37,17,37,21" dtype_id="10">
-                <const fl="d37" loc="d,37,17,37,21" name="32&apos;h7" dtype_id="6"/>
-                <ccast fl="d37" loc="d,37,15,37,16" dtype_id="10">
-                  <varref fl="d37" loc="d,37,15,37,16" name="t.e" dtype_id="10"/>
+        <if loc="d,37,10,37,12">
+          <neq loc="d,37,26,37,29" dtype_id="8">
+            <const loc="d,37,31,37,34" name="4&apos;h4" dtype_id="5"/>
+            <arraysel loc="d,37,17,37,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,37,17,37,21" dtype_id="10">
+                <const loc="d,37,17,37,21" name="32&apos;h7" dtype_id="6"/>
+                <ccast loc="d,37,15,37,16" dtype_id="10">
+                  <varref loc="d,37,15,37,16" name="t.e" dtype_id="10"/>
                 </ccast>
               </and>
             </arraysel>
           </neq>
           <begin>
-            <display fl="d37" loc="d,37,43,37,49" displaytype="$write">
-              <sformatf fl="d37" loc="d,37,43,37,49" name="%%Error: t/t_enum_type_methods.v:37:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                <arraysel fl="d37" loc="d,37,124,37,128" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d37" loc="d,37,124,37,128" dtype_id="10">
-                    <const fl="d37" loc="d,37,124,37,128" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d37" loc="d,37,122,37,123" dtype_id="10">
-                      <varref fl="d37" loc="d,37,122,37,123" name="t.e" dtype_id="10"/>
+            <display loc="d,37,43,37,49" displaytype="$write">
+              <sformatf loc="d,37,43,37,49" name="%%Error: t/t_enum_type_methods.v:37:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                <arraysel loc="d,37,124,37,128" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,37,124,37,128" dtype_id="10">
+                    <const loc="d,37,124,37,128" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,37,122,37,123" dtype_id="10">
+                      <varref loc="d,37,122,37,123" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d37" loc="d,37,142,37,147"/>
+            <stop loc="d,37,142,37,147"/>
           </begin>
         </if>
-        <if fl="d38" loc="d,38,10,38,12">
-          <neq fl="d38" loc="d,38,34,38,37" dtype_id="8">
-            <const fl="d38" loc="d,38,39,38,42" name="4&apos;h1" dtype_id="5"/>
-            <arraysel fl="d38" loc="d,38,25,38,29" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d38" loc="d,38,25,38,29" dtype_id="10">
-                <const fl="d38" loc="d,38,25,38,29" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d38" loc="d,38,17,38,21" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d38" loc="d,38,17,38,21" dtype_id="10">
-                    <const fl="d38" loc="d,38,17,38,21" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d38" loc="d,38,15,38,16" dtype_id="10">
-                      <varref fl="d38" loc="d,38,15,38,16" name="t.e" dtype_id="10"/>
+        <if loc="d,38,10,38,12">
+          <neq loc="d,38,34,38,37" dtype_id="8">
+            <const loc="d,38,39,38,42" name="4&apos;h1" dtype_id="5"/>
+            <arraysel loc="d,38,25,38,29" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,38,25,38,29" dtype_id="10">
+                <const loc="d,38,25,38,29" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,38,17,38,21" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,38,17,38,21" dtype_id="10">
+                    <const loc="d,38,17,38,21" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,38,15,38,16" dtype_id="10">
+                      <varref loc="d,38,15,38,16" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
@@ -904,18 +904,18 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d38" loc="d,38,51,38,57" displaytype="$write">
-              <sformatf fl="d38" loc="d,38,51,38,57" name="%%Error: t/t_enum_type_methods.v:38:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                <arraysel fl="d38" loc="d,38,140,38,144" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d38" loc="d,38,140,38,144" dtype_id="10">
-                    <const fl="d38" loc="d,38,140,38,144" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d38" loc="d,38,132,38,136" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d38" loc="d,38,132,38,136" dtype_id="10">
-                        <const fl="d38" loc="d,38,132,38,136" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d38" loc="d,38,130,38,131" dtype_id="10">
-                          <varref fl="d38" loc="d,38,130,38,131" name="t.e" dtype_id="10"/>
+            <display loc="d,38,51,38,57" displaytype="$write">
+              <sformatf loc="d,38,51,38,57" name="%%Error: t/t_enum_type_methods.v:38:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                <arraysel loc="d,38,140,38,144" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,38,140,38,144" dtype_id="10">
+                    <const loc="d,38,140,38,144" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,38,132,38,136" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,38,132,38,136" dtype_id="10">
+                        <const loc="d,38,132,38,136" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,38,130,38,131" dtype_id="10">
+                          <varref loc="d,38,130,38,131" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -923,22 +923,22 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d38" loc="d,38,158,38,163"/>
+            <stop loc="d,38,158,38,163"/>
           </begin>
         </if>
-        <if fl="d39" loc="d,39,10,39,12">
-          <neq fl="d39" loc="d,39,26,39,29" dtype_id="8">
-            <const fl="d39" loc="d,39,31,39,34" name="4&apos;h1" dtype_id="5"/>
-            <arraysel fl="d39" loc="d,39,17,39,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d39" loc="d,39,17,39,21" dtype_id="10">
-                <const fl="d39" loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d39" loc="d,39,17,39,21" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d39" loc="d,39,17,39,21" dtype_id="10">
-                    <const fl="d39" loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d39" loc="d,39,15,39,16" dtype_id="10">
-                      <varref fl="d39" loc="d,39,15,39,16" name="t.e" dtype_id="10"/>
+        <if loc="d,39,10,39,12">
+          <neq loc="d,39,26,39,29" dtype_id="8">
+            <const loc="d,39,31,39,34" name="4&apos;h1" dtype_id="5"/>
+            <arraysel loc="d,39,17,39,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,39,17,39,21" dtype_id="10">
+                <const loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,39,17,39,21" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,39,17,39,21" dtype_id="10">
+                    <const loc="d,39,17,39,21" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,39,15,39,16" dtype_id="10">
+                      <varref loc="d,39,15,39,16" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
@@ -946,18 +946,18 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d39" loc="d,39,43,39,49" displaytype="$write">
-              <sformatf fl="d39" loc="d,39,43,39,49" name="%%Error: t/t_enum_type_methods.v:39:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                <arraysel fl="d39" loc="d,39,124,39,128" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d39" loc="d,39,124,39,128" dtype_id="10">
-                    <const fl="d39" loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d39" loc="d,39,124,39,128" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d39" loc="d,39,124,39,128" dtype_id="10">
-                        <const fl="d39" loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d39" loc="d,39,122,39,123" dtype_id="10">
-                          <varref fl="d39" loc="d,39,122,39,123" name="t.e" dtype_id="10"/>
+            <display loc="d,39,43,39,49" displaytype="$write">
+              <sformatf loc="d,39,43,39,49" name="%%Error: t/t_enum_type_methods.v:39:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                <arraysel loc="d,39,124,39,128" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,39,124,39,128" dtype_id="10">
+                    <const loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,39,124,39,128" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,39,124,39,128" dtype_id="10">
+                        <const loc="d,39,124,39,128" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,39,122,39,123" dtype_id="10">
+                          <varref loc="d,39,122,39,123" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -965,26 +965,26 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d39" loc="d,39,142,39,147"/>
+            <stop loc="d,39,142,39,147"/>
           </begin>
         </if>
-        <if fl="d40" loc="d,40,10,40,12">
-          <neq fl="d40" loc="d,40,42,40,45" dtype_id="8">
-            <const fl="d40" loc="d,40,47,40,50" name="4&apos;h3" dtype_id="5"/>
-            <arraysel fl="d40" loc="d,40,33,40,37" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d40" loc="d,40,33,40,37" dtype_id="10">
-                <const fl="d40" loc="d,40,33,40,37" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d40" loc="d,40,25,40,29" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d40" loc="d,40,25,40,29" dtype_id="10">
-                    <const fl="d40" loc="d,40,25,40,29" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d40" loc="d,40,17,40,21" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d40" loc="d,40,17,40,21" dtype_id="10">
-                        <const fl="d40" loc="d,40,17,40,21" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d40" loc="d,40,15,40,16" dtype_id="10">
-                          <varref fl="d40" loc="d,40,15,40,16" name="t.e" dtype_id="10"/>
+        <if loc="d,40,10,40,12">
+          <neq loc="d,40,42,40,45" dtype_id="8">
+            <const loc="d,40,47,40,50" name="4&apos;h3" dtype_id="5"/>
+            <arraysel loc="d,40,33,40,37" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,40,33,40,37" dtype_id="10">
+                <const loc="d,40,33,40,37" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,40,25,40,29" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,40,25,40,29" dtype_id="10">
+                    <const loc="d,40,25,40,29" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,40,17,40,21" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,40,17,40,21" dtype_id="10">
+                        <const loc="d,40,17,40,21" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,40,15,40,16" dtype_id="10">
+                          <varref loc="d,40,15,40,16" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -994,22 +994,22 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d40" loc="d,40,59,40,65" displaytype="$write">
-              <sformatf fl="d40" loc="d,40,59,40,65" name="%%Error: t/t_enum_type_methods.v:40:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                <arraysel fl="d40" loc="d,40,156,40,160" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d40" loc="d,40,156,40,160" dtype_id="10">
-                    <const fl="d40" loc="d,40,156,40,160" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d40" loc="d,40,148,40,152" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d40" loc="d,40,148,40,152" dtype_id="10">
-                        <const fl="d40" loc="d,40,148,40,152" name="32&apos;h7" dtype_id="6"/>
-                        <arraysel fl="d40" loc="d,40,140,40,144" dtype_id="10">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d40" loc="d,40,140,40,144" dtype_id="10">
-                            <const fl="d40" loc="d,40,140,40,144" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d40" loc="d,40,138,40,139" dtype_id="10">
-                              <varref fl="d40" loc="d,40,138,40,139" name="t.e" dtype_id="10"/>
+            <display loc="d,40,59,40,65" displaytype="$write">
+              <sformatf loc="d,40,59,40,65" name="%%Error: t/t_enum_type_methods.v:40:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                <arraysel loc="d,40,156,40,160" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,40,156,40,160" dtype_id="10">
+                    <const loc="d,40,156,40,160" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,40,148,40,152" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,40,148,40,152" dtype_id="10">
+                        <const loc="d,40,148,40,152" name="32&apos;h7" dtype_id="6"/>
+                        <arraysel loc="d,40,140,40,144" dtype_id="10">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,40,140,40,144" dtype_id="10">
+                            <const loc="d,40,140,40,144" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,40,138,40,139" dtype_id="10">
+                              <varref loc="d,40,138,40,139" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
@@ -1019,26 +1019,26 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d40" loc="d,40,174,40,179"/>
+            <stop loc="d,40,174,40,179"/>
           </begin>
         </if>
-        <if fl="d41" loc="d,41,10,41,12">
-          <neq fl="d41" loc="d,41,34,41,37" dtype_id="8">
-            <const fl="d41" loc="d,41,39,41,42" name="4&apos;h3" dtype_id="5"/>
-            <arraysel fl="d41" loc="d,41,25,41,29" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d41" loc="d,41,25,41,29" dtype_id="10">
-                <const fl="d41" loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d41" loc="d,41,25,41,29" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d41" loc="d,41,25,41,29" dtype_id="10">
-                    <const fl="d41" loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d41" loc="d,41,17,41,21" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d41" loc="d,41,17,41,21" dtype_id="10">
-                        <const fl="d41" loc="d,41,17,41,21" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d41" loc="d,41,15,41,16" dtype_id="10">
-                          <varref fl="d41" loc="d,41,15,41,16" name="t.e" dtype_id="10"/>
+        <if loc="d,41,10,41,12">
+          <neq loc="d,41,34,41,37" dtype_id="8">
+            <const loc="d,41,39,41,42" name="4&apos;h3" dtype_id="5"/>
+            <arraysel loc="d,41,25,41,29" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,41,25,41,29" dtype_id="10">
+                <const loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,41,25,41,29" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,41,25,41,29" dtype_id="10">
+                    <const loc="d,41,25,41,29" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,41,17,41,21" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,41,17,41,21" dtype_id="10">
+                        <const loc="d,41,17,41,21" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,41,15,41,16" dtype_id="10">
+                          <varref loc="d,41,15,41,16" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -1048,22 +1048,22 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d41" loc="d,41,51,41,57" displaytype="$write">
-              <sformatf fl="d41" loc="d,41,51,41,57" name="%%Error: t/t_enum_type_methods.v:41:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                <arraysel fl="d41" loc="d,41,140,41,144" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d41" loc="d,41,140,41,144" dtype_id="10">
-                    <const fl="d41" loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d41" loc="d,41,140,41,144" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d41" loc="d,41,140,41,144" dtype_id="10">
-                        <const fl="d41" loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
-                        <arraysel fl="d41" loc="d,41,132,41,136" dtype_id="10">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d41" loc="d,41,132,41,136" dtype_id="10">
-                            <const fl="d41" loc="d,41,132,41,136" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d41" loc="d,41,130,41,131" dtype_id="10">
-                              <varref fl="d41" loc="d,41,130,41,131" name="t.e" dtype_id="10"/>
+            <display loc="d,41,51,41,57" displaytype="$write">
+              <sformatf loc="d,41,51,41,57" name="%%Error: t/t_enum_type_methods.v:41:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                <arraysel loc="d,41,140,41,144" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,41,140,41,144" dtype_id="10">
+                    <const loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,41,140,41,144" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,41,140,41,144" dtype_id="10">
+                        <const loc="d,41,140,41,144" name="32&apos;h7" dtype_id="6"/>
+                        <arraysel loc="d,41,132,41,136" dtype_id="10">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,41,132,41,136" dtype_id="10">
+                            <const loc="d,41,132,41,136" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,41,130,41,131" dtype_id="10">
+                              <varref loc="d,41,130,41,131" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
@@ -1073,26 +1073,26 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d41" loc="d,41,158,41,163"/>
+            <stop loc="d,41,158,41,163"/>
           </begin>
         </if>
-        <if fl="d42" loc="d,42,10,42,12">
-          <neq fl="d42" loc="d,42,26,42,29" dtype_id="8">
-            <const fl="d42" loc="d,42,31,42,34" name="4&apos;h3" dtype_id="5"/>
-            <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-              <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                    <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d42" loc="d,42,17,42,21" dtype_id="10">
-                        <const fl="d42" loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d42" loc="d,42,15,42,16" dtype_id="10">
-                          <varref fl="d42" loc="d,42,15,42,16" name="t.e" dtype_id="10"/>
+        <if loc="d,42,10,42,12">
+          <neq loc="d,42,26,42,29" dtype_id="8">
+            <const loc="d,42,31,42,34" name="4&apos;h3" dtype_id="5"/>
+            <arraysel loc="d,42,17,42,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+              <and loc="d,42,17,42,21" dtype_id="10">
+                <const loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,42,17,42,21" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,42,17,42,21" dtype_id="10">
+                    <const loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,42,17,42,21" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,42,17,42,21" dtype_id="10">
+                        <const loc="d,42,17,42,21" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,42,15,42,16" dtype_id="10">
+                          <varref loc="d,42,15,42,16" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -1102,22 +1102,22 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d42" loc="d,42,43,42,49" displaytype="$write">
-              <sformatf fl="d42" loc="d,42,43,42,49" name="%%Error: t/t_enum_type_methods.v:42:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
-                <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                  <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                    <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                      <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                        <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
-                        <arraysel fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                          <and fl="d42" loc="d,42,124,42,128" dtype_id="10">
-                            <const fl="d42" loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
-                            <ccast fl="d42" loc="d,42,122,42,123" dtype_id="10">
-                              <varref fl="d42" loc="d,42,122,42,123" name="t.e" dtype_id="10"/>
+            <display loc="d,42,43,42,49" displaytype="$write">
+              <sformatf loc="d,42,43,42,49" name="%%Error: t/t_enum_type_methods.v:42:  got=&apos;h%x exp=&apos;h3&#10;" dtype_id="4">
+                <arraysel loc="d,42,124,42,128" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                  <and loc="d,42,124,42,128" dtype_id="10">
+                    <const loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,42,124,42,128" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                      <and loc="d,42,124,42,128" dtype_id="10">
+                        <const loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
+                        <arraysel loc="d,42,124,42,128" dtype_id="10">
+                          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                          <and loc="d,42,124,42,128" dtype_id="10">
+                            <const loc="d,42,124,42,128" name="32&apos;h7" dtype_id="6"/>
+                            <ccast loc="d,42,122,42,123" dtype_id="10">
+                              <varref loc="d,42,122,42,123" name="t.e" dtype_id="10"/>
                             </ccast>
                           </and>
                         </arraysel>
@@ -1127,82 +1127,82 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d42" loc="d,42,142,42,147"/>
+            <stop loc="d,42,142,42,147"/>
           </begin>
         </if>
-        <if fl="d43" loc="d,43,10,43,12">
-          <neq fl="d43" loc="d,43,23,43,26" dtype_id="8">
-            <const fl="d43" loc="d,43,28,43,31" name="4&apos;h1" dtype_id="5"/>
-            <arraysel fl="d43" loc="d,43,17,43,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-              <and fl="d43" loc="d,43,17,43,21" dtype_id="10">
-                <const fl="d43" loc="d,43,17,43,21" name="32&apos;h7" dtype_id="6"/>
-                <ccast fl="d43" loc="d,43,15,43,16" dtype_id="10">
-                  <varref fl="d43" loc="d,43,15,43,16" name="t.e" dtype_id="10"/>
+        <if loc="d,43,10,43,12">
+          <neq loc="d,43,23,43,26" dtype_id="8">
+            <const loc="d,43,28,43,31" name="4&apos;h1" dtype_id="5"/>
+            <arraysel loc="d,43,17,43,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+              <and loc="d,43,17,43,21" dtype_id="10">
+                <const loc="d,43,17,43,21" name="32&apos;h7" dtype_id="6"/>
+                <ccast loc="d,43,15,43,16" dtype_id="10">
+                  <varref loc="d,43,15,43,16" name="t.e" dtype_id="10"/>
                 </ccast>
               </and>
             </arraysel>
           </neq>
           <begin>
-            <display fl="d43" loc="d,43,40,43,46" displaytype="$write">
-              <sformatf fl="d43" loc="d,43,40,43,46" name="%%Error: t/t_enum_type_methods.v:43:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                <arraysel fl="d43" loc="d,43,121,43,125" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d43" loc="d,43,121,43,125" dtype_id="10">
-                    <const fl="d43" loc="d,43,121,43,125" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d43" loc="d,43,119,43,120" dtype_id="10">
-                      <varref fl="d43" loc="d,43,119,43,120" name="t.e" dtype_id="10"/>
+            <display loc="d,43,40,43,46" displaytype="$write">
+              <sformatf loc="d,43,40,43,46" name="%%Error: t/t_enum_type_methods.v:43:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                <arraysel loc="d,43,121,43,125" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,43,121,43,125" dtype_id="10">
+                    <const loc="d,43,121,43,125" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,43,119,43,120" dtype_id="10">
+                      <varref loc="d,43,119,43,120" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d43" loc="d,43,136,43,141"/>
+            <stop loc="d,43,136,43,141"/>
           </begin>
         </if>
-        <if fl="d44" loc="d,44,10,44,12">
-          <neq fl="d44" loc="d,44,26,44,29" dtype_id="8">
-            <const fl="d44" loc="d,44,31,44,34" name="4&apos;h1" dtype_id="5"/>
-            <arraysel fl="d44" loc="d,44,17,44,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-              <and fl="d44" loc="d,44,17,44,21" dtype_id="10">
-                <const fl="d44" loc="d,44,17,44,21" name="32&apos;h7" dtype_id="6"/>
-                <ccast fl="d44" loc="d,44,15,44,16" dtype_id="10">
-                  <varref fl="d44" loc="d,44,15,44,16" name="t.e" dtype_id="10"/>
+        <if loc="d,44,10,44,12">
+          <neq loc="d,44,26,44,29" dtype_id="8">
+            <const loc="d,44,31,44,34" name="4&apos;h1" dtype_id="5"/>
+            <arraysel loc="d,44,17,44,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+              <and loc="d,44,17,44,21" dtype_id="10">
+                <const loc="d,44,17,44,21" name="32&apos;h7" dtype_id="6"/>
+                <ccast loc="d,44,15,44,16" dtype_id="10">
+                  <varref loc="d,44,15,44,16" name="t.e" dtype_id="10"/>
                 </ccast>
               </and>
             </arraysel>
           </neq>
           <begin>
-            <display fl="d44" loc="d,44,43,44,49" displaytype="$write">
-              <sformatf fl="d44" loc="d,44,43,44,49" name="%%Error: t/t_enum_type_methods.v:44:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
-                <arraysel fl="d44" loc="d,44,124,44,128" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d44" loc="d,44,124,44,128" dtype_id="10">
-                    <const fl="d44" loc="d,44,124,44,128" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d44" loc="d,44,122,44,123" dtype_id="10">
-                      <varref fl="d44" loc="d,44,122,44,123" name="t.e" dtype_id="10"/>
+            <display loc="d,44,43,44,49" displaytype="$write">
+              <sformatf loc="d,44,43,44,49" name="%%Error: t/t_enum_type_methods.v:44:  got=&apos;h%x exp=&apos;h1&#10;" dtype_id="4">
+                <arraysel loc="d,44,124,44,128" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,44,124,44,128" dtype_id="10">
+                    <const loc="d,44,124,44,128" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,44,122,44,123" dtype_id="10">
+                      <varref loc="d,44,122,44,123" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d44" loc="d,44,142,44,147"/>
+            <stop loc="d,44,142,44,147"/>
           </begin>
         </if>
-        <if fl="d45" loc="d,45,10,45,12">
-          <neq fl="d45" loc="d,45,34,45,37" dtype_id="8">
-            <const fl="d45" loc="d,45,39,45,42" name="4&apos;h4" dtype_id="5"/>
-            <arraysel fl="d45" loc="d,45,25,45,29" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-              <and fl="d45" loc="d,45,25,45,29" dtype_id="10">
-                <const fl="d45" loc="d,45,25,45,29" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d45" loc="d,45,17,45,21" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d45" loc="d,45,17,45,21" dtype_id="10">
-                    <const fl="d45" loc="d,45,17,45,21" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d45" loc="d,45,15,45,16" dtype_id="10">
-                      <varref fl="d45" loc="d,45,15,45,16" name="t.e" dtype_id="10"/>
+        <if loc="d,45,10,45,12">
+          <neq loc="d,45,34,45,37" dtype_id="8">
+            <const loc="d,45,39,45,42" name="4&apos;h4" dtype_id="5"/>
+            <arraysel loc="d,45,25,45,29" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+              <and loc="d,45,25,45,29" dtype_id="10">
+                <const loc="d,45,25,45,29" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,45,17,45,21" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,45,17,45,21" dtype_id="10">
+                    <const loc="d,45,17,45,21" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,45,15,45,16" dtype_id="10">
+                      <varref loc="d,45,15,45,16" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
@@ -1210,18 +1210,18 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d45" loc="d,45,51,45,57" displaytype="$write">
-              <sformatf fl="d45" loc="d,45,51,45,57" name="%%Error: t/t_enum_type_methods.v:45:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                <arraysel fl="d45" loc="d,45,140,45,144" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d45" loc="d,45,140,45,144" dtype_id="10">
-                    <const fl="d45" loc="d,45,140,45,144" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d45" loc="d,45,132,45,136" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                      <and fl="d45" loc="d,45,132,45,136" dtype_id="10">
-                        <const fl="d45" loc="d,45,132,45,136" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d45" loc="d,45,130,45,131" dtype_id="10">
-                          <varref fl="d45" loc="d,45,130,45,131" name="t.e" dtype_id="10"/>
+            <display loc="d,45,51,45,57" displaytype="$write">
+              <sformatf loc="d,45,51,45,57" name="%%Error: t/t_enum_type_methods.v:45:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                <arraysel loc="d,45,140,45,144" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,45,140,45,144" dtype_id="10">
+                    <const loc="d,45,140,45,144" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,45,132,45,136" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                      <and loc="d,45,132,45,136" dtype_id="10">
+                        <const loc="d,45,132,45,136" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,45,130,45,131" dtype_id="10">
+                          <varref loc="d,45,130,45,131" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -1229,22 +1229,22 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d45" loc="d,45,158,45,163"/>
+            <stop loc="d,45,158,45,163"/>
           </begin>
         </if>
-        <if fl="d46" loc="d,46,10,46,12">
-          <neq fl="d46" loc="d,46,26,46,29" dtype_id="8">
-            <const fl="d46" loc="d,46,31,46,34" name="4&apos;h4" dtype_id="5"/>
-            <arraysel fl="d46" loc="d,46,17,46,21" dtype_id="5">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-              <and fl="d46" loc="d,46,17,46,21" dtype_id="10">
-                <const fl="d46" loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
-                <arraysel fl="d46" loc="d,46,17,46,21" dtype_id="10">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d46" loc="d,46,17,46,21" dtype_id="10">
-                    <const fl="d46" loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d46" loc="d,46,15,46,16" dtype_id="10">
-                      <varref fl="d46" loc="d,46,15,46,16" name="t.e" dtype_id="10"/>
+        <if loc="d,46,10,46,12">
+          <neq loc="d,46,26,46,29" dtype_id="8">
+            <const loc="d,46,31,46,34" name="4&apos;h4" dtype_id="5"/>
+            <arraysel loc="d,46,17,46,21" dtype_id="5">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+              <and loc="d,46,17,46,21" dtype_id="10">
+                <const loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
+                <arraysel loc="d,46,17,46,21" dtype_id="10">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,46,17,46,21" dtype_id="10">
+                    <const loc="d,46,17,46,21" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,46,15,46,16" dtype_id="10">
+                      <varref loc="d,46,15,46,16" name="t.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
@@ -1252,18 +1252,18 @@
             </arraysel>
           </neq>
           <begin>
-            <display fl="d46" loc="d,46,43,46,49" displaytype="$write">
-              <sformatf fl="d46" loc="d,46,43,46,49" name="%%Error: t/t_enum_type_methods.v:46:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
-                <arraysel fl="d46" loc="d,46,124,46,128" dtype_id="5">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                  <and fl="d46" loc="d,46,124,46,128" dtype_id="10">
-                    <const fl="d46" loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
-                    <arraysel fl="d46" loc="d,46,124,46,128" dtype_id="10">
-                      <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
-                      <and fl="d46" loc="d,46,124,46,128" dtype_id="10">
-                        <const fl="d46" loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
-                        <ccast fl="d46" loc="d,46,122,46,123" dtype_id="10">
-                          <varref fl="d46" loc="d,46,122,46,123" name="t.e" dtype_id="10"/>
+            <display loc="d,46,43,46,49" displaytype="$write">
+              <sformatf loc="d,46,43,46,49" name="%%Error: t/t_enum_type_methods.v:46:  got=&apos;h%x exp=&apos;h4&#10;" dtype_id="4">
+                <arraysel loc="d,46,124,46,128" dtype_id="5">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                  <and loc="d,46,124,46,128" dtype_id="10">
+                    <const loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
+                    <arraysel loc="d,46,124,46,128" dtype_id="10">
+                      <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+                      <and loc="d,46,124,46,128" dtype_id="10">
+                        <const loc="d,46,124,46,128" name="32&apos;h7" dtype_id="6"/>
+                        <ccast loc="d,46,122,46,123" dtype_id="10">
+                          <varref loc="d,46,122,46,123" name="t.e" dtype_id="10"/>
                         </ccast>
                       </and>
                     </arraysel>
@@ -1271,288 +1271,288 @@
                 </arraysel>
               </sformatf>
             </display>
-            <stop fl="d46" loc="d,46,142,46,147"/>
+            <stop loc="d,46,142,46,147"/>
           </begin>
         </if>
-        <if fl="d48" loc="d,48,10,48,12">
-          <neqn fl="d48" loc="d,48,23,48,26" dtype_id="8">
-            <const fl="d48" loc="d,48,28,48,33" name="&quot;E03&quot;" dtype_id="4"/>
-            <arraysel fl="d48" loc="d,48,17,48,21" dtype_id="4">
-              <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-              <and fl="d48" loc="d,48,17,48,21" dtype_id="10">
-                <const fl="d48" loc="d,48,17,48,21" name="32&apos;h7" dtype_id="6"/>
-                <ccast fl="d48" loc="d,48,15,48,16" dtype_id="10">
-                  <varref fl="d48" loc="d,48,15,48,16" name="t.e" dtype_id="10"/>
+        <if loc="d,48,10,48,12">
+          <neqn loc="d,48,23,48,26" dtype_id="8">
+            <const loc="d,48,28,48,33" name="&quot;E03&quot;" dtype_id="4"/>
+            <arraysel loc="d,48,17,48,21" dtype_id="4">
+              <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+              <and loc="d,48,17,48,21" dtype_id="10">
+                <const loc="d,48,17,48,21" name="32&apos;h7" dtype_id="6"/>
+                <ccast loc="d,48,15,48,16" dtype_id="10">
+                  <varref loc="d,48,15,48,16" name="t.e" dtype_id="10"/>
                 </ccast>
               </and>
             </arraysel>
           </neqn>
           <begin>
-            <assign fl="d48" loc="d,48,123,48,127" dtype_id="4">
-              <arraysel fl="d48" loc="d,48,123,48,127" dtype_id="4">
-                <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                <and fl="d48" loc="d,48,123,48,127" dtype_id="10">
-                  <const fl="d48" loc="d,48,123,48,127" name="32&apos;h7" dtype_id="6"/>
-                  <ccast fl="d48" loc="d,48,121,48,122" dtype_id="10">
-                    <varref fl="d48" loc="d,48,121,48,122" name="t.e" dtype_id="10"/>
+            <assign loc="d,48,123,48,127" dtype_id="4">
+              <arraysel loc="d,48,123,48,127" dtype_id="4">
+                <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                <and loc="d,48,123,48,127" dtype_id="10">
+                  <const loc="d,48,123,48,127" name="32&apos;h7" dtype_id="6"/>
+                  <ccast loc="d,48,121,48,122" dtype_id="10">
+                    <varref loc="d,48,121,48,122" name="t.e" dtype_id="10"/>
                   </ccast>
                 </and>
               </arraysel>
-              <varref fl="d48" loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4"/>
+              <varref loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4"/>
             </assign>
-            <display fl="d48" loc="d,48,42,48,48" displaytype="$write">
-              <sformatf fl="d48" loc="d,48,42,48,48" name="%%Error: t/t_enum_type_methods.v:48:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="4">
-                <varref fl="d48" loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4"/>
+            <display loc="d,48,42,48,48" displaytype="$write">
+              <sformatf loc="d,48,42,48,48" name="%%Error: t/t_enum_type_methods.v:48:  got=&apos;%@&apos; exp=&apos;E03&apos;&#10;" dtype_id="4">
+                <varref loc="d,48,123,48,127" name="__Vtemp_h########__0" dtype_id="4"/>
               </sformatf>
             </display>
-            <stop fl="d48" loc="d,48,140,48,145"/>
+            <stop loc="d,48,140,48,145"/>
           </begin>
         </if>
-        <assign fl="d50" loc="d,50,11,50,12" dtype_id="4">
-          <const fl="d50" loc="d,50,13,50,15" name="&quot;&quot;" dtype_id="4"/>
-          <varref fl="d50" loc="d,50,7,50,10" name="t.all" dtype_id="4"/>
+        <assign loc="d,50,11,50,12" dtype_id="4">
+          <const loc="d,50,13,50,15" name="&quot;&quot;" dtype_id="4"/>
+          <varref loc="d,50,7,50,10" name="t.all" dtype_id="4"/>
         </assign>
-        <assign fl="d51" loc="d,51,19,51,20" dtype_id="5">
-          <const fl="d51" loc="d,51,23,51,28" name="4&apos;h1" dtype_id="5"/>
-          <varref fl="d51" loc="d,51,17,51,18" name="t.unnamedblk1.e" dtype_id="5"/>
+        <assign loc="d,51,19,51,20" dtype_id="5">
+          <const loc="d,51,23,51,28" name="4&apos;h1" dtype_id="5"/>
+          <varref loc="d,51,17,51,18" name="t.unnamedblk1.e" dtype_id="5"/>
         </assign>
-        <while fl="d51" loc="d,51,7,51,10">
+        <while loc="d,51,7,51,10">
           <begin>
           </begin>
           <begin>
-            <neq fl="d51" loc="d,51,32,51,34" dtype_id="8">
-              <const fl="d51" loc="d,51,37,51,41" name="4&apos;h4" dtype_id="5"/>
-              <ccast fl="d51" loc="d,51,30,51,31" dtype_id="5">
-                <varref fl="d51" loc="d,51,30,51,31" name="t.unnamedblk1.e" dtype_id="5"/>
+            <neq loc="d,51,32,51,34" dtype_id="8">
+              <const loc="d,51,37,51,41" name="4&apos;h4" dtype_id="5"/>
+              <ccast loc="d,51,30,51,31" dtype_id="5">
+                <varref loc="d,51,30,51,31" name="t.unnamedblk1.e" dtype_id="5"/>
               </ccast>
             </neq>
           </begin>
           <begin>
-            <assign fl="d52" loc="d,52,7,52,8" dtype_id="4">
-              <concatn fl="d52" loc="d,52,13,52,14" dtype_id="4">
-                <varref fl="d52" loc="d,52,10,52,13" name="t.all" dtype_id="4"/>
-                <arraysel fl="d52" loc="d,52,17,52,21" dtype_id="4">
-                  <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
-                  <and fl="d52" loc="d,52,17,52,21" dtype_id="10">
-                    <const fl="d52" loc="d,52,17,52,21" name="32&apos;h7" dtype_id="6"/>
-                    <ccast fl="d52" loc="d,52,15,52,16" dtype_id="10">
-                      <varref fl="d52" loc="d,52,15,52,16" name="t.unnamedblk1.e" dtype_id="10"/>
+            <assign loc="d,52,7,52,8" dtype_id="4">
+              <concatn loc="d,52,13,52,14" dtype_id="4">
+                <varref loc="d,52,10,52,13" name="t.all" dtype_id="4"/>
+                <arraysel loc="d,52,17,52,21" dtype_id="4">
+                  <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+                  <and loc="d,52,17,52,21" dtype_id="10">
+                    <const loc="d,52,17,52,21" name="32&apos;h7" dtype_id="6"/>
+                    <ccast loc="d,52,15,52,16" dtype_id="10">
+                      <varref loc="d,52,15,52,16" name="t.unnamedblk1.e" dtype_id="10"/>
                     </ccast>
                   </and>
                 </arraysel>
               </concatn>
-              <varref fl="d52" loc="d,52,3,52,6" name="t.all" dtype_id="4"/>
+              <varref loc="d,52,3,52,6" name="t.all" dtype_id="4"/>
             </assign>
           </begin>
           <begin>
-            <assign fl="d51" loc="d,51,45,51,46" dtype_id="5">
-              <arraysel fl="d51" loc="d,51,49,51,53" dtype_id="5">
-                <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
-                <and fl="d51" loc="d,51,49,51,53" dtype_id="10">
-                  <const fl="d51" loc="d,51,49,51,53" name="32&apos;h7" dtype_id="6"/>
-                  <ccast fl="d51" loc="d,51,47,51,48" dtype_id="10">
-                    <varref fl="d51" loc="d,51,47,51,48" name="t.unnamedblk1.e" dtype_id="10"/>
+            <assign loc="d,51,45,51,46" dtype_id="5">
+              <arraysel loc="d,51,49,51,53" dtype_id="5">
+                <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+                <and loc="d,51,49,51,53" dtype_id="10">
+                  <const loc="d,51,49,51,53" name="32&apos;h7" dtype_id="6"/>
+                  <ccast loc="d,51,47,51,48" dtype_id="10">
+                    <varref loc="d,51,47,51,48" name="t.unnamedblk1.e" dtype_id="10"/>
                   </ccast>
                 </and>
               </arraysel>
-              <varref fl="d51" loc="d,51,43,51,44" name="t.unnamedblk1.e" dtype_id="5"/>
+              <varref loc="d,51,43,51,44" name="t.unnamedblk1.e" dtype_id="5"/>
             </assign>
           </begin>
         </while>
-        <assign fl="d54" loc="d,54,9,54,10" dtype_id="5">
-          <const fl="d54" loc="d,54,13,54,17" name="4&apos;h4" dtype_id="5"/>
-          <varref fl="d54" loc="d,54,7,54,8" name="t.e" dtype_id="5"/>
+        <assign loc="d,54,9,54,10" dtype_id="5">
+          <const loc="d,54,13,54,17" name="4&apos;h4" dtype_id="5"/>
+          <varref loc="d,54,7,54,8" name="t.e" dtype_id="5"/>
         </assign>
-        <assign fl="d55" loc="d,55,11,55,12" dtype_id="4">
-          <concatn fl="d55" loc="d,55,17,55,18" dtype_id="4">
-            <varref fl="d55" loc="d,55,14,55,17" name="t.all" dtype_id="4"/>
-            <const fl="d16" loc="d,16,12,16,16" name="&quot;E04&quot;" dtype_id="4"/>
+        <assign loc="d,55,11,55,12" dtype_id="4">
+          <concatn loc="d,55,17,55,18" dtype_id="4">
+            <varref loc="d,55,14,55,17" name="t.all" dtype_id="4"/>
+            <const loc="d,16,12,16,16" name="&quot;E04&quot;" dtype_id="4"/>
           </concatn>
-          <varref fl="d55" loc="d,55,7,55,10" name="t.all" dtype_id="4"/>
+          <varref loc="d,55,7,55,10" name="t.all" dtype_id="4"/>
         </assign>
-        <if fl="d56" loc="d,56,10,56,12">
-          <neqn fl="d56" loc="d,56,20,56,23" dtype_id="8">
-            <const fl="d56" loc="d,56,25,56,36" name="&quot;E01E03E04&quot;" dtype_id="4"/>
-            <varref fl="d56" loc="d,56,15,56,18" name="t.all" dtype_id="4"/>
+        <if loc="d,56,10,56,12">
+          <neqn loc="d,56,20,56,23" dtype_id="8">
+            <const loc="d,56,25,56,36" name="&quot;E01E03E04&quot;" dtype_id="4"/>
+            <varref loc="d,56,15,56,18" name="t.all" dtype_id="4"/>
           </neqn>
           <begin>
-            <display fl="d56" loc="d,56,45,56,51" displaytype="$write">
-              <sformatf fl="d56" loc="d,56,45,56,51" name="%%Error: t/t_enum_type_methods.v:56:  got=&apos;%@&apos; exp=&apos;E01E03E04&apos;&#10;" dtype_id="4">
-                <varref fl="d56" loc="d,56,124,56,127" name="t.all" dtype_id="4"/>
+            <display loc="d,56,45,56,51" displaytype="$write">
+              <sformatf loc="d,56,45,56,51" name="%%Error: t/t_enum_type_methods.v:56:  got=&apos;%@&apos; exp=&apos;E01E03E04&apos;&#10;" dtype_id="4">
+                <varref loc="d,56,124,56,127" name="t.all" dtype_id="4"/>
               </sformatf>
             </display>
-            <stop fl="d56" loc="d,56,146,56,151"/>
+            <stop loc="d,56,146,56,151"/>
           </begin>
         </if>
       </cfunc>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_eval">
-        <if fl="d60" loc="d,60,11,60,12">
-          <and fl="d60" loc="d,60,14,60,21" dtype_id="8">
-            <ccast fl="d60" loc="d,60,14,60,21" dtype_id="8">
-              <varref fl="d60" loc="d,60,14,60,21" name="clk" dtype_id="8"/>
+      <cfunc loc="d,10,8,10,9" name="_eval">
+        <if loc="d,60,11,60,12">
+          <and loc="d,60,14,60,21" dtype_id="8">
+            <ccast loc="d,60,14,60,21" dtype_id="8">
+              <varref loc="d,60,14,60,21" name="clk" dtype_id="8"/>
             </ccast>
-            <not fl="d60" loc="d,60,14,60,21" dtype_id="8">
-              <ccast fl="d60" loc="d,60,14,60,21" dtype_id="8">
-                <varref fl="d60" loc="d,60,14,60,21" name="__Vclklast__TOP__clk" dtype_id="8"/>
+            <not loc="d,60,14,60,21" dtype_id="8">
+              <ccast loc="d,60,14,60,21" dtype_id="8">
+                <varref loc="d,60,14,60,21" name="__Vclklast__TOP__clk" dtype_id="8"/>
               </ccast>
             </not>
           </and>
           <begin>
-            <ccall fl="d60" loc="d,60,4,60,10" func="_sequent__TOP__1"/>
+            <ccall loc="d,60,4,60,10" func="_sequent__TOP__1"/>
           </begin>
         </if>
-        <assign fl="d14" loc="d,14,10,14,13" dtype_id="8">
-          <varref fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="8"/>
-          <varref fl="d14" loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="8"/>
+        <assign loc="d,14,10,14,13" dtype_id="8">
+          <varref loc="d,14,10,14,13" name="clk" dtype_id="8"/>
+          <varref loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="8"/>
         </assign>
       </cfunc>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_eval_initial">
-        <assign fl="d14" loc="d,14,10,14,13" dtype_id="8">
-          <varref fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="8"/>
-          <varref fl="d14" loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="8"/>
+      <cfunc loc="d,10,8,10,9" name="_eval_initial">
+        <assign loc="d,14,10,14,13" dtype_id="8">
+          <varref loc="d,14,10,14,13" name="clk" dtype_id="8"/>
+          <varref loc="d,14,10,14,13" name="__Vclklast__TOP__clk" dtype_id="8"/>
         </assign>
-        <ccall fl="d22" loc="d,22,19,22,20" func="_initial__TOP__2"/>
+        <ccall loc="d,22,19,22,20" func="_initial__TOP__2"/>
       </cfunc>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_eval_settle"/>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_final"/>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_eval_debug_assertions">
-        <if fl="d14" loc="d,14,10,14,13">
-          <and fl="d14" loc="d,14,10,14,13" dtype_id="1">
-            <varref fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="1"/>
-            <const fl="d14" loc="d,14,10,14,13" name="8&apos;hfe" dtype_id="13"/>
+      <cfunc loc="d,10,8,10,9" name="_eval_settle"/>
+      <cfunc loc="d,10,8,10,9" name="_final"/>
+      <cfunc loc="d,10,8,10,9" name="_eval_debug_assertions">
+        <if loc="d,14,10,14,13">
+          <and loc="d,14,10,14,13" dtype_id="1">
+            <varref loc="d,14,10,14,13" name="clk" dtype_id="1"/>
+            <const loc="d,14,10,14,13" name="8&apos;hfe" dtype_id="13"/>
           </and>
           <begin>
-            <cstmt fl="d14" loc="d,14,10,14,13">
-              <text fl="d14" loc="d,14,10,14,13"/>
+            <cstmt loc="d,14,10,14,13">
+              <text loc="d,14,10,14,13"/>
             </cstmt>
           </begin>
         </if>
       </cfunc>
-      <cfunc fl="d10" loc="d,10,8,10,9" name="_ctor_var_reset">
-        <creset fl="d14" loc="d,14,10,14,13">
-          <varref fl="d14" loc="d,14,10,14,13" name="clk" dtype_id="1"/>
+      <cfunc loc="d,10,8,10,9" name="_ctor_var_reset">
+        <creset loc="d,14,10,14,13">
+          <varref loc="d,14,10,14,13" name="clk" dtype_id="1"/>
         </creset>
-        <creset fl="d22" loc="d,22,13,22,16">
-          <varref fl="d22" loc="d,22,13,22,16" name="t.cyc" dtype_id="3"/>
+        <creset loc="d,22,13,22,16">
+          <varref loc="d,22,13,22,16" name="t.cyc" dtype_id="3"/>
         </creset>
-        <creset fl="d23" loc="d,23,9,23,10">
-          <varref fl="d23" loc="d,23,9,23,10" name="t.e" dtype_id="2"/>
+        <creset loc="d,23,9,23,10">
+          <varref loc="d,23,9,23,10" name="t.e" dtype_id="2"/>
         </creset>
       </cfunc>
-      <cuse fl="a0" loc="a,0,0,0,0" name="$unit"/>
+      <cuse loc="a,0,0,0,0" name="$unit"/>
     </module>
-    <package fl="a0" loc="a,0,0,0,0" name="$unit" origName="__024unit">
-      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11" vartype="" origName="__Venumtab_enum_next0">
+    <package loc="a,0,0,0,0" name="$unit" origName="__024unit">
+      <var loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11" vartype="" origName="__Venumtab_enum_next0">
         <initarray>
           <inititem index="1">
-            <const fl="d18" loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
+            <const loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
           </inititem>
           <inititem index="3">
-            <const fl="d19" loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
+            <const loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
           </inititem>
           <inititem index="4">
-            <const fl="d17" loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
+            <const loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
           </inititem>
         </initarray>
       </var>
-      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12" vartype="" origName="__Venumtab_enum_prev1">
+      <var loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12" vartype="" origName="__Venumtab_enum_prev1">
         <initarray>
           <inititem index="1">
-            <const fl="d19" loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
+            <const loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
           </inititem>
           <inititem index="3">
-            <const fl="d17" loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
+            <const loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
           </inititem>
           <inititem index="4">
-            <const fl="d18" loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
+            <const loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
           </inititem>
         </initarray>
       </var>
-      <var fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9" vartype="" origName="__Venumtab_enum_name2">
+      <var loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9" vartype="" origName="__Venumtab_enum_name2">
         <initarray>
           <inititem index="1">
-            <const fl="d16" loc="d,16,12,16,16" name="&quot;E01&quot;" dtype_id="4"/>
+            <const loc="d,16,12,16,16" name="&quot;E01&quot;" dtype_id="4"/>
           </inititem>
           <inititem index="3">
-            <const fl="d16" loc="d,16,12,16,16" name="&quot;E03&quot;" dtype_id="4"/>
+            <const loc="d,16,12,16,16" name="&quot;E03&quot;" dtype_id="4"/>
           </inititem>
           <inititem index="4">
-            <const fl="d16" loc="d,16,12,16,16" name="&quot;E04&quot;" dtype_id="4"/>
+            <const loc="d,16,12,16,16" name="&quot;E04&quot;" dtype_id="4"/>
           </inititem>
         </initarray>
       </var>
-      <scope fl="a0" loc="a,0,0,0,0" name="$unit"/>
-      <cfunc fl="a0" loc="a,0,0,0,0" name="_ctor_var_reset">
-        <creset fl="d16" loc="d,16,12,16,16">
-          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
+      <scope loc="a,0,0,0,0" name="$unit"/>
+      <cfunc loc="a,0,0,0,0" name="_ctor_var_reset">
+        <creset loc="d,16,12,16,16">
+          <varref loc="d,16,12,16,16" name="__Venumtab_enum_next0" dtype_id="11"/>
         </creset>
-        <creset fl="d16" loc="d,16,12,16,16">
-          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
+        <creset loc="d,16,12,16,16">
+          <varref loc="d,16,12,16,16" name="__Venumtab_enum_prev1" dtype_id="12"/>
         </creset>
-        <creset fl="d16" loc="d,16,12,16,16">
-          <varref fl="d16" loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
+        <creset loc="d,16,12,16,16">
+          <varref loc="d,16,12,16,16" name="__Venumtab_enum_name2" dtype_id="9"/>
         </creset>
       </cfunc>
     </package>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck__Syms.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck__Syms.h"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck.h"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root.h"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit.h"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__Slow.cpp"/>
-    <cfile fl="a0" loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__DepSet_h########__0__Slow.cpp"/>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d32" loc="d,32,24,32,27" id="1" name="logic"/>
-      <basicdtype fl="d52" loc="d,52,9,52,10" id="6" name="logic" left="31" right="0"/>
-      <basicdtype fl="d16" loc="d,16,17,16,18" id="2" name="logic" left="3" right="0"/>
-      <enumdtype fl="d16" loc="d,16,12,16,16" id="14" name="t.my_t" sub_dtype_id="2">
-        <enumitem fl="d17" loc="d,17,10,17,13" name="E01" dtype_id="5">
-          <const fl="d17" loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck__Syms.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck__Syms.h"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck.h"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root.h"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit.h"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__Slow.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0__Slow.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0__Slow.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$root__DepSet_h########__0.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__Slow.cpp"/>
+    <cfile loc="a,0,0,0,0" name="obj_vlt/t_xml_debugcheck/Vt_xml_debugcheck_$unit__DepSet_h########__0__Slow.cpp"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,32,24,32,27" id="1" name="logic"/>
+      <basicdtype loc="d,52,9,52,10" id="6" name="logic" left="31" right="0"/>
+      <basicdtype loc="d,16,17,16,18" id="2" name="logic" left="3" right="0"/>
+      <enumdtype loc="d,16,12,16,16" id="14" name="t.my_t" sub_dtype_id="2">
+        <enumitem loc="d,17,10,17,13" name="E01" dtype_id="5">
+          <const loc="d,17,16,17,17" name="4&apos;h1" dtype_id="5"/>
         </enumitem>
-        <enumitem fl="d18" loc="d,18,10,18,13" name="E03" dtype_id="5">
-          <const fl="d18" loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
+        <enumitem loc="d,18,10,18,13" name="E03" dtype_id="5">
+          <const loc="d,18,16,18,17" name="4&apos;h3" dtype_id="5"/>
         </enumitem>
-        <enumitem fl="d19" loc="d,19,10,19,13" name="E04" dtype_id="5">
-          <const fl="d19" loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
+        <enumitem loc="d,19,10,19,13" name="E04" dtype_id="5">
+          <const loc="d,19,16,19,17" name="4&apos;h4" dtype_id="5"/>
         </enumitem>
       </enumdtype>
-      <basicdtype fl="d22" loc="d,22,4,22,11" id="3" name="integer" left="31" right="0" signed="true"/>
-      <refdtype fl="d23" loc="d,23,4,23,8" id="15" name="my_t" sub_dtype_id="2"/>
-      <basicdtype fl="d27" loc="d,27,4,27,10" id="4" name="string"/>
-      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="11" sub_dtype_id="2">
-        <range fl="d16" loc="d,16,12,16,16">
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
+      <basicdtype loc="d,22,4,22,11" id="3" name="integer" left="31" right="0" signed="true"/>
+      <refdtype loc="d,23,4,23,8" id="15" name="my_t" sub_dtype_id="2"/>
+      <basicdtype loc="d,27,4,27,10" id="4" name="string"/>
+      <unpackarraydtype loc="d,16,12,16,16" id="11" sub_dtype_id="2">
+        <range loc="d,16,12,16,16">
+          <const loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
+          <const loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
         </range>
       </unpackarraydtype>
-      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="12" sub_dtype_id="2">
-        <range fl="d16" loc="d,16,12,16,16">
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
+      <unpackarraydtype loc="d,16,12,16,16" id="12" sub_dtype_id="2">
+        <range loc="d,16,12,16,16">
+          <const loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
+          <const loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
         </range>
       </unpackarraydtype>
-      <unpackarraydtype fl="d16" loc="d,16,12,16,16" id="9" sub_dtype_id="4">
-        <range fl="d16" loc="d,16,12,16,16">
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
-          <const fl="d16" loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
+      <unpackarraydtype loc="d,16,12,16,16" id="9" sub_dtype_id="4">
+        <range loc="d,16,12,16,16">
+          <const loc="d,16,12,16,16" name="32&apos;h7" dtype_id="6"/>
+          <const loc="d,16,12,16,16" name="32&apos;h0" dtype_id="6"/>
         </range>
       </unpackarraydtype>
-      <refdtype fl="d51" loc="d,51,12,51,16" id="16" name="my_t" sub_dtype_id="2"/>
-      <basicdtype fl="d22" loc="d,22,19,22,20" id="7" name="logic" left="31" right="0" signed="true"/>
-      <basicdtype fl="d64" loc="d,64,3,64,4" id="5" name="logic" left="31" right="0"/>
-      <basicdtype fl="d62" loc="d,62,14,62,16" id="8" name="logic" left="31" right="0"/>
-      <basicdtype fl="d67" loc="d,67,13,67,17" id="10" name="logic" left="31" right="0"/>
-      <basicdtype fl="d14" loc="d,14,10,14,13" id="13" name="logic" left="7" right="0"/>
+      <refdtype loc="d,51,12,51,16" id="16" name="my_t" sub_dtype_id="2"/>
+      <basicdtype loc="d,22,19,22,20" id="7" name="logic" left="31" right="0" signed="true"/>
+      <basicdtype loc="d,64,3,64,4" id="5" name="logic" left="31" right="0"/>
+      <basicdtype loc="d,62,14,62,16" id="8" name="logic" left="31" right="0"/>
+      <basicdtype loc="d,67,13,67,17" id="10" name="logic" left="31" right="0"/>
+      <basicdtype loc="d,14,10,14,13" id="13" name="logic" left="7" right="0"/>
     </typetable>
     <constpool>
-      <module fl="a0" loc="a,0,0,0,0" name="@CONST-POOL@" origName="@CONST-POOL@">
-        <scope fl="a0" loc="a,0,0,0,0" name="TOP"/>
+      <module loc="a,0,0,0,0" name="@CONST-POOL@" origName="@CONST-POOL@">
+        <scope loc="a,0,0,0,0" name="TOP"/>
       </module>
     </constpool>
   </netlist>
diff --git a/test_regress/t/t_xml_first.out b/test_regress/t/t_xml_first.out
index 929ff89c1..51bf2a9aa 100644
--- a/test_regress/t/t_xml_first.out
+++ b/test_regress/t/t_xml_first.out
@@ -11,75 +11,75 @@
     <file id="d" filename="t/t_xml_first.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d7" loc="d,7,8,7,9" name="t" submodname="t" hier="t">
-      <cell fl="d20" loc="d,20,4,20,9" name="cell1" submodname="mod1__W4" hier="t.cell1"/>
-      <cell fl="d25" loc="d,25,6,25,11" name="cell2" submodname="mod2" hier="t.cell2"/>
+    <cell loc="d,7,8,7,9" name="t" submodname="t" hier="t">
+      <cell loc="d,20,4,20,9" name="cell1" submodname="mod1__W4" hier="t.cell1"/>
+      <cell loc="d,25,6,25,11" name="cell2" submodname="mod2" hier="t.cell2"/>
     </cell>
   </cells>
   <netlist>
-    <module fl="d7" loc="d,7,8,7,9" name="t" origName="t" topModule="1">
-      <var fl="d13" loc="d,13,10,13,13" name="clk" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="clk"/>
-      <var fl="d14" loc="d,14,16,14,17" name="d" dtype_id="2" dir="input" pinIndex="3" vartype="logic" origName="d"/>
-      <var fl="d15" loc="d,15,22,15,23" name="q" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="q"/>
-      <var fl="d17" loc="d,17,22,17,29" name="between" dtype_id="2" vartype="logic" origName="between"/>
-      <instance fl="d20" loc="d,20,4,20,9" name="cell1" defName="mod1__W4" origName="cell1">
-        <port fl="d20" loc="d,20,12,20,13" name="q" direction="out" portIndex="1">
-          <varref fl="d20" loc="d,20,14,20,21" name="between" dtype_id="2"/>
+    <module loc="d,7,8,7,9" name="t" origName="t" topModule="1">
+      <var loc="d,13,10,13,13" name="clk" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="clk"/>
+      <var loc="d,14,16,14,17" name="d" dtype_id="2" dir="input" pinIndex="3" vartype="logic" origName="d"/>
+      <var loc="d,15,22,15,23" name="q" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="q"/>
+      <var loc="d,17,22,17,29" name="between" dtype_id="2" vartype="logic" origName="between"/>
+      <instance loc="d,20,4,20,9" name="cell1" defName="mod1__W4" origName="cell1">
+        <port loc="d,20,12,20,13" name="q" direction="out" portIndex="1">
+          <varref loc="d,20,14,20,21" name="between" dtype_id="2"/>
         </port>
-        <port fl="d21" loc="d,21,12,21,15" name="clk" direction="in" portIndex="2">
-          <varref fl="d21" loc="d,21,42,21,45" name="clk" dtype_id="1"/>
+        <port loc="d,21,12,21,15" name="clk" direction="in" portIndex="2">
+          <varref loc="d,21,42,21,45" name="clk" dtype_id="1"/>
         </port>
-        <port fl="d22" loc="d,22,12,22,13" name="d" direction="in" portIndex="3">
-          <varref fl="d22" loc="d,22,42,22,43" name="d" dtype_id="2"/>
+        <port loc="d,22,12,22,13" name="d" direction="in" portIndex="3">
+          <varref loc="d,22,42,22,43" name="d" dtype_id="2"/>
         </port>
       </instance>
-      <instance fl="d25" loc="d,25,6,25,11" name="cell2" defName="mod2" origName="cell2">
-        <port fl="d25" loc="d,25,14,25,15" name="d" direction="in" portIndex="1">
-          <varref fl="d25" loc="d,25,16,25,23" name="between" dtype_id="2"/>
+      <instance loc="d,25,6,25,11" name="cell2" defName="mod2" origName="cell2">
+        <port loc="d,25,14,25,15" name="d" direction="in" portIndex="1">
+          <varref loc="d,25,16,25,23" name="between" dtype_id="2"/>
         </port>
-        <port fl="d26" loc="d,26,14,26,15" name="q" direction="out" portIndex="2">
-          <varref fl="d26" loc="d,26,42,26,43" name="q" dtype_id="2"/>
+        <port loc="d,26,14,26,15" name="q" direction="out" portIndex="2">
+          <varref loc="d,26,42,26,43" name="q" dtype_id="2"/>
         </port>
-        <port fl="d27" loc="d,27,14,27,17" name="clk" direction="in" portIndex="3">
-          <varref fl="d27" loc="d,27,42,27,45" name="clk" dtype_id="1"/>
+        <port loc="d,27,14,27,17" name="clk" direction="in" portIndex="3">
+          <varref loc="d,27,42,27,45" name="clk" dtype_id="1"/>
         </port>
       </instance>
     </module>
-    <module fl="d31" loc="d,31,8,31,12" name="mod1__W4" origName="mod1">
-      <var fl="d32" loc="d,32,15,32,20" name="WIDTH" dtype_id="3" vartype="logic" origName="WIDTH" param="true">
-        <const fl="d19" loc="d,19,18,19,19" name="32&apos;sh4" dtype_id="3"/>
+    <module loc="d,31,8,31,12" name="mod1__W4" origName="mod1">
+      <var loc="d,32,15,32,20" name="WIDTH" dtype_id="3" vartype="logic" origName="WIDTH" param="true">
+        <const loc="d,19,18,19,19" name="32&apos;sh4" dtype_id="3"/>
       </var>
-      <var fl="d34" loc="d,34,24,34,27" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
-      <var fl="d35" loc="d,35,30,35,31" name="d" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="d"/>
-      <var fl="d36" loc="d,36,30,36,31" name="q" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="q"/>
-      <var fl="d39" loc="d,39,15,39,22" name="IGNORED" dtype_id="3" vartype="logic" origName="IGNORED" localparam="true">
-        <const fl="d39" loc="d,39,25,39,26" name="32&apos;sh1" dtype_id="3"/>
+      <var loc="d,34,24,34,27" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
+      <var loc="d,35,30,35,31" name="d" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="d"/>
+      <var loc="d,36,30,36,31" name="q" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="q"/>
+      <var loc="d,39,15,39,22" name="IGNORED" dtype_id="3" vartype="logic" origName="IGNORED" localparam="true">
+        <const loc="d,39,25,39,26" name="32&apos;sh1" dtype_id="3"/>
       </var>
-      <always fl="d41" loc="d,41,4,41,10">
-        <sentree fl="d41" loc="d,41,11,41,12">
-          <senitem fl="d41" loc="d,41,13,41,20" edgeType="POS">
-            <varref fl="d41" loc="d,41,21,41,24" name="clk" dtype_id="1"/>
+      <always loc="d,41,4,41,10">
+        <sentree loc="d,41,11,41,12">
+          <senitem loc="d,41,13,41,20" edgeType="POS">
+            <varref loc="d,41,21,41,24" name="clk" dtype_id="1"/>
           </senitem>
         </sentree>
-        <assigndly fl="d42" loc="d,42,8,42,10" dtype_id="2">
-          <varref fl="d42" loc="d,42,11,42,12" name="d" dtype_id="2"/>
-          <varref fl="d42" loc="d,42,6,42,7" name="q" dtype_id="2"/>
+        <assigndly loc="d,42,8,42,10" dtype_id="2">
+          <varref loc="d,42,11,42,12" name="d" dtype_id="2"/>
+          <varref loc="d,42,6,42,7" name="q" dtype_id="2"/>
         </assigndly>
       </always>
     </module>
-    <module fl="d46" loc="d,46,8,46,12" name="mod2" origName="mod2">
-      <var fl="d48" loc="d,48,10,48,13" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
-      <var fl="d49" loc="d,49,16,49,17" name="d" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="d"/>
-      <var fl="d50" loc="d,50,22,50,23" name="q" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="q"/>
-      <contassign fl="d53" loc="d,53,13,53,14" dtype_id="2">
-        <varref fl="d53" loc="d,53,15,53,16" name="d" dtype_id="2"/>
-        <varref fl="d53" loc="d,53,11,53,12" name="q" dtype_id="2"/>
+    <module loc="d,46,8,46,12" name="mod2" origName="mod2">
+      <var loc="d,48,10,48,13" name="clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
+      <var loc="d,49,16,49,17" name="d" dtype_id="2" dir="input" pinIndex="2" vartype="logic" origName="d"/>
+      <var loc="d,50,22,50,23" name="q" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="q"/>
+      <contassign loc="d,53,13,53,14" dtype_id="2">
+        <varref loc="d,53,15,53,16" name="d" dtype_id="2"/>
+        <varref loc="d,53,11,53,12" name="q" dtype_id="2"/>
       </contassign>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d48" loc="d,48,10,48,13" id="1" name="logic"/>
-      <basicdtype fl="d14" loc="d,14,10,14,11" id="2" name="logic" left="3" right="0"/>
-      <basicdtype fl="d19" loc="d,19,18,19,19" id="3" name="logic" left="31" right="0" signed="true"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,48,10,48,13" id="1" name="logic"/>
+      <basicdtype loc="d,14,10,14,11" id="2" name="logic" left="3" right="0"/>
+      <basicdtype loc="d,19,18,19,19" id="3" name="logic" left="31" right="0" signed="true"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_flat.out b/test_regress/t/t_xml_flat.out
index ea35502fc..fac6779bb 100644
--- a/test_regress/t/t_xml_flat.out
+++ b/test_regress/t/t_xml_flat.out
@@ -11,104 +11,104 @@
     <file id="d" filename="t/t_xml_first.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d7" loc="d,7,8,7,9" name="$root" submodname="$root" hier="$root"/>
+    <cell loc="d,7,8,7,9" name="$root" submodname="$root" hier="$root"/>
   </cells>
   <netlist>
-    <module fl="d7" loc="d,7,8,7,9" name="$root" origName="$root" topModule="1" public="true">
-      <var fl="d13" loc="d,13,10,13,13" name="clk" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="clk" clocker="true" public="true"/>
-      <var fl="d14" loc="d,14,16,14,17" name="d" dtype_id="2" dir="input" pinIndex="3" vartype="logic" origName="d" public="true"/>
-      <var fl="d15" loc="d,15,22,15,23" name="q" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="q" public="true"/>
-      <var fl="d13" loc="d,13,10,13,13" name="t.clk" dtype_id="1" vartype="logic" origName="clk"/>
-      <var fl="d14" loc="d,14,16,14,17" name="t.d" dtype_id="2" vartype="logic" origName="d"/>
-      <var fl="d15" loc="d,15,22,15,23" name="t.q" dtype_id="2" vartype="logic" origName="q"/>
-      <var fl="d17" loc="d,17,22,17,29" name="t.between" dtype_id="2" vartype="logic" origName="between"/>
-      <var fl="d32" loc="d,32,15,32,20" name="t.cell1.WIDTH" dtype_id="3" vartype="logic" origName="WIDTH" param="true">
-        <const fl="d19" loc="d,19,18,19,19" name="32&apos;sh4" dtype_id="3"/>
+    <module loc="d,7,8,7,9" name="$root" origName="$root" topModule="1" public="true">
+      <var loc="d,13,10,13,13" name="clk" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="clk" clocker="true" public="true"/>
+      <var loc="d,14,16,14,17" name="d" dtype_id="2" dir="input" pinIndex="3" vartype="logic" origName="d" public="true"/>
+      <var loc="d,15,22,15,23" name="q" dtype_id="2" dir="output" pinIndex="1" vartype="logic" origName="q" public="true"/>
+      <var loc="d,13,10,13,13" name="t.clk" dtype_id="1" vartype="logic" origName="clk"/>
+      <var loc="d,14,16,14,17" name="t.d" dtype_id="2" vartype="logic" origName="d"/>
+      <var loc="d,15,22,15,23" name="t.q" dtype_id="2" vartype="logic" origName="q"/>
+      <var loc="d,17,22,17,29" name="t.between" dtype_id="2" vartype="logic" origName="between"/>
+      <var loc="d,32,15,32,20" name="t.cell1.WIDTH" dtype_id="3" vartype="logic" origName="WIDTH" param="true">
+        <const loc="d,19,18,19,19" name="32&apos;sh4" dtype_id="3"/>
       </var>
-      <var fl="d34" loc="d,34,24,34,27" name="t.cell1.clk" dtype_id="1" vartype="logic" origName="clk"/>
-      <var fl="d35" loc="d,35,30,35,31" name="t.cell1.d" dtype_id="2" vartype="logic" origName="d"/>
-      <var fl="d36" loc="d,36,30,36,31" name="t.cell1.q" dtype_id="2" vartype="logic" origName="q"/>
-      <var fl="d39" loc="d,39,15,39,22" name="t.cell1.IGNORED" dtype_id="3" vartype="logic" origName="IGNORED" localparam="true">
-        <const fl="d39" loc="d,39,25,39,26" name="32&apos;sh1" dtype_id="3"/>
+      <var loc="d,34,24,34,27" name="t.cell1.clk" dtype_id="1" vartype="logic" origName="clk"/>
+      <var loc="d,35,30,35,31" name="t.cell1.d" dtype_id="2" vartype="logic" origName="d"/>
+      <var loc="d,36,30,36,31" name="t.cell1.q" dtype_id="2" vartype="logic" origName="q"/>
+      <var loc="d,39,15,39,22" name="t.cell1.IGNORED" dtype_id="3" vartype="logic" origName="IGNORED" localparam="true">
+        <const loc="d,39,25,39,26" name="32&apos;sh1" dtype_id="3"/>
       </var>
-      <var fl="d48" loc="d,48,10,48,13" name="t.cell2.clk" dtype_id="1" vartype="logic" origName="clk"/>
-      <var fl="d49" loc="d,49,16,49,17" name="t.cell2.d" dtype_id="2" vartype="logic" origName="d"/>
-      <var fl="d50" loc="d,50,22,50,23" name="t.cell2.q" dtype_id="2" vartype="logic" origName="q"/>
-      <topscope fl="d7" loc="d,7,8,7,9">
-        <scope fl="d7" loc="d,7,8,7,9" name="TOP">
-          <varscope fl="d13" loc="d,13,10,13,13" name="clk" dtype_id="1"/>
-          <varscope fl="d14" loc="d,14,16,14,17" name="d" dtype_id="2"/>
-          <varscope fl="d15" loc="d,15,22,15,23" name="q" dtype_id="2"/>
-          <varscope fl="d13" loc="d,13,10,13,13" name="t.clk" dtype_id="1"/>
-          <varscope fl="d14" loc="d,14,16,14,17" name="t.d" dtype_id="2"/>
-          <varscope fl="d15" loc="d,15,22,15,23" name="t.q" dtype_id="2"/>
-          <varscope fl="d17" loc="d,17,22,17,29" name="t.between" dtype_id="2"/>
-          <varscope fl="d32" loc="d,32,15,32,20" name="t.cell1.WIDTH" dtype_id="3"/>
-          <varscope fl="d34" loc="d,34,24,34,27" name="t.cell1.clk" dtype_id="1"/>
-          <varscope fl="d35" loc="d,35,30,35,31" name="t.cell1.d" dtype_id="2"/>
-          <varscope fl="d36" loc="d,36,30,36,31" name="t.cell1.q" dtype_id="2"/>
-          <varscope fl="d39" loc="d,39,15,39,22" name="t.cell1.IGNORED" dtype_id="3"/>
-          <varscope fl="d48" loc="d,48,10,48,13" name="t.cell2.clk" dtype_id="1"/>
-          <varscope fl="d49" loc="d,49,16,49,17" name="t.cell2.d" dtype_id="2"/>
-          <varscope fl="d50" loc="d,50,22,50,23" name="t.cell2.q" dtype_id="2"/>
-          <assignalias fl="d13" loc="d,13,10,13,13" dtype_id="1">
-            <varref fl="d13" loc="d,13,10,13,13" name="clk" dtype_id="1"/>
-            <varref fl="d13" loc="d,13,10,13,13" name="clk" dtype_id="1"/>
+      <var loc="d,48,10,48,13" name="t.cell2.clk" dtype_id="1" vartype="logic" origName="clk"/>
+      <var loc="d,49,16,49,17" name="t.cell2.d" dtype_id="2" vartype="logic" origName="d"/>
+      <var loc="d,50,22,50,23" name="t.cell2.q" dtype_id="2" vartype="logic" origName="q"/>
+      <topscope loc="d,7,8,7,9">
+        <scope loc="d,7,8,7,9" name="TOP">
+          <varscope loc="d,13,10,13,13" name="clk" dtype_id="1"/>
+          <varscope loc="d,14,16,14,17" name="d" dtype_id="2"/>
+          <varscope loc="d,15,22,15,23" name="q" dtype_id="2"/>
+          <varscope loc="d,13,10,13,13" name="t.clk" dtype_id="1"/>
+          <varscope loc="d,14,16,14,17" name="t.d" dtype_id="2"/>
+          <varscope loc="d,15,22,15,23" name="t.q" dtype_id="2"/>
+          <varscope loc="d,17,22,17,29" name="t.between" dtype_id="2"/>
+          <varscope loc="d,32,15,32,20" name="t.cell1.WIDTH" dtype_id="3"/>
+          <varscope loc="d,34,24,34,27" name="t.cell1.clk" dtype_id="1"/>
+          <varscope loc="d,35,30,35,31" name="t.cell1.d" dtype_id="2"/>
+          <varscope loc="d,36,30,36,31" name="t.cell1.q" dtype_id="2"/>
+          <varscope loc="d,39,15,39,22" name="t.cell1.IGNORED" dtype_id="3"/>
+          <varscope loc="d,48,10,48,13" name="t.cell2.clk" dtype_id="1"/>
+          <varscope loc="d,49,16,49,17" name="t.cell2.d" dtype_id="2"/>
+          <varscope loc="d,50,22,50,23" name="t.cell2.q" dtype_id="2"/>
+          <assignalias loc="d,13,10,13,13" dtype_id="1">
+            <varref loc="d,13,10,13,13" name="clk" dtype_id="1"/>
+            <varref loc="d,13,10,13,13" name="clk" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d14" loc="d,14,16,14,17" dtype_id="2">
-            <varref fl="d14" loc="d,14,16,14,17" name="d" dtype_id="2"/>
-            <varref fl="d14" loc="d,14,16,14,17" name="d" dtype_id="2"/>
+          <assignalias loc="d,14,16,14,17" dtype_id="2">
+            <varref loc="d,14,16,14,17" name="d" dtype_id="2"/>
+            <varref loc="d,14,16,14,17" name="d" dtype_id="2"/>
           </assignalias>
-          <assignalias fl="d15" loc="d,15,22,15,23" dtype_id="2">
-            <varref fl="d15" loc="d,15,22,15,23" name="q" dtype_id="2"/>
-            <varref fl="d15" loc="d,15,22,15,23" name="q" dtype_id="2"/>
+          <assignalias loc="d,15,22,15,23" dtype_id="2">
+            <varref loc="d,15,22,15,23" name="q" dtype_id="2"/>
+            <varref loc="d,15,22,15,23" name="q" dtype_id="2"/>
           </assignalias>
-          <assignalias fl="d34" loc="d,34,24,34,27" dtype_id="1">
-            <varref fl="d34" loc="d,34,24,34,27" name="t.clk" dtype_id="1"/>
-            <varref fl="d34" loc="d,34,24,34,27" name="cell1.clk" dtype_id="1"/>
+          <assignalias loc="d,34,24,34,27" dtype_id="1">
+            <varref loc="d,34,24,34,27" name="t.clk" dtype_id="1"/>
+            <varref loc="d,34,24,34,27" name="cell1.clk" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d35" loc="d,35,30,35,31" dtype_id="2">
-            <varref fl="d35" loc="d,35,30,35,31" name="t.d" dtype_id="2"/>
-            <varref fl="d35" loc="d,35,30,35,31" name="cell1.d" dtype_id="2"/>
+          <assignalias loc="d,35,30,35,31" dtype_id="2">
+            <varref loc="d,35,30,35,31" name="t.d" dtype_id="2"/>
+            <varref loc="d,35,30,35,31" name="cell1.d" dtype_id="2"/>
           </assignalias>
-          <assignalias fl="d36" loc="d,36,30,36,31" dtype_id="2">
-            <varref fl="d36" loc="d,36,30,36,31" name="t.between" dtype_id="2"/>
-            <varref fl="d36" loc="d,36,30,36,31" name="cell1.q" dtype_id="2"/>
+          <assignalias loc="d,36,30,36,31" dtype_id="2">
+            <varref loc="d,36,30,36,31" name="t.between" dtype_id="2"/>
+            <varref loc="d,36,30,36,31" name="cell1.q" dtype_id="2"/>
           </assignalias>
-          <always fl="d41" loc="d,41,4,41,10">
-            <sentree fl="d41" loc="d,41,11,41,12">
-              <senitem fl="d41" loc="d,41,13,41,20" edgeType="POS">
-                <varref fl="d41" loc="d,41,21,41,24" name="clk" dtype_id="1"/>
+          <always loc="d,41,4,41,10">
+            <sentree loc="d,41,11,41,12">
+              <senitem loc="d,41,13,41,20" edgeType="POS">
+                <varref loc="d,41,21,41,24" name="clk" dtype_id="1"/>
               </senitem>
             </sentree>
-            <assigndly fl="d42" loc="d,42,8,42,10" dtype_id="2">
-              <varref fl="d42" loc="d,42,11,42,12" name="d" dtype_id="2"/>
-              <varref fl="d42" loc="d,42,6,42,7" name="t.between" dtype_id="2"/>
+            <assigndly loc="d,42,8,42,10" dtype_id="2">
+              <varref loc="d,42,11,42,12" name="d" dtype_id="2"/>
+              <varref loc="d,42,6,42,7" name="t.between" dtype_id="2"/>
             </assigndly>
           </always>
-          <assignalias fl="d48" loc="d,48,10,48,13" dtype_id="1">
-            <varref fl="d48" loc="d,48,10,48,13" name="t.clk" dtype_id="1"/>
-            <varref fl="d48" loc="d,48,10,48,13" name="cell2.clk" dtype_id="1"/>
+          <assignalias loc="d,48,10,48,13" dtype_id="1">
+            <varref loc="d,48,10,48,13" name="t.clk" dtype_id="1"/>
+            <varref loc="d,48,10,48,13" name="cell2.clk" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d49" loc="d,49,16,49,17" dtype_id="2">
-            <varref fl="d49" loc="d,49,16,49,17" name="t.between" dtype_id="2"/>
-            <varref fl="d49" loc="d,49,16,49,17" name="cell2.d" dtype_id="2"/>
+          <assignalias loc="d,49,16,49,17" dtype_id="2">
+            <varref loc="d,49,16,49,17" name="t.between" dtype_id="2"/>
+            <varref loc="d,49,16,49,17" name="cell2.d" dtype_id="2"/>
           </assignalias>
-          <assignalias fl="d50" loc="d,50,22,50,23" dtype_id="2">
-            <varref fl="d50" loc="d,50,22,50,23" name="t.q" dtype_id="2"/>
-            <varref fl="d50" loc="d,50,22,50,23" name="cell2.q" dtype_id="2"/>
+          <assignalias loc="d,50,22,50,23" dtype_id="2">
+            <varref loc="d,50,22,50,23" name="t.q" dtype_id="2"/>
+            <varref loc="d,50,22,50,23" name="cell2.q" dtype_id="2"/>
           </assignalias>
-          <contassign fl="d53" loc="d,53,13,53,14" dtype_id="2">
-            <varref fl="d53" loc="d,53,15,53,16" name="t.between" dtype_id="2"/>
-            <varref fl="d53" loc="d,53,11,53,12" name="q" dtype_id="2"/>
+          <contassign loc="d,53,13,53,14" dtype_id="2">
+            <varref loc="d,53,15,53,16" name="t.between" dtype_id="2"/>
+            <varref loc="d,53,11,53,12" name="q" dtype_id="2"/>
           </contassign>
         </scope>
       </topscope>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d48" loc="d,48,10,48,13" id="1" name="logic"/>
-      <basicdtype fl="d14" loc="d,14,10,14,11" id="2" name="logic" left="3" right="0"/>
-      <basicdtype fl="d19" loc="d,19,18,19,19" id="3" name="logic" left="31" right="0" signed="true"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,48,10,48,13" id="1" name="logic"/>
+      <basicdtype loc="d,14,10,14,11" id="2" name="logic" left="3" right="0"/>
+      <basicdtype loc="d,19,18,19,19" id="3" name="logic" left="31" right="0" signed="true"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_flat_no_inline_mod.out b/test_regress/t/t_xml_flat_no_inline_mod.out
index e1d070bce..228c0e8f2 100644
--- a/test_regress/t/t_xml_flat_no_inline_mod.out
+++ b/test_regress/t/t_xml_flat_no_inline_mod.out
@@ -11,31 +11,31 @@
     <file id="d" filename="t/t_xml_flat_no_inline_mod.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d11" loc="d,11,8,11,11" name="$root" submodname="$root" hier="$root"/>
+    <cell loc="d,11,8,11,11" name="$root" submodname="$root" hier="$root"/>
   </cells>
   <netlist>
-    <module fl="d11" loc="d,11,8,11,11" name="$root" origName="$root" topModule="1" public="true">
-      <var fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_clk" public="true"/>
-      <var fl="d11" loc="d,11,24,11,29" name="top.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
-      <var fl="d7" loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
-      <topscope fl="d11" loc="d,11,8,11,11">
-        <scope fl="d11" loc="d,11,8,11,11" name="TOP">
-          <varscope fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
-          <varscope fl="d11" loc="d,11,24,11,29" name="top.i_clk" dtype_id="1"/>
-          <varscope fl="d7" loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1"/>
-          <assignalias fl="d11" loc="d,11,24,11,29" dtype_id="1">
-            <varref fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
-            <varref fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+    <module loc="d,11,8,11,11" name="$root" origName="$root" topModule="1" public="true">
+      <var loc="d,11,24,11,29" name="i_clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_clk" public="true"/>
+      <var loc="d,11,24,11,29" name="top.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
+      <var loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
+      <topscope loc="d,11,8,11,11">
+        <scope loc="d,11,8,11,11" name="TOP">
+          <varscope loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+          <varscope loc="d,11,24,11,29" name="top.i_clk" dtype_id="1"/>
+          <varscope loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1"/>
+          <assignalias loc="d,11,24,11,29" dtype_id="1">
+            <varref loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+            <varref loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d7" loc="d,7,24,7,29" dtype_id="1">
-            <varref fl="d7" loc="d,7,24,7,29" name="top.i_clk" dtype_id="1"/>
-            <varref fl="d7" loc="d,7,24,7,29" name="f.i_clk" dtype_id="1"/>
+          <assignalias loc="d,7,24,7,29" dtype_id="1">
+            <varref loc="d,7,24,7,29" name="top.i_clk" dtype_id="1"/>
+            <varref loc="d,7,24,7,29" name="f.i_clk" dtype_id="1"/>
           </assignalias>
         </scope>
       </topscope>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d11" loc="d,11,18,11,23" id="1" name="logic"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,11,18,11,23" id="1" name="logic"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_flat_pub_mod.out b/test_regress/t/t_xml_flat_pub_mod.out
index 88b51b3ca..e659f2ba4 100644
--- a/test_regress/t/t_xml_flat_pub_mod.out
+++ b/test_regress/t/t_xml_flat_pub_mod.out
@@ -11,31 +11,31 @@
     <file id="d" filename="t/t_xml_flat_pub_mod.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d11" loc="d,11,8,11,11" name="$root" submodname="$root" hier="$root"/>
+    <cell loc="d,11,8,11,11" name="$root" submodname="$root" hier="$root"/>
   </cells>
   <netlist>
-    <module fl="d11" loc="d,11,8,11,11" name="$root" origName="$root" topModule="1" public="true">
-      <var fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_clk" public="true"/>
-      <var fl="d11" loc="d,11,24,11,29" name="top.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
-      <var fl="d7" loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
-      <topscope fl="d11" loc="d,11,8,11,11">
-        <scope fl="d11" loc="d,11,8,11,11" name="TOP">
-          <varscope fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
-          <varscope fl="d11" loc="d,11,24,11,29" name="top.i_clk" dtype_id="1"/>
-          <varscope fl="d7" loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1"/>
-          <assignalias fl="d11" loc="d,11,24,11,29" dtype_id="1">
-            <varref fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
-            <varref fl="d11" loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+    <module loc="d,11,8,11,11" name="$root" origName="$root" topModule="1" public="true">
+      <var loc="d,11,24,11,29" name="i_clk" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_clk" public="true"/>
+      <var loc="d,11,24,11,29" name="top.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
+      <var loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1" vartype="logic" origName="i_clk"/>
+      <topscope loc="d,11,8,11,11">
+        <scope loc="d,11,8,11,11" name="TOP">
+          <varscope loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+          <varscope loc="d,11,24,11,29" name="top.i_clk" dtype_id="1"/>
+          <varscope loc="d,7,24,7,29" name="top.f.i_clk" dtype_id="1"/>
+          <assignalias loc="d,11,24,11,29" dtype_id="1">
+            <varref loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
+            <varref loc="d,11,24,11,29" name="i_clk" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d7" loc="d,7,24,7,29" dtype_id="1">
-            <varref fl="d7" loc="d,7,24,7,29" name="top.i_clk" dtype_id="1"/>
-            <varref fl="d7" loc="d,7,24,7,29" name="f.i_clk" dtype_id="1"/>
+          <assignalias loc="d,7,24,7,29" dtype_id="1">
+            <varref loc="d,7,24,7,29" name="top.i_clk" dtype_id="1"/>
+            <varref loc="d,7,24,7,29" name="f.i_clk" dtype_id="1"/>
           </assignalias>
         </scope>
       </topscope>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d11" loc="d,11,18,11,23" id="1" name="logic"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,11,18,11,23" id="1" name="logic"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_flat_vlvbound.out b/test_regress/t/t_xml_flat_vlvbound.out
index 0ccd4afa3..214b2626a 100644
--- a/test_regress/t/t_xml_flat_vlvbound.out
+++ b/test_regress/t/t_xml_flat_vlvbound.out
@@ -11,205 +11,205 @@
     <file id="d" filename="t/t_xml_flat_vlvbound.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d7" loc="d,7,8,7,21" name="$root" submodname="$root" hier="$root"/>
+    <cell loc="d,7,8,7,21" name="$root" submodname="$root" hier="$root"/>
   </cells>
   <netlist>
-    <module fl="d7" loc="d,7,8,7,21" name="$root" origName="$root" topModule="1" public="true">
-      <var fl="d9" loc="d,9,25,9,28" name="i_a" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_a" public="true"/>
-      <var fl="d10" loc="d,10,25,10,28" name="i_b" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="i_b" public="true"/>
-      <var fl="d11" loc="d,11,25,11,28" name="o_a" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="o_a" public="true"/>
-      <var fl="d12" loc="d,12,25,12,28" name="o_b" dtype_id="2" dir="output" pinIndex="4" vartype="logic" origName="o_b" public="true"/>
-      <var fl="d9" loc="d,9,25,9,28" name="vlvbound_test.i_a" dtype_id="1" vartype="logic" origName="i_a"/>
-      <var fl="d10" loc="d,10,25,10,28" name="vlvbound_test.i_b" dtype_id="1" vartype="logic" origName="i_b"/>
-      <var fl="d11" loc="d,11,25,11,28" name="vlvbound_test.o_a" dtype_id="2" vartype="logic" origName="o_a"/>
-      <var fl="d12" loc="d,12,25,12,28" name="vlvbound_test.o_b" dtype_id="2" vartype="logic" origName="o_b"/>
-      <topscope fl="d7" loc="d,7,8,7,21">
-        <scope fl="d7" loc="d,7,8,7,21" name="TOP">
-          <varscope fl="d9" loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
-          <varscope fl="d10" loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
-          <varscope fl="d11" loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
-          <varscope fl="d12" loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
-          <varscope fl="d9" loc="d,9,25,9,28" name="vlvbound_test.i_a" dtype_id="1"/>
-          <varscope fl="d10" loc="d,10,25,10,28" name="vlvbound_test.i_b" dtype_id="1"/>
-          <varscope fl="d11" loc="d,11,25,11,28" name="vlvbound_test.o_a" dtype_id="2"/>
-          <varscope fl="d12" loc="d,12,25,12,28" name="vlvbound_test.o_b" dtype_id="2"/>
-          <varscope fl="d15" loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
-          <varscope fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
-          <varscope fl="d16" loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
-          <varscope fl="d17" loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
-          <varscope fl="d15" loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
-          <varscope fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
-          <varscope fl="d16" loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
-          <varscope fl="d17" loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
-          <assignalias fl="d9" loc="d,9,25,9,28" dtype_id="1">
-            <varref fl="d9" loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
-            <varref fl="d9" loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
+    <module loc="d,7,8,7,21" name="$root" origName="$root" topModule="1" public="true">
+      <var loc="d,9,25,9,28" name="i_a" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="i_a" public="true"/>
+      <var loc="d,10,25,10,28" name="i_b" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="i_b" public="true"/>
+      <var loc="d,11,25,11,28" name="o_a" dtype_id="2" dir="output" pinIndex="3" vartype="logic" origName="o_a" public="true"/>
+      <var loc="d,12,25,12,28" name="o_b" dtype_id="2" dir="output" pinIndex="4" vartype="logic" origName="o_b" public="true"/>
+      <var loc="d,9,25,9,28" name="vlvbound_test.i_a" dtype_id="1" vartype="logic" origName="i_a"/>
+      <var loc="d,10,25,10,28" name="vlvbound_test.i_b" dtype_id="1" vartype="logic" origName="i_b"/>
+      <var loc="d,11,25,11,28" name="vlvbound_test.o_a" dtype_id="2" vartype="logic" origName="o_a"/>
+      <var loc="d,12,25,12,28" name="vlvbound_test.o_b" dtype_id="2" vartype="logic" origName="o_b"/>
+      <topscope loc="d,7,8,7,21">
+        <scope loc="d,7,8,7,21" name="TOP">
+          <varscope loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
+          <varscope loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
+          <varscope loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
+          <varscope loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
+          <varscope loc="d,9,25,9,28" name="vlvbound_test.i_a" dtype_id="1"/>
+          <varscope loc="d,10,25,10,28" name="vlvbound_test.i_b" dtype_id="1"/>
+          <varscope loc="d,11,25,11,28" name="vlvbound_test.o_a" dtype_id="2"/>
+          <varscope loc="d,12,25,12,28" name="vlvbound_test.o_b" dtype_id="2"/>
+          <varscope loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
+          <varscope loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
+          <varscope loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
+          <varscope loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+          <varscope loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
+          <varscope loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
+          <varscope loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
+          <varscope loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+          <assignalias loc="d,9,25,9,28" dtype_id="1">
+            <varref loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
+            <varref loc="d,9,25,9,28" name="i_a" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d10" loc="d,10,25,10,28" dtype_id="1">
-            <varref fl="d10" loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
-            <varref fl="d10" loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
+          <assignalias loc="d,10,25,10,28" dtype_id="1">
+            <varref loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
+            <varref loc="d,10,25,10,28" name="i_b" dtype_id="1"/>
           </assignalias>
-          <assignalias fl="d11" loc="d,11,25,11,28" dtype_id="2">
-            <varref fl="d11" loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
-            <varref fl="d11" loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
+          <assignalias loc="d,11,25,11,28" dtype_id="2">
+            <varref loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
+            <varref loc="d,11,25,11,28" name="o_a" dtype_id="2"/>
           </assignalias>
-          <assignalias fl="d12" loc="d,12,25,12,28" dtype_id="2">
-            <varref fl="d12" loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
-            <varref fl="d12" loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
+          <assignalias loc="d,12,25,12,28" dtype_id="2">
+            <varref loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
+            <varref loc="d,12,25,12,28" name="o_b" dtype_id="2"/>
           </assignalias>
-          <always fl="d24" loc="d,24,14,24,15">
-            <comment fl="d24" loc="d,24,16,24,19" name="Function: foo"/>
-            <assign fl="d24" loc="d,24,20,24,23" dtype_id="1">
-              <varref fl="d24" loc="d,24,20,24,23" name="i_a" dtype_id="1"/>
-              <varref fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
+          <always loc="d,24,14,24,15">
+            <comment loc="d,24,16,24,19" name="Function: foo"/>
+            <assign loc="d,24,20,24,23" dtype_id="1">
+              <varref loc="d,24,20,24,23" name="i_a" dtype_id="1"/>
+              <varref loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
             </assign>
-            <assign fl="d18" loc="d,18,11,18,12" dtype_id="3">
-              <const fl="d18" loc="d,18,12,18,13" name="32&apos;sh0" dtype_id="4"/>
-              <varref fl="d18" loc="d,18,10,18,11" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+            <assign loc="d,18,11,18,12" dtype_id="3">
+              <const loc="d,18,12,18,13" name="32&apos;sh0" dtype_id="4"/>
+              <varref loc="d,18,10,18,11" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
             </assign>
-            <while fl="d18" loc="d,18,5,18,8">
+            <while loc="d,18,5,18,8">
               <begin>
               </begin>
               <begin>
-                <gts fl="d18" loc="d,18,18,18,19" dtype_id="5">
-                  <const fl="d18" loc="d,18,20,18,21" name="32&apos;sh7" dtype_id="4"/>
-                  <varref fl="d18" loc="d,18,16,18,17" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+                <gts loc="d,18,18,18,19" dtype_id="5">
+                  <const loc="d,18,20,18,21" name="32&apos;sh7" dtype_id="4"/>
+                  <varref loc="d,18,16,18,17" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                 </gts>
               </begin>
               <begin>
-                <assign fl="d19" loc="d,19,14,19,15" dtype_id="5">
-                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="5">
-                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
-                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="6">
-                      <varref fl="d19" loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
-                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="7">
-                        <muls fl="d19" loc="d,19,22,19,23" dtype_id="4">
-                          <const fl="d19" loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
-                          <varref fl="d19" loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+                <assign loc="d,19,14,19,15" dtype_id="5">
+                  <eq loc="d,19,31,19,33" dtype_id="5">
+                    <const loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
+                    <sel loc="d,19,20,19,21" dtype_id="6">
+                      <varref loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1"/>
+                      <sel loc="d,19,22,19,23" dtype_id="7">
+                        <muls loc="d,19,22,19,23" dtype_id="4">
+                          <const loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
+                          <varref loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                         </muls>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
+                        <const loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
+                        <const loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
                       </sel>
-                      <const fl="d19" loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
+                      <const loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
                     </sel>
                   </eq>
-                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="5">
-                    <varref fl="d19" loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
-                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="9">
-                      <varref fl="d19" loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
+                  <sel loc="d,19,10,19,11" dtype_id="5">
+                    <varref loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
+                    <sel loc="d,19,11,19,12" dtype_id="9">
+                      <varref loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+                      <const loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
+                      <const loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
                     </sel>
-                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
+                    <const loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
                   </sel>
                 </assign>
               </begin>
               <begin>
-                <assign fl="d18" loc="d,18,24,18,26" dtype_id="3">
-                  <add fl="d18" loc="d,18,24,18,26" dtype_id="8">
-                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
-                    <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+                <assign loc="d,18,24,18,26" dtype_id="3">
+                  <add loc="d,18,24,18,26" dtype_id="8">
+                    <const loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
+                    <varref loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                   </add>
-                  <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
+                  <varref loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3"/>
                 </assign>
               </begin>
             </while>
-            <assign fl="d21" loc="d,21,5,21,11" dtype_id="2">
-              <varref fl="d21" loc="d,21,12,21,15" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
-              <varref fl="d21" loc="d,21,5,21,11" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
+            <assign loc="d,21,5,21,11" dtype_id="2">
+              <varref loc="d,21,12,21,15" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2"/>
+              <varref loc="d,21,5,21,11" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
             </assign>
-            <assign fl="d24" loc="d,24,14,24,15" dtype_id="2">
-              <varref fl="d24" loc="d,24,16,24,19" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
-              <varref fl="d24" loc="d,24,10,24,13" name="o_a" dtype_id="2"/>
+            <assign loc="d,24,14,24,15" dtype_id="2">
+              <varref loc="d,24,16,24,19" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2"/>
+              <varref loc="d,24,10,24,13" name="o_a" dtype_id="2"/>
             </assign>
           </always>
-          <always fl="d25" loc="d,25,14,25,15">
-            <comment fl="d25" loc="d,25,16,25,19" name="Function: foo"/>
-            <assign fl="d25" loc="d,25,20,25,23" dtype_id="1">
-              <varref fl="d25" loc="d,25,20,25,23" name="i_b" dtype_id="1"/>
-              <varref fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
+          <always loc="d,25,14,25,15">
+            <comment loc="d,25,16,25,19" name="Function: foo"/>
+            <assign loc="d,25,20,25,23" dtype_id="1">
+              <varref loc="d,25,20,25,23" name="i_b" dtype_id="1"/>
+              <varref loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
             </assign>
-            <assign fl="d18" loc="d,18,11,18,12" dtype_id="3">
-              <const fl="d18" loc="d,18,12,18,13" name="32&apos;sh0" dtype_id="4"/>
-              <varref fl="d18" loc="d,18,10,18,11" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+            <assign loc="d,18,11,18,12" dtype_id="3">
+              <const loc="d,18,12,18,13" name="32&apos;sh0" dtype_id="4"/>
+              <varref loc="d,18,10,18,11" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
             </assign>
-            <while fl="d18" loc="d,18,5,18,8">
+            <while loc="d,18,5,18,8">
               <begin>
               </begin>
               <begin>
-                <gts fl="d18" loc="d,18,18,18,19" dtype_id="5">
-                  <const fl="d18" loc="d,18,20,18,21" name="32&apos;sh7" dtype_id="4"/>
-                  <varref fl="d18" loc="d,18,16,18,17" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+                <gts loc="d,18,18,18,19" dtype_id="5">
+                  <const loc="d,18,20,18,21" name="32&apos;sh7" dtype_id="4"/>
+                  <varref loc="d,18,16,18,17" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                 </gts>
               </begin>
               <begin>
-                <assign fl="d19" loc="d,19,14,19,15" dtype_id="5">
-                  <eq fl="d19" loc="d,19,31,19,33" dtype_id="5">
-                    <const fl="d19" loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
-                    <sel fl="d19" loc="d,19,20,19,21" dtype_id="6">
-                      <varref fl="d19" loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
-                      <sel fl="d19" loc="d,19,22,19,23" dtype_id="7">
-                        <muls fl="d19" loc="d,19,22,19,23" dtype_id="4">
-                          <const fl="d19" loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
-                          <varref fl="d19" loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+                <assign loc="d,19,14,19,15" dtype_id="5">
+                  <eq loc="d,19,31,19,33" dtype_id="5">
+                    <const loc="d,19,34,19,39" name="2&apos;h0" dtype_id="6"/>
+                    <sel loc="d,19,20,19,21" dtype_id="6">
+                      <varref loc="d,19,17,19,20" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1"/>
+                      <sel loc="d,19,22,19,23" dtype_id="7">
+                        <muls loc="d,19,22,19,23" dtype_id="4">
+                          <const loc="d,19,23,19,24" name="32&apos;sh2" dtype_id="4"/>
+                          <varref loc="d,19,21,19,22" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                         </muls>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
-                        <const fl="d19" loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
+                        <const loc="d,19,22,19,23" name="32&apos;h0" dtype_id="8"/>
+                        <const loc="d,19,22,19,23" name="32&apos;h4" dtype_id="8"/>
                       </sel>
-                      <const fl="d19" loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
+                      <const loc="d,19,28,19,29" name="32&apos;sh2" dtype_id="4"/>
                     </sel>
                   </eq>
-                  <sel fl="d19" loc="d,19,10,19,11" dtype_id="5">
-                    <varref fl="d19" loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
-                    <sel fl="d19" loc="d,19,11,19,12" dtype_id="9">
-                      <varref fl="d19" loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
-                      <const fl="d19" loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
+                  <sel loc="d,19,10,19,11" dtype_id="5">
+                    <varref loc="d,19,7,19,10" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
+                    <sel loc="d,19,11,19,12" dtype_id="9">
+                      <varref loc="d,19,11,19,12" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+                      <const loc="d,19,11,19,12" name="32&apos;h0" dtype_id="8"/>
+                      <const loc="d,19,11,19,12" name="32&apos;h3" dtype_id="8"/>
                     </sel>
-                    <const fl="d19" loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
+                    <const loc="d,19,10,19,11" name="32&apos;h1" dtype_id="8"/>
                   </sel>
                 </assign>
               </begin>
               <begin>
-                <assign fl="d18" loc="d,18,24,18,26" dtype_id="3">
-                  <add fl="d18" loc="d,18,24,18,26" dtype_id="8">
-                    <const fl="d18" loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
-                    <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+                <assign loc="d,18,24,18,26" dtype_id="3">
+                  <add loc="d,18,24,18,26" dtype_id="8">
+                    <const loc="d,18,24,18,26" name="32&apos;h1" dtype_id="8"/>
+                    <varref loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                   </add>
-                  <varref fl="d18" loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
+                  <varref loc="d,18,23,18,24" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3"/>
                 </assign>
               </begin>
             </while>
-            <assign fl="d21" loc="d,21,5,21,11" dtype_id="2">
-              <varref fl="d21" loc="d,21,12,21,15" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
-              <varref fl="d21" loc="d,21,5,21,11" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
+            <assign loc="d,21,5,21,11" dtype_id="2">
+              <varref loc="d,21,12,21,15" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2"/>
+              <varref loc="d,21,5,21,11" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
             </assign>
-            <assign fl="d25" loc="d,25,14,25,15" dtype_id="2">
-              <varref fl="d25" loc="d,25,16,25,19" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
-              <varref fl="d25" loc="d,25,10,25,13" name="o_b" dtype_id="2"/>
+            <assign loc="d,25,14,25,15" dtype_id="2">
+              <varref loc="d,25,16,25,19" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2"/>
+              <varref loc="d,25,10,25,13" name="o_b" dtype_id="2"/>
             </assign>
           </always>
         </scope>
       </topscope>
-      <var fl="d15" loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__Vfuncout"/>
-      <var fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__val"/>
-      <var fl="d16" loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__ret"/>
-      <var fl="d17" loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3" vartype="integer" origName="__Vfunc_vlvbound_test__DOT__foo__0__i"/>
-      <var fl="d15" loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__Vfuncout"/>
-      <var fl="d15" loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__val"/>
-      <var fl="d16" loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__ret"/>
-      <var fl="d17" loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3" vartype="integer" origName="__Vfunc_vlvbound_test__DOT__foo__1__i"/>
+      <var loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__0__Vfuncout" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__Vfuncout"/>
+      <var loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__0__val" dtype_id="1" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__val"/>
+      <var loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__0__ret" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__0__ret"/>
+      <var loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__0__i" dtype_id="3" vartype="integer" origName="__Vfunc_vlvbound_test__DOT__foo__0__i"/>
+      <var loc="d,15,34,15,37" name="__Vfunc_vlvbound_test.foo__1__Vfuncout" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__Vfuncout"/>
+      <var loc="d,15,57,15,60" name="__Vfunc_vlvbound_test.foo__1__val" dtype_id="1" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__val"/>
+      <var loc="d,16,17,16,20" name="__Vfunc_vlvbound_test.foo__1__ret" dtype_id="2" vartype="logic" origName="__Vfunc_vlvbound_test__DOT__foo__1__ret"/>
+      <var loc="d,17,13,17,14" name="__Vfunc_vlvbound_test.foo__1__i" dtype_id="3" vartype="integer" origName="__Vfunc_vlvbound_test__DOT__foo__1__i"/>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d18" loc="d,18,18,18,19" id="5" name="logic"/>
-      <basicdtype fl="d19" loc="d,19,34,19,39" id="6" name="logic" left="1" right="0"/>
-      <basicdtype fl="d9" loc="d,9,11,9,16" id="1" name="logic" left="15" right="0"/>
-      <basicdtype fl="d11" loc="d,11,12,11,17" id="2" name="logic" left="6" right="0"/>
-      <basicdtype fl="d17" loc="d,17,5,17,12" id="3" name="integer" left="31" right="0" signed="true"/>
-      <basicdtype fl="d19" loc="d,19,10,19,11" id="9" name="logic" left="2" right="0" signed="true"/>
-      <basicdtype fl="d19" loc="d,19,11,19,12" id="8" name="logic" left="31" right="0"/>
-      <basicdtype fl="d19" loc="d,19,20,19,21" id="7" name="logic" left="3" right="0" signed="true"/>
-      <basicdtype fl="d18" loc="d,18,12,18,13" id="4" name="logic" left="31" right="0" signed="true"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,18,18,18,19" id="5" name="logic"/>
+      <basicdtype loc="d,19,34,19,39" id="6" name="logic" left="1" right="0"/>
+      <basicdtype loc="d,9,11,9,16" id="1" name="logic" left="15" right="0"/>
+      <basicdtype loc="d,11,12,11,17" id="2" name="logic" left="6" right="0"/>
+      <basicdtype loc="d,17,5,17,12" id="3" name="integer" left="31" right="0" signed="true"/>
+      <basicdtype loc="d,19,10,19,11" id="9" name="logic" left="2" right="0" signed="true"/>
+      <basicdtype loc="d,19,11,19,12" id="8" name="logic" left="31" right="0"/>
+      <basicdtype loc="d,19,20,19,21" id="7" name="logic" left="3" right="0" signed="true"/>
+      <basicdtype loc="d,18,12,18,13" id="4" name="logic" left="31" right="0" signed="true"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_output.out b/test_regress/t/t_xml_output.out
index 645a7b61b..c2ca4faf4 100644
--- a/test_regress/t/t_xml_output.out
+++ b/test_regress/t/t_xml_output.out
@@ -11,14 +11,14 @@
     <file id="d" filename="t/t_xml_output.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d7" loc="d,7,8,7,9" name="m" submodname="m" hier="m"/>
+    <cell loc="d,7,8,7,9" name="m" submodname="m" hier="m"/>
   </cells>
   <netlist>
-    <module fl="d7" loc="d,7,8,7,9" name="m" origName="m">
-      <var fl="d8" loc="d,8,10,8,13" name="clk" tag="foo_op" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
+    <module loc="d,7,8,7,9" name="m" origName="m">
+      <var loc="d,8,10,8,13" name="clk" tag="foo_op" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk"/>
     </module>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d8" loc="d,8,10,8,13" id="1" name="logic"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,8,10,8,13" id="1" name="logic"/>
     </typetable>
   </netlist>
 </verilator_xml>
diff --git a/test_regress/t/t_xml_tag.out b/test_regress/t/t_xml_tag.out
index 9c4c044e7..71b99ee25 100644
--- a/test_regress/t/t_xml_tag.out
+++ b/test_regress/t/t_xml_tag.out
@@ -11,72 +11,72 @@
     <file id="d" filename="t/t_xml_tag.v" language="1800-2017"/>
   </module_files>
   <cells>
-    <cell fl="d12" loc="d,12,8,12,9" name="m" submodname="m" hier="m">
-      <cell fl="d29" loc="d,29,8,29,12" name="itop" submodname="ifc" hier="m.itop"/>
+    <cell loc="d,12,8,12,9" name="m" submodname="m" hier="m">
+      <cell loc="d,29,8,29,12" name="itop" submodname="ifc" hier="m.itop"/>
     </cell>
   </cells>
   <netlist>
-    <module fl="d12" loc="d,12,8,12,9" name="m" origName="m" topModule="1">
-      <var fl="d14" loc="d,14,11,14,17" name="clk_ip" tag="clk_ip" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk_ip"/>
-      <var fl="d15" loc="d,15,11,15,17" name="rst_ip" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="rst_ip"/>
-      <var fl="d16" loc="d,16,11,16,17" name="foo_op" tag="foo_op" dtype_id="1" dir="output" pinIndex="3" vartype="logic" origName="foo_op"/>
-      <typedef fl="d25" loc="d,25,6,25,15" name="my_struct" tag="my_struct" dtype_id="2"/>
-      <instance fl="d29" loc="d,29,8,29,12" name="itop" defName="ifc" origName="itop"/>
-      <var fl="d29" loc="d,29,8,29,12" name="itop__Viftop" dtype_id="3" vartype="ifaceref" origName="itop__Viftop"/>
-      <var fl="d31" loc="d,31,14,31,25" name="this_struct" tag="this_struct" dtype_id="4" vartype="" origName="this_struct"/>
-      <var fl="d33" loc="d,33,16,33,22" name="dotted" dtype_id="5" vartype="logic" origName="dotted"/>
-      <contassign fl="d33" loc="d,33,23,33,24" dtype_id="5">
-        <varxref fl="d33" loc="d,33,30,33,35" name="value" dtype_id="6" dotted="itop"/>
-        <varref fl="d33" loc="d,33,16,33,22" name="dotted" dtype_id="5"/>
+    <module loc="d,12,8,12,9" name="m" origName="m" topModule="1">
+      <var loc="d,14,11,14,17" name="clk_ip" tag="clk_ip" dtype_id="1" dir="input" pinIndex="1" vartype="logic" origName="clk_ip"/>
+      <var loc="d,15,11,15,17" name="rst_ip" dtype_id="1" dir="input" pinIndex="2" vartype="logic" origName="rst_ip"/>
+      <var loc="d,16,11,16,17" name="foo_op" tag="foo_op" dtype_id="1" dir="output" pinIndex="3" vartype="logic" origName="foo_op"/>
+      <typedef loc="d,25,6,25,15" name="my_struct" tag="my_struct" dtype_id="2"/>
+      <instance loc="d,29,8,29,12" name="itop" defName="ifc" origName="itop"/>
+      <var loc="d,29,8,29,12" name="itop__Viftop" dtype_id="3" vartype="ifaceref" origName="itop__Viftop"/>
+      <var loc="d,31,14,31,25" name="this_struct" tag="this_struct" dtype_id="4" vartype="" origName="this_struct"/>
+      <var loc="d,33,16,33,22" name="dotted" dtype_id="5" vartype="logic" origName="dotted"/>
+      <contassign loc="d,33,23,33,24" dtype_id="5">
+        <varxref loc="d,33,30,33,35" name="value" dtype_id="6" dotted="itop"/>
+        <varref loc="d,33,16,33,22" name="dotted" dtype_id="5"/>
       </contassign>
-      <func fl="d35" loc="d,35,13,35,14" name="f" dtype_id="1">
-        <var fl="d35" loc="d,35,13,35,14" name="f" dtype_id="1" dir="output" vartype="logic" origName="f"/>
-        <var fl="d35" loc="d,35,28,35,29" name="m" dtype_id="7" dir="input" vartype="string" origName="m"/>
-        <display fl="d36" loc="d,36,7,36,15" displaytype="$display">
-          <sformatf fl="d36" loc="d,36,7,36,15" name="%@" dtype_id="7">
-            <varref fl="d36" loc="d,36,22,36,23" name="m" dtype_id="7"/>
+      <func loc="d,35,13,35,14" name="f" dtype_id="1">
+        <var loc="d,35,13,35,14" name="f" dtype_id="1" dir="output" vartype="logic" origName="f"/>
+        <var loc="d,35,28,35,29" name="m" dtype_id="7" dir="input" vartype="string" origName="m"/>
+        <display loc="d,36,7,36,15" displaytype="$display">
+          <sformatf loc="d,36,7,36,15" name="%@" dtype_id="7">
+            <varref loc="d,36,22,36,23" name="m" dtype_id="7"/>
           </sformatf>
         </display>
       </func>
-      <initial fl="d39" loc="d,39,4,39,11">
-        <begin fl="d39" loc="d,39,12,39,17">
-          <taskref fl="d41" loc="d,41,7,41,8" name="f">
-            <arg fl="d41" loc="d,41,9,41,736">
-              <const fl="d41" loc="d,41,9,41,736" name="&quot;&#1;&#2;&#3;&#4;&#5;&#6;&#7;&#8;&#9;&#10;&#11;&#12;&#13;&#14;&#15;&#16;&#17;&#18;&#19;&#20;&#21;&#22;&#23;&#24;&#25;&#26;&#27;&#28;&#29;&#30;&#31; !&quot;#$%&amp;&apos;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~&#127;&#128;&#129;&#130;&#131;&#132;&#133;&#134;&#135;&#136;&#137;&#138;&#139;&#140;&#141;&#142;&#143;&#144;&#145;&#146;&#147;&#148;&#149;&#150;&#151;&#152;&#153;&#154;&#155;&#156;&#157;&#158;&#159;&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;&quot;" dtype_id="7"/>
+      <initial loc="d,39,4,39,11">
+        <begin loc="d,39,12,39,17">
+          <taskref loc="d,41,7,41,8" name="f">
+            <arg loc="d,41,9,41,736">
+              <const loc="d,41,9,41,736" name="&quot;&#1;&#2;&#3;&#4;&#5;&#6;&#7;&#8;&#9;&#10;&#11;&#12;&#13;&#14;&#15;&#16;&#17;&#18;&#19;&#20;&#21;&#22;&#23;&#24;&#25;&#26;&#27;&#28;&#29;&#30;&#31; !&quot;#$%&amp;&apos;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~&#127;&#128;&#129;&#130;&#131;&#132;&#133;&#134;&#135;&#136;&#137;&#138;&#139;&#140;&#141;&#142;&#143;&#144;&#145;&#146;&#147;&#148;&#149;&#150;&#151;&#152;&#153;&#154;&#155;&#156;&#157;&#158;&#159;&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;&quot;" dtype_id="7"/>
             </arg>
           </taskref>
         </begin>
       </initial>
     </module>
-    <iface fl="d7" loc="d,7,11,7,14" name="ifc" origName="ifc">
-      <var fl="d8" loc="d,8,12,8,17" name="value" dtype_id="6" vartype="integer" origName="value"/>
-      <modport fl="d9" loc="d,9,12,9,23" name="out_modport">
-        <modportvarref fl="d9" loc="d,9,32,9,37" name="value" direction="out"/>
+    <iface loc="d,7,11,7,14" name="ifc" origName="ifc">
+      <var loc="d,8,12,8,17" name="value" dtype_id="6" vartype="integer" origName="value"/>
+      <modport loc="d,9,12,9,23" name="out_modport">
+        <modportvarref loc="d,9,32,9,37" name="value" direction="out"/>
       </modport>
     </iface>
-    <typetable fl="a0" loc="a,0,0,0,0">
-      <basicdtype fl="d8" loc="d,8,4,8,11" id="6" name="integer" left="31" right="0" signed="true"/>
-      <basicdtype fl="d14" loc="d,14,11,14,17" id="1" name="logic"/>
-      <basicdtype fl="d21" loc="d,21,7,21,12" id="8" name="logic"/>
-      <basicdtype fl="d22" loc="d,22,7,22,12" id="9" name="logic"/>
-      <basicdtype fl="d23" loc="d,23,7,23,12" id="10" name="logic"/>
-      <basicdtype fl="d24" loc="d,24,7,24,12" id="11" name="logic"/>
-      <structdtype fl="d20" loc="d,20,12,20,18" id="2" name="m.my_struct">
-        <memberdtype fl="d21" loc="d,21,16,21,19" id="12" name="clk" tag="this is clk" sub_dtype_id="8"/>
-        <memberdtype fl="d22" loc="d,22,16,22,17" id="13" name="k" sub_dtype_id="9"/>
-        <memberdtype fl="d23" loc="d,23,16,23,22" id="14" name="enable" tag="enable" sub_dtype_id="10"/>
-        <memberdtype fl="d24" loc="d,24,16,24,20" id="15" name="data" tag="data" sub_dtype_id="11"/>
+    <typetable loc="a,0,0,0,0">
+      <basicdtype loc="d,8,4,8,11" id="6" name="integer" left="31" right="0" signed="true"/>
+      <basicdtype loc="d,14,11,14,17" id="1" name="logic"/>
+      <basicdtype loc="d,21,7,21,12" id="8" name="logic"/>
+      <basicdtype loc="d,22,7,22,12" id="9" name="logic"/>
+      <basicdtype loc="d,23,7,23,12" id="10" name="logic"/>
+      <basicdtype loc="d,24,7,24,12" id="11" name="logic"/>
+      <structdtype loc="d,20,12,20,18" id="2" name="m.my_struct">
+        <memberdtype loc="d,21,16,21,19" id="12" name="clk" tag="this is clk" sub_dtype_id="8"/>
+        <memberdtype loc="d,22,16,22,17" id="13" name="k" sub_dtype_id="9"/>
+        <memberdtype loc="d,23,16,23,22" id="14" name="enable" tag="enable" sub_dtype_id="10"/>
+        <memberdtype loc="d,24,16,24,20" id="15" name="data" tag="data" sub_dtype_id="11"/>
       </structdtype>
-      <ifacerefdtype fl="d29" loc="d,29,8,29,12" id="3" modportname=""/>
-      <basicdtype fl="d31" loc="d,31,27,31,28" id="5" name="logic" left="31" right="0"/>
-      <refdtype fl="d31" loc="d,31,4,31,13" id="16" name="my_struct" sub_dtype_id="2"/>
-      <unpackarraydtype fl="d31" loc="d,31,26,31,27" id="4" sub_dtype_id="2">
-        <range fl="d31" loc="d,31,26,31,27">
-          <const fl="d31" loc="d,31,27,31,28" name="32&apos;h0" dtype_id="5"/>
-          <const fl="d31" loc="d,31,27,31,28" name="32&apos;h1" dtype_id="5"/>
+      <ifacerefdtype loc="d,29,8,29,12" id="3" modportname=""/>
+      <basicdtype loc="d,31,27,31,28" id="5" name="logic" left="31" right="0"/>
+      <refdtype loc="d,31,4,31,13" id="16" name="my_struct" sub_dtype_id="2"/>
+      <unpackarraydtype loc="d,31,26,31,27" id="4" sub_dtype_id="2">
+        <range loc="d,31,26,31,27">
+          <const loc="d,31,27,31,28" name="32&apos;h0" dtype_id="5"/>
+          <const loc="d,31,27,31,28" name="32&apos;h1" dtype_id="5"/>
         </range>
       </unpackarraydtype>
-      <basicdtype fl="d35" loc="d,35,21,35,27" id="7" name="string"/>
+      <basicdtype loc="d,35,21,35,27" id="7" name="string"/>
     </typetable>
   </netlist>
 </verilator_xml>