diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index a8e50e12cc2..2ba1ad31dd9 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -404,7 +404,7 @@ public class ASTExtractor {
       if (nd.hasLoc()) locationManager.emitNodeLocation(nd, lbl);
       Statement enclosingStmt = contextManager.getCurrentStatement();
       if (enclosingStmt != null)
-        trapwriter.addTuple("enclosingStmt", lbl, trapwriter.localID(enclosingStmt));
+        trapwriter.addTuple("enclosing_stmt", lbl, trapwriter.localID(enclosingStmt));
       trapwriter.addTuple("exprContainers", lbl, contextManager.getCurrentContainerKey());
       return lbl;
     }
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
index 007ceacce1f..667d262b060 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
@@ -56,14 +56,14 @@ exprs(#20017,18,#20016,0,"!class {}")
 #20018=@"loc,{#10000},1,1,1,9"
 locations_default(#20018,#10000,1,1,1,9)
 hasLocation(#20017,#20018)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 #20019=*
 exprs(#20019,80,#20017,0,"class {}")
 #20020=@"loc,{#10000},1,2,1,9"
 locations_default(#20020,#10000,1,2,1,9)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20016)
+enclosing_stmt(#20019,#20016)
 exprContainers(#20019,#20001)
 #20021=*
 properties(#20021,#20019,2,0,"constructor() {}")
@@ -73,13 +73,13 @@ hasLocation(#20021,#20022)
 #20023=*
 exprs(#20023,0,#20021,0,"constructor")
 hasLocation(#20023,#20022)
-enclosingStmt(#20023,#20016)
+enclosing_stmt(#20023,#20016)
 exprContainers(#20023,#20001)
 literals("constructor","constructor",#20023)
 #20024=*
 exprs(#20024,9,#20021,1,"() {}")
 hasLocation(#20024,#20022)
-enclosingStmt(#20024,#20016)
+enclosing_stmt(#20024,#20016)
 exprContainers(#20024,#20001)
 #20025=*
 scopes(#20025,1)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
index 0e0717eb44e..82098e32306 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
@@ -61,14 +61,14 @@ exprs(#20019,18,#20018,0,"!class A {}")
 #20020=@"loc,{#10000},1,1,1,11"
 locations_default(#20020,#10000,1,1,1,11)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,80,#20019,0,"class A {}")
 #20022=@"loc,{#10000},1,2,1,11"
 locations_default(#20022,#10000,1,2,1,11)
 hasLocation(#20021,#20022)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 #20023=*
 scopes(#20023,8)
@@ -81,7 +81,7 @@ local_type_names(#20025,"A",#20023)
 #20026=*
 exprs(#20026,78,#20021,0,"A")
 hasLocation(#20026,#20009)
-enclosingStmt(#20026,#20018)
+enclosing_stmt(#20026,#20018)
 exprContainers(#20026,#20001)
 literals("A","A",#20026)
 decl(#20026,#20024)
@@ -94,13 +94,13 @@ hasLocation(#20027,#20028)
 #20029=*
 exprs(#20029,0,#20027,0,"constructor")
 hasLocation(#20029,#20028)
-enclosingStmt(#20029,#20018)
+enclosing_stmt(#20029,#20018)
 exprContainers(#20029,#20001)
 literals("constructor","constructor",#20029)
 #20030=*
 exprs(#20030,9,#20027,1,"() {}")
 hasLocation(#20030,#20028)
-enclosingStmt(#20030,#20018)
+enclosing_stmt(#20030,#20018)
 exprContainers(#20030,#20001)
 #20031=*
 scopes(#20031,1)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
index 94ec1ff77f4..83713b180c8 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
@@ -66,19 +66,19 @@ exprs(#20021,18,#20020,0,"!class extends B {}")
 #20022=@"loc,{#10000},1,1,1,19"
 locations_default(#20022,#10000,1,1,1,19)
 hasLocation(#20021,#20022)
-enclosingStmt(#20021,#20020)
+enclosing_stmt(#20021,#20020)
 exprContainers(#20021,#20001)
 #20023=*
 exprs(#20023,80,#20021,0,"class extends B {}")
 #20024=@"loc,{#10000},1,2,1,19"
 locations_default(#20024,#10000,1,2,1,19)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20020)
+enclosing_stmt(#20023,#20020)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,79,#20023,1,"B")
 hasLocation(#20025,#20011)
-enclosingStmt(#20025,#20020)
+enclosing_stmt(#20025,#20020)
 exprContainers(#20025,#20001)
 literals("B","B",#20025)
 #20026=@"var;{B};{#20000}"
@@ -92,13 +92,13 @@ hasLocation(#20027,#20028)
 #20029=*
 exprs(#20029,0,#20027,0,"constructor")
 hasLocation(#20029,#20028)
-enclosingStmt(#20029,#20020)
+enclosing_stmt(#20029,#20020)
 exprContainers(#20029,#20001)
 literals("constructor","constructor",#20029)
 #20030=*
 exprs(#20030,9,#20027,1,"(...arg ... rgs); }")
 hasLocation(#20030,#20028)
-enclosingStmt(#20030,#20020)
+enclosing_stmt(#20030,#20020)
 exprContainers(#20030,#20001)
 #20031=*
 scopes(#20031,1)
@@ -127,22 +127,22 @@ stmt_containers(#20036,#20030)
 #20037=*
 exprs(#20037,13,#20036,0,"super(...args)")
 hasLocation(#20037,#20028)
-enclosingStmt(#20037,#20036)
+enclosing_stmt(#20037,#20036)
 exprContainers(#20037,#20030)
 #20038=*
 exprs(#20038,81,#20037,-1,"super")
 hasLocation(#20038,#20028)
-enclosingStmt(#20038,#20036)
+enclosing_stmt(#20038,#20036)
 exprContainers(#20038,#20030)
 #20039=*
 exprs(#20039,66,#20037,0,"...args")
 hasLocation(#20039,#20028)
-enclosingStmt(#20039,#20036)
+enclosing_stmt(#20039,#20036)
 exprContainers(#20039,#20030)
 #20040=*
 exprs(#20040,79,#20039,0,"args")
 hasLocation(#20040,#20028)
-enclosingStmt(#20040,#20036)
+enclosing_stmt(#20040,#20036)
 exprContainers(#20040,#20030)
 literals("args","args",#20040)
 bind(#20040,#20032)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
index e0faf83d7c3..955a1eb9616 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
@@ -71,14 +71,14 @@ exprs(#20023,18,#20022,0,"!class  ... ds B {}")
 #20024=@"loc,{#10000},1,1,1,21"
 locations_default(#20024,#10000,1,1,1,21)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,80,#20023,0,"class A extends B {}")
 #20026=@"loc,{#10000},1,2,1,21"
 locations_default(#20026,#10000,1,2,1,21)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 scopes(#20027,8)
@@ -91,7 +91,7 @@ local_type_names(#20029,"A",#20027)
 #20030=*
 exprs(#20030,78,#20025,0,"A")
 hasLocation(#20030,#20009)
-enclosingStmt(#20030,#20022)
+enclosing_stmt(#20030,#20022)
 exprContainers(#20030,#20001)
 literals("A","A",#20030)
 decl(#20030,#20028)
@@ -99,7 +99,7 @@ typedecl(#20030,#20029)
 #20031=*
 exprs(#20031,79,#20025,1,"B")
 hasLocation(#20031,#20013)
-enclosingStmt(#20031,#20022)
+enclosing_stmt(#20031,#20022)
 exprContainers(#20031,#20001)
 literals("B","B",#20031)
 #20032=@"var;{B};{#20000}"
@@ -113,13 +113,13 @@ hasLocation(#20033,#20034)
 #20035=*
 exprs(#20035,0,#20033,0,"constructor")
 hasLocation(#20035,#20034)
-enclosingStmt(#20035,#20022)
+enclosing_stmt(#20035,#20022)
 exprContainers(#20035,#20001)
 literals("constructor","constructor",#20035)
 #20036=*
 exprs(#20036,9,#20033,1,"(...arg ... rgs); }")
 hasLocation(#20036,#20034)
-enclosingStmt(#20036,#20022)
+enclosing_stmt(#20036,#20022)
 exprContainers(#20036,#20001)
 #20037=*
 scopes(#20037,1)
@@ -148,22 +148,22 @@ stmt_containers(#20042,#20036)
 #20043=*
 exprs(#20043,13,#20042,0,"super(...args)")
 hasLocation(#20043,#20034)
-enclosingStmt(#20043,#20042)
+enclosing_stmt(#20043,#20042)
 exprContainers(#20043,#20036)
 #20044=*
 exprs(#20044,81,#20043,-1,"super")
 hasLocation(#20044,#20034)
-enclosingStmt(#20044,#20042)
+enclosing_stmt(#20044,#20042)
 exprContainers(#20044,#20036)
 #20045=*
 exprs(#20045,66,#20043,0,"...args")
 hasLocation(#20045,#20034)
-enclosingStmt(#20045,#20042)
+enclosing_stmt(#20045,#20042)
 exprContainers(#20045,#20036)
 #20046=*
 exprs(#20046,79,#20045,0,"args")
 hasLocation(#20046,#20034)
-enclosingStmt(#20046,#20042)
+enclosing_stmt(#20046,#20042)
 exprContainers(#20046,#20036)
 literals("args","args",#20046)
 bind(#20046,#20038)
diff --git a/javascript/extractor/tests/cfg/output/trap/fields.js.trap b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
index 6a78bb89428..ab412847941 100644
--- a/javascript/extractor/tests/cfg/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
@@ -393,7 +393,7 @@ stmt_containers(#20139,#20001)
 #20141=*
 exprs(#20141,78,#20139,0,"A")
 hasLocation(#20141,#20041)
-enclosingStmt(#20141,#20139)
+enclosing_stmt(#20141,#20139)
 exprContainers(#20141,#20001)
 literals("A","A",#20141)
 decl(#20141,#20135)
@@ -410,7 +410,7 @@ hasLocation(#20143,#20144)
 #20145=*
 exprs(#20145,0,#20143,0,"constructor")
 hasLocation(#20145,#20045)
-enclosingStmt(#20145,#20139)
+enclosing_stmt(#20145,#20139)
 exprContainers(#20145,#20001)
 literals("constructor","constructor",#20145)
 #20146=*
@@ -418,7 +418,7 @@ exprs(#20146,9,#20143,1,"() {\n    ctor;\n  }")
 #20147=@"loc,{#10000},2,14,4,3"
 locations_default(#20147,#10000,2,14,4,3)
 hasLocation(#20146,#20147)
-enclosingStmt(#20146,#20139)
+enclosing_stmt(#20146,#20139)
 exprContainers(#20146,#20001)
 #20148=*
 scopes(#20148,1)
@@ -442,7 +442,7 @@ stmt_containers(#20152,#20146)
 #20154=*
 exprs(#20154,79,#20152,0,"ctor")
 hasLocation(#20154,#20053)
-enclosingStmt(#20154,#20152)
+enclosing_stmt(#20154,#20152)
 exprContainers(#20154,#20146)
 literals("ctor","ctor",#20154)
 #20155=@"var;{ctor};{#20000}"
@@ -467,7 +467,7 @@ hasLocation(#20159,#20160)
 #20161=*
 exprs(#20161,0,#20159,0,"y")
 hasLocation(#20161,#20065)
-enclosingStmt(#20161,#20139)
+enclosing_stmt(#20161,#20139)
 exprContainers(#20161,#20001)
 literals("y","y",#20161)
 isStatic(#20159)
@@ -479,7 +479,7 @@ hasLocation(#20162,#20163)
 #20164=*
 exprs(#20164,0,#20162,0,"f")
 hasLocation(#20164,#20069)
-enclosingStmt(#20164,#20139)
+enclosing_stmt(#20164,#20139)
 exprContainers(#20164,#20001)
 literals("f","f",#20164)
 #20165=*
@@ -487,7 +487,7 @@ exprs(#20165,9,#20162,1,"() {}")
 #20166=@"loc,{#10000},7,4,7,8"
 locations_default(#20166,#10000,7,4,7,8)
 hasLocation(#20165,#20166)
-enclosingStmt(#20165,#20139)
+enclosing_stmt(#20165,#20139)
 exprContainers(#20165,#20001)
 #20167=*
 scopes(#20167,1)
@@ -511,7 +511,7 @@ hasLocation(#20171,#20172)
 #20173=*
 exprs(#20173,0,#20171,0,"g")
 hasLocation(#20173,#20081)
-enclosingStmt(#20173,#20139)
+enclosing_stmt(#20173,#20139)
 exprContainers(#20173,#20001)
 literals("g","g",#20173)
 #20174=*
@@ -519,7 +519,7 @@ exprs(#20174,9,#20171,1,"() {}")
 #20175=@"loc,{#10000},8,11,8,15"
 locations_default(#20175,#10000,8,11,8,15)
 hasLocation(#20174,#20175)
-enclosingStmt(#20174,#20139)
+enclosing_stmt(#20174,#20139)
 exprContainers(#20174,#20001)
 #20176=*
 scopes(#20176,1)
@@ -545,7 +545,7 @@ stmt_containers(#20180,#20001)
 #20182=*
 exprs(#20182,78,#20180,0,"B")
 hasLocation(#20182,#20094)
-enclosingStmt(#20182,#20180)
+enclosing_stmt(#20182,#20180)
 exprContainers(#20182,#20001)
 literals("B","B",#20182)
 decl(#20182,#20136)
@@ -557,7 +557,7 @@ scopenesting(#20183,#20000)
 #20184=*
 exprs(#20184,79,#20180,1,"A")
 hasLocation(#20184,#20098)
-enclosingStmt(#20184,#20180)
+enclosing_stmt(#20184,#20180)
 exprContainers(#20184,#20001)
 literals("A","A",#20184)
 bind(#20184,#20135)
@@ -569,7 +569,7 @@ hasLocation(#20185,#20186)
 #20187=*
 exprs(#20187,0,#20185,0,"constructor")
 hasLocation(#20187,#20102)
-enclosingStmt(#20187,#20180)
+enclosing_stmt(#20187,#20180)
 exprContainers(#20187,#20001)
 literals("constructor","constructor",#20187)
 #20188=*
@@ -577,7 +577,7 @@ exprs(#20188,9,#20185,1,"() {\n   ... er;\n  }")
 #20189=@"loc,{#10000},12,14,16,3"
 locations_default(#20189,#10000,12,14,16,3)
 hasLocation(#20188,#20189)
-enclosingStmt(#20188,#20180)
+enclosing_stmt(#20188,#20180)
 exprContainers(#20188,#20001)
 #20190=*
 scopes(#20190,1)
@@ -601,7 +601,7 @@ stmt_containers(#20194,#20188)
 #20196=*
 exprs(#20196,79,#20194,0,"before")
 hasLocation(#20196,#20110)
-enclosingStmt(#20196,#20194)
+enclosing_stmt(#20196,#20194)
 exprContainers(#20196,#20188)
 literals("before","before",#20196)
 #20197=@"var;{before};{#20000}"
@@ -618,12 +618,12 @@ exprs(#20200,13,#20198,0,"super()")
 #20201=@"loc,{#10000},14,5,14,11"
 locations_default(#20201,#10000,14,5,14,11)
 hasLocation(#20200,#20201)
-enclosingStmt(#20200,#20198)
+enclosing_stmt(#20200,#20198)
 exprContainers(#20200,#20188)
 #20202=*
 exprs(#20202,81,#20200,-1,"super")
 hasLocation(#20202,#20114)
-enclosingStmt(#20202,#20198)
+enclosing_stmt(#20202,#20198)
 exprContainers(#20202,#20188)
 #20203=*
 stmts(#20203,2,#20192,2,"after;")
@@ -634,7 +634,7 @@ stmt_containers(#20203,#20188)
 #20205=*
 exprs(#20205,79,#20203,0,"after")
 hasLocation(#20205,#20122)
-enclosingStmt(#20205,#20203)
+enclosing_stmt(#20205,#20203)
 exprContainers(#20205,#20188)
 literals("after","after",#20205)
 #20206=@"var;{after};{#20000}"
diff --git a/javascript/extractor/tests/cfg/output/trap/seq.js.trap b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
index 3c416734d96..76e2d3bfbde 100644
--- a/javascript/extractor/tests/cfg/output/trap/seq.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
@@ -96,12 +96,12 @@ exprs(#20033,10,#20032,0,"x,1+2,y||z")
 #20034=@"loc,{#10000},1,4,1,13"
 locations_default(#20034,#10000,1,4,1,13)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20032)
+enclosing_stmt(#20033,#20032)
 exprContainers(#20033,#20001)
 #20035=*
 exprs(#20035,79,#20033,0,"x")
 hasLocation(#20035,#20009)
-enclosingStmt(#20035,#20032)
+enclosing_stmt(#20035,#20032)
 exprContainers(#20035,#20001)
 literals("x","x",#20035)
 #20036=@"var;{x};{#20000}"
@@ -112,18 +112,18 @@ exprs(#20037,34,#20033,1,"1+2")
 #20038=@"loc,{#10000},1,6,1,8"
 locations_default(#20038,#10000,1,6,1,8)
 hasLocation(#20037,#20038)
-enclosingStmt(#20037,#20032)
+enclosing_stmt(#20037,#20032)
 exprContainers(#20037,#20001)
 #20039=*
 exprs(#20039,3,#20037,0,"1")
 hasLocation(#20039,#20013)
-enclosingStmt(#20039,#20032)
+enclosing_stmt(#20039,#20032)
 exprContainers(#20039,#20001)
 literals("1","1",#20039)
 #20040=*
 exprs(#20040,3,#20037,1,"2")
 hasLocation(#20040,#20017)
-enclosingStmt(#20040,#20032)
+enclosing_stmt(#20040,#20032)
 exprContainers(#20040,#20001)
 literals("2","2",#20040)
 #20041=*
@@ -131,12 +131,12 @@ exprs(#20041,45,#20033,2,"y||z")
 #20042=@"loc,{#10000},1,10,1,13"
 locations_default(#20042,#10000,1,10,1,13)
 hasLocation(#20041,#20042)
-enclosingStmt(#20041,#20032)
+enclosing_stmt(#20041,#20032)
 exprContainers(#20041,#20001)
 #20043=*
 exprs(#20043,79,#20041,0,"y")
 hasLocation(#20043,#20021)
-enclosingStmt(#20043,#20032)
+enclosing_stmt(#20043,#20032)
 exprContainers(#20043,#20001)
 literals("y","y",#20043)
 #20044=@"var;{y};{#20000}"
@@ -145,7 +145,7 @@ bind(#20043,#20044)
 #20045=*
 exprs(#20045,79,#20041,1,"z")
 hasLocation(#20045,#20025)
-enclosingStmt(#20045,#20032)
+enclosing_stmt(#20045,#20032)
 exprContainers(#20045,#20001)
 literals("z","z",#20045)
 #20046=@"var;{z};{#20000}"
diff --git a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
index d48ef0d4e19..c351ee582e4 100644
--- a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
@@ -99,19 +99,19 @@ exprs(#20034,44,#20033,0,"a && b && c")
 #20035=@"loc,{#10000},1,1,1,11"
 locations_default(#20035,#10000,1,1,1,11)
 hasLocation(#20034,#20035)
-enclosingStmt(#20034,#20033)
+enclosing_stmt(#20034,#20033)
 exprContainers(#20034,#20001)
 #20036=*
 exprs(#20036,44,#20034,0,"a && b")
 #20037=@"loc,{#10000},1,1,1,6"
 locations_default(#20037,#10000,1,1,1,6)
 hasLocation(#20036,#20037)
-enclosingStmt(#20036,#20033)
+enclosing_stmt(#20036,#20033)
 exprContainers(#20036,#20001)
 #20038=*
 exprs(#20038,79,#20036,0,"a")
 hasLocation(#20038,#20007)
-enclosingStmt(#20038,#20033)
+enclosing_stmt(#20038,#20033)
 exprContainers(#20038,#20001)
 literals("a","a",#20038)
 #20039=@"var;{a};{#20000}"
@@ -120,7 +120,7 @@ bind(#20038,#20039)
 #20040=*
 exprs(#20040,79,#20036,1,"b")
 hasLocation(#20040,#20011)
-enclosingStmt(#20040,#20033)
+enclosing_stmt(#20040,#20033)
 exprContainers(#20040,#20001)
 literals("b","b",#20040)
 #20041=@"var;{b};{#20000}"
@@ -129,7 +129,7 @@ bind(#20040,#20041)
 #20042=*
 exprs(#20042,79,#20034,1,"c")
 hasLocation(#20042,#20015)
-enclosingStmt(#20042,#20033)
+enclosing_stmt(#20042,#20033)
 exprContainers(#20042,#20001)
 literals("c","c",#20042)
 #20043=@"var;{c};{#20000}"
@@ -144,19 +144,19 @@ exprs(#20045,45,#20044,0,"x || y || z")
 #20046=@"loc,{#10000},2,1,2,11"
 locations_default(#20046,#10000,2,1,2,11)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20044)
+enclosing_stmt(#20045,#20044)
 exprContainers(#20045,#20001)
 #20047=*
 exprs(#20047,45,#20045,0,"x || y")
 #20048=@"loc,{#10000},2,1,2,6"
 locations_default(#20048,#10000,2,1,2,6)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20044)
+enclosing_stmt(#20047,#20044)
 exprContainers(#20047,#20001)
 #20049=*
 exprs(#20049,79,#20047,0,"x")
 hasLocation(#20049,#20019)
-enclosingStmt(#20049,#20044)
+enclosing_stmt(#20049,#20044)
 exprContainers(#20049,#20001)
 literals("x","x",#20049)
 #20050=@"var;{x};{#20000}"
@@ -165,7 +165,7 @@ bind(#20049,#20050)
 #20051=*
 exprs(#20051,79,#20047,1,"y")
 hasLocation(#20051,#20023)
-enclosingStmt(#20051,#20044)
+enclosing_stmt(#20051,#20044)
 exprContainers(#20051,#20001)
 literals("y","y",#20051)
 #20052=@"var;{y};{#20000}"
@@ -174,7 +174,7 @@ bind(#20051,#20052)
 #20053=*
 exprs(#20053,79,#20045,1,"z")
 hasLocation(#20053,#20027)
-enclosingStmt(#20053,#20044)
+enclosing_stmt(#20053,#20044)
 exprContainers(#20053,#20001)
 literals("z","z",#20053)
 #20054=@"var;{z};{#20000}"
diff --git a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
index 8a513bfb0a0..ce920fd1cac 100644
--- a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
@@ -91,26 +91,26 @@ exprs(#20031,45,#20030,0,"(a ? b  ... d) || e")
 #20032=@"loc,{#10000},1,1,1,21"
 locations_default(#20032,#10000,1,1,1,21)
 hasLocation(#20031,#20032)
-enclosingStmt(#20031,#20030)
+enclosing_stmt(#20031,#20030)
 exprContainers(#20031,#20001)
 #20033=*
 exprs(#20033,63,#20031,0,"(a ? b || c : d)")
 #20034=@"loc,{#10000},1,1,1,16"
 locations_default(#20034,#10000,1,1,1,16)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20030)
+enclosing_stmt(#20033,#20030)
 exprContainers(#20033,#20001)
 #20035=*
 exprs(#20035,11,#20033,0,"a ? b || c : d")
 #20036=@"loc,{#10000},1,2,1,15"
 locations_default(#20036,#10000,1,2,1,15)
 hasLocation(#20035,#20036)
-enclosingStmt(#20035,#20030)
+enclosing_stmt(#20035,#20030)
 exprContainers(#20035,#20001)
 #20037=*
 exprs(#20037,79,#20035,0,"a")
 hasLocation(#20037,#20007)
-enclosingStmt(#20037,#20030)
+enclosing_stmt(#20037,#20030)
 exprContainers(#20037,#20001)
 literals("a","a",#20037)
 #20038=@"var;{a};{#20000}"
@@ -121,12 +121,12 @@ exprs(#20039,45,#20035,1,"b || c")
 #20040=@"loc,{#10000},1,6,1,11"
 locations_default(#20040,#10000,1,6,1,11)
 hasLocation(#20039,#20040)
-enclosingStmt(#20039,#20030)
+enclosing_stmt(#20039,#20030)
 exprContainers(#20039,#20001)
 #20041=*
 exprs(#20041,79,#20039,0,"b")
 hasLocation(#20041,#20011)
-enclosingStmt(#20041,#20030)
+enclosing_stmt(#20041,#20030)
 exprContainers(#20041,#20001)
 literals("b","b",#20041)
 #20042=@"var;{b};{#20000}"
@@ -135,7 +135,7 @@ bind(#20041,#20042)
 #20043=*
 exprs(#20043,79,#20039,1,"c")
 hasLocation(#20043,#20015)
-enclosingStmt(#20043,#20030)
+enclosing_stmt(#20043,#20030)
 exprContainers(#20043,#20001)
 literals("c","c",#20043)
 #20044=@"var;{c};{#20000}"
@@ -144,7 +144,7 @@ bind(#20043,#20044)
 #20045=*
 exprs(#20045,79,#20035,2,"d")
 hasLocation(#20045,#20019)
-enclosingStmt(#20045,#20030)
+enclosing_stmt(#20045,#20030)
 exprContainers(#20045,#20001)
 literals("d","d",#20045)
 #20046=@"var;{d};{#20000}"
@@ -153,7 +153,7 @@ bind(#20045,#20046)
 #20047=*
 exprs(#20047,79,#20031,1,"e")
 hasLocation(#20047,#20025)
-enclosingStmt(#20047,#20030)
+enclosing_stmt(#20047,#20030)
 exprContainers(#20047,#20001)
 literals("e","e",#20047)
 #20048=@"var;{e};{#20000}"
diff --git a/javascript/extractor/tests/cfg/output/trap/tst.js.trap b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
index 25373162967..b715aeeb23c 100644
--- a/javascript/extractor/tests/cfg/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
@@ -901,19 +901,19 @@ exprs(#20332,64,#20330,0,"i = 0")
 #20333=@"loc,{#10000},3,9,3,13"
 locations_default(#20333,#10000,3,9,3,13)
 hasLocation(#20332,#20333)
-enclosingStmt(#20332,#20330)
+enclosing_stmt(#20332,#20330)
 exprContainers(#20332,#20322)
 #20334=*
 exprs(#20334,78,#20332,0,"i")
 hasLocation(#20334,#20086)
-enclosingStmt(#20334,#20330)
+enclosing_stmt(#20334,#20330)
 exprContainers(#20334,#20322)
 literals("i","i",#20334)
 decl(#20334,#20326)
 #20335=*
 exprs(#20335,3,#20332,1,"0")
 hasLocation(#20335,#20090)
-enclosingStmt(#20335,#20330)
+enclosing_stmt(#20335,#20330)
 exprContainers(#20335,#20322)
 literals("0","0",#20335)
 #20336=*
@@ -927,19 +927,19 @@ exprs(#20338,64,#20336,0,"i = 1")
 #20339=@"loc,{#10000},4,9,4,13"
 locations_default(#20339,#10000,4,9,4,13)
 hasLocation(#20338,#20339)
-enclosingStmt(#20338,#20336)
+enclosing_stmt(#20338,#20336)
 exprContainers(#20338,#20322)
 #20340=*
 exprs(#20340,78,#20338,0,"i")
 hasLocation(#20340,#20096)
-enclosingStmt(#20340,#20336)
+enclosing_stmt(#20340,#20336)
 exprContainers(#20340,#20322)
 literals("i","i",#20340)
 decl(#20340,#20326)
 #20341=*
 exprs(#20341,3,#20338,1,"1")
 hasLocation(#20341,#20100)
-enclosingStmt(#20341,#20336)
+enclosing_stmt(#20341,#20336)
 exprContainers(#20341,#20322)
 literals("1","1",#20341)
 #20342=*
@@ -953,19 +953,19 @@ exprs(#20344,27,#20342,1,"i < 32")
 #20345=@"loc,{#10000},5,19,5,24"
 locations_default(#20345,#10000,5,19,5,24)
 hasLocation(#20344,#20345)
-enclosingStmt(#20344,#20342)
+enclosing_stmt(#20344,#20342)
 exprContainers(#20344,#20322)
 #20346=*
 exprs(#20346,79,#20344,0,"i")
 hasLocation(#20346,#20116)
-enclosingStmt(#20346,#20342)
+enclosing_stmt(#20346,#20342)
 exprContainers(#20346,#20322)
 literals("i","i",#20346)
 bind(#20346,#20326)
 #20347=*
 exprs(#20347,3,#20344,1,"32")
 hasLocation(#20347,#20120)
-enclosingStmt(#20347,#20342)
+enclosing_stmt(#20347,#20342)
 exprContainers(#20347,#20322)
 literals("32","32",#20347)
 #20348=*
@@ -973,12 +973,12 @@ exprs(#20348,59,#20342,2,"++i")
 #20349=@"loc,{#10000},5,28,5,30"
 locations_default(#20349,#10000,5,28,5,30)
 hasLocation(#20348,#20349)
-enclosingStmt(#20348,#20342)
+enclosing_stmt(#20348,#20342)
 exprContainers(#20348,#20322)
 #20350=*
 exprs(#20350,79,#20348,0,"i")
 hasLocation(#20350,#20126)
-enclosingStmt(#20350,#20342)
+enclosing_stmt(#20350,#20342)
 exprContainers(#20350,#20322)
 literals("i","i",#20350)
 bind(#20350,#20326)
@@ -987,19 +987,19 @@ exprs(#20351,47,#20342,0,"i = 0")
 #20352=@"loc,{#10000},5,11,5,15"
 locations_default(#20352,#10000,5,11,5,15)
 hasLocation(#20351,#20352)
-enclosingStmt(#20351,#20342)
+enclosing_stmt(#20351,#20342)
 exprContainers(#20351,#20322)
 #20353=*
 exprs(#20353,79,#20351,0,"i")
 hasLocation(#20353,#20108)
-enclosingStmt(#20353,#20342)
+enclosing_stmt(#20353,#20342)
 exprContainers(#20353,#20322)
 literals("i","i",#20353)
 bind(#20353,#20326)
 #20354=*
 exprs(#20354,3,#20351,1,"0")
 hasLocation(#20354,#20112)
-enclosingStmt(#20354,#20342)
+enclosing_stmt(#20354,#20342)
 exprContainers(#20354,#20322)
 literals("0","0",#20354)
 #20355=*
@@ -1015,7 +1015,7 @@ stmt_containers(#20356,#20322)
 #20358=*
 exprs(#20358,79,#20356,-1,"i")
 hasLocation(#20358,#20136)
-enclosingStmt(#20358,#20356)
+enclosing_stmt(#20358,#20356)
 exprContainers(#20358,#20322)
 literals("i","i",#20358)
 bind(#20358,#20326)
@@ -1028,7 +1028,7 @@ stmt_containers(#20359,#20322)
 #20361=*
 exprs(#20361,3,#20359,-1,"32")
 hasLocation(#20361,#20144)
-enclosingStmt(#20361,#20359)
+enclosing_stmt(#20361,#20359)
 exprContainers(#20361,#20322)
 literals("32","32",#20361)
 #20362=*
@@ -1040,7 +1040,7 @@ stmt_containers(#20362,#20322)
 #20364=*
 exprs(#20364,2,#20362,0,"true")
 hasLocation(#20364,#20150)
-enclosingStmt(#20364,#20362)
+enclosing_stmt(#20364,#20362)
 exprContainers(#20364,#20322)
 literals("true","true",#20364)
 #20365=*
@@ -1052,7 +1052,7 @@ stmt_containers(#20365,#20001)
 #20367=*
 exprs(#20367,79,#20365,1,"a")
 hasLocation(#20367,#20163)
-enclosingStmt(#20367,#20365)
+enclosing_stmt(#20367,#20365)
 exprContainers(#20367,#20001)
 literals("a","a",#20367)
 #20368=@"var;{a};{#20000}"
@@ -1109,7 +1109,7 @@ stmt_containers(#20381,#20371)
 #20383=*
 exprs(#20383,79,#20381,1,"o")
 hasLocation(#20383,#20195)
-enclosingStmt(#20383,#20381)
+enclosing_stmt(#20383,#20381)
 exprContainers(#20383,#20371)
 literals("o","o",#20383)
 bind(#20383,#20376)
@@ -1122,12 +1122,12 @@ stmt_containers(#20384,#20371)
 #20386=*
 exprs(#20386,64,#20384,0,"p")
 hasLocation(#20386,#20191)
-enclosingStmt(#20386,#20384)
+enclosing_stmt(#20386,#20384)
 exprContainers(#20386,#20371)
 #20387=*
 exprs(#20387,78,#20386,0,"p")
 hasLocation(#20387,#20191)
-enclosingStmt(#20387,#20384)
+enclosing_stmt(#20387,#20384)
 exprContainers(#20387,#20371)
 literals("p","p",#20387)
 decl(#20387,#20375)
@@ -1140,7 +1140,7 @@ stmt_containers(#20388,#20371)
 #20390=*
 exprs(#20390,79,#20388,0,"p")
 hasLocation(#20390,#20203)
-enclosingStmt(#20390,#20388)
+enclosing_stmt(#20390,#20388)
 exprContainers(#20390,#20371)
 literals("p","p",#20390)
 bind(#20390,#20375)
@@ -1175,7 +1175,7 @@ variables(#20399,"e",#20398)
 #20400=*
 exprs(#20400,78,#20396,0,"e")
 hasLocation(#20400,#20220)
-enclosingStmt(#20400,#20396)
+enclosing_stmt(#20400,#20396)
 exprContainers(#20400,#20001)
 literals("e","e",#20400)
 decl(#20400,#20399)
@@ -1196,19 +1196,19 @@ exprs(#20405,13,#20403,0,"o.m()")
 #20406=@"loc,{#10000},22,5,22,9"
 locations_default(#20406,#10000,22,5,22,9)
 hasLocation(#20405,#20406)
-enclosingStmt(#20405,#20403)
+enclosing_stmt(#20405,#20403)
 exprContainers(#20405,#20001)
 #20407=*
 exprs(#20407,14,#20405,-1,"o.m")
 #20408=@"loc,{#10000},22,5,22,7"
 locations_default(#20408,#10000,22,5,22,7)
 hasLocation(#20407,#20408)
-enclosingStmt(#20407,#20403)
+enclosing_stmt(#20407,#20403)
 exprContainers(#20407,#20001)
 #20409=*
 exprs(#20409,79,#20407,0,"o")
 hasLocation(#20409,#20226)
-enclosingStmt(#20409,#20403)
+enclosing_stmt(#20409,#20403)
 exprContainers(#20409,#20001)
 literals("o","o",#20409)
 #20410=@"var;{o};{#20000}"
@@ -1217,7 +1217,7 @@ bind(#20409,#20410)
 #20411=*
 exprs(#20411,0,#20407,1,"m")
 hasLocation(#20411,#20230)
-enclosingStmt(#20411,#20403)
+enclosing_stmt(#20411,#20403)
 exprContainers(#20411,#20001)
 literals("m","m",#20411)
 #20412=*
@@ -1247,7 +1247,7 @@ stmt_containers(#20418,#20001)
 #20420=*
 exprs(#20420,79,#20418,1,"headers")
 hasLocation(#20420,#20257)
-enclosingStmt(#20420,#20418)
+enclosing_stmt(#20420,#20418)
 exprContainers(#20420,#20001)
 literals("headers","headers",#20420)
 #20421=@"var;{headers};{#20000}"
@@ -1256,7 +1256,7 @@ bind(#20420,#20421)
 #20422=*
 exprs(#20422,79,#20418,0,"i")
 hasLocation(#20422,#20253)
-enclosingStmt(#20422,#20418)
+enclosing_stmt(#20422,#20418)
 exprContainers(#20422,#20001)
 literals("i","i",#20422)
 #20423=@"var;{i};{#20000}"
@@ -1281,7 +1281,7 @@ variables(#20428,"_",#20427)
 #20429=*
 exprs(#20429,78,#20425,0,"_")
 hasLocation(#20429,#20269)
-enclosingStmt(#20429,#20425)
+enclosing_stmt(#20429,#20425)
 exprContainers(#20429,#20001)
 literals("_","_",#20429)
 decl(#20429,#20428)
@@ -1320,12 +1320,12 @@ exprs(#20440,13,#20438,0,"f()")
 #20441=@"loc,{#10000},32,5,32,7"
 locations_default(#20441,#10000,32,5,32,7)
 hasLocation(#20440,#20441)
-enclosingStmt(#20440,#20438)
+enclosing_stmt(#20440,#20438)
 exprContainers(#20440,#20001)
 #20442=*
 exprs(#20442,79,#20440,-1,"f")
 hasLocation(#20442,#20287)
-enclosingStmt(#20442,#20438)
+enclosing_stmt(#20442,#20438)
 exprContainers(#20442,#20001)
 literals("f","f",#20442)
 bind(#20442,#20321)
@@ -1340,26 +1340,26 @@ exprs(#20445,18,#20443,0,"!(x || y)")
 #20446=@"loc,{#10000},35,5,35,13"
 locations_default(#20446,#10000,35,5,35,13)
 hasLocation(#20445,#20446)
-enclosingStmt(#20445,#20443)
+enclosing_stmt(#20445,#20443)
 exprContainers(#20445,#20001)
 #20447=*
 exprs(#20447,63,#20445,0,"(x || y)")
 #20448=@"loc,{#10000},35,6,35,13"
 locations_default(#20448,#10000,35,6,35,13)
 hasLocation(#20447,#20448)
-enclosingStmt(#20447,#20443)
+enclosing_stmt(#20447,#20443)
 exprContainers(#20447,#20001)
 #20449=*
 exprs(#20449,45,#20447,0,"x || y")
 #20450=@"loc,{#10000},35,7,35,12"
 locations_default(#20450,#10000,35,7,35,12)
 hasLocation(#20449,#20450)
-enclosingStmt(#20449,#20443)
+enclosing_stmt(#20449,#20443)
 exprContainers(#20449,#20001)
 #20451=*
 exprs(#20451,79,#20449,0,"x")
 hasLocation(#20451,#20304)
-enclosingStmt(#20451,#20443)
+enclosing_stmt(#20451,#20443)
 exprContainers(#20451,#20001)
 literals("x","x",#20451)
 #20452=@"var;{x};{#20000}"
@@ -1368,7 +1368,7 @@ bind(#20451,#20452)
 #20453=*
 exprs(#20453,79,#20449,1,"y")
 hasLocation(#20453,#20308)
-enclosingStmt(#20453,#20443)
+enclosing_stmt(#20453,#20443)
 exprContainers(#20453,#20001)
 literals("y","y",#20453)
 #20454=@"var;{y};{#20000}"
@@ -1383,7 +1383,7 @@ stmt_containers(#20455,#20001)
 #20457=*
 exprs(#20457,79,#20455,0,"z")
 hasLocation(#20457,#20314)
-enclosingStmt(#20457,#20455)
+enclosing_stmt(#20457,#20455)
 exprContainers(#20457,#20001)
 literals("z","z",#20457)
 #20458=@"var;{z};{#20000}"
diff --git a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
index 5a8249cc669..e0c1c39f1e9 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
@@ -119,19 +119,19 @@ exprs(#20040,13,#20039,0,"goog.de ... 'test')")
 #20041=@"loc,{#10000},1,1,1,28"
 locations_default(#20041,#10000,1,1,1,28)
 hasLocation(#20040,#20041)
-enclosingStmt(#20040,#20039)
+enclosing_stmt(#20040,#20039)
 exprContainers(#20040,#20001)
 #20042=*
 exprs(#20042,14,#20040,-1,"goog.declareModuleId")
 #20043=@"loc,{#10000},1,1,1,20"
 locations_default(#20043,#10000,1,1,1,20)
 hasLocation(#20042,#20043)
-enclosingStmt(#20042,#20039)
+enclosing_stmt(#20042,#20039)
 exprContainers(#20042,#20001)
 #20044=*
 exprs(#20044,79,#20042,0,"goog")
 hasLocation(#20044,#20009)
-enclosingStmt(#20044,#20039)
+enclosing_stmt(#20044,#20039)
 exprContainers(#20044,#20001)
 literals("goog","goog",#20044)
 #20045=@"var;{goog};{#20000}"
@@ -140,13 +140,13 @@ bind(#20044,#20045)
 #20046=*
 exprs(#20046,0,#20042,1,"declareModuleId")
 hasLocation(#20046,#20013)
-enclosingStmt(#20046,#20039)
+enclosing_stmt(#20046,#20039)
 exprContainers(#20046,#20001)
 literals("declareModuleId","declareModuleId",#20046)
 #20047=*
 exprs(#20047,4,#20040,0,"'test'")
 hasLocation(#20047,#20017)
-enclosingStmt(#20047,#20039)
+enclosing_stmt(#20047,#20039)
 exprContainers(#20047,#20001)
 literals("test","'test'",#20047)
 #20048=*
@@ -170,19 +170,19 @@ exprs(#20053,64,#20051,0,"x = 5")
 #20054=@"loc,{#10000},3,12,3,16"
 locations_default(#20054,#10000,3,12,3,16)
 hasLocation(#20053,#20054)
-enclosingStmt(#20053,#20051)
+enclosing_stmt(#20053,#20051)
 exprContainers(#20053,#20001)
 #20055=*
 exprs(#20055,78,#20053,0,"x")
 hasLocation(#20055,#20027)
-enclosingStmt(#20055,#20051)
+enclosing_stmt(#20055,#20051)
 exprContainers(#20055,#20001)
 literals("x","x",#20055)
 decl(#20055,#20038)
 #20056=*
 exprs(#20056,3,#20053,1,"5")
 hasLocation(#20056,#20031)
-enclosingStmt(#20056,#20051)
+enclosing_stmt(#20056,#20051)
 exprContainers(#20056,#20001)
 literals("5","5",#20056)
 #20057=*
diff --git a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
index ddcb7e02bb7..d49972692cc 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
@@ -156,19 +156,19 @@ exprs(#20055,13,#20054,0,"goog.module('test')")
 #20056=@"loc,{#10000},1,1,1,19"
 locations_default(#20056,#10000,1,1,1,19)
 hasLocation(#20055,#20056)
-enclosingStmt(#20055,#20054)
+enclosing_stmt(#20055,#20054)
 exprContainers(#20055,#20001)
 #20057=*
 exprs(#20057,14,#20055,-1,"goog.module")
 #20058=@"loc,{#10000},1,1,1,11"
 locations_default(#20058,#10000,1,1,1,11)
 hasLocation(#20057,#20058)
-enclosingStmt(#20057,#20054)
+enclosing_stmt(#20057,#20054)
 exprContainers(#20057,#20001)
 #20059=*
 exprs(#20059,79,#20057,0,"goog")
 hasLocation(#20059,#20009)
-enclosingStmt(#20059,#20054)
+enclosing_stmt(#20059,#20054)
 exprContainers(#20059,#20001)
 literals("goog","goog",#20059)
 #20060=@"var;{goog};{#20000}"
@@ -177,13 +177,13 @@ bind(#20059,#20060)
 #20061=*
 exprs(#20061,0,#20057,1,"module")
 hasLocation(#20061,#20013)
-enclosingStmt(#20061,#20054)
+enclosing_stmt(#20061,#20054)
 exprContainers(#20061,#20001)
 literals("module","module",#20061)
 #20062=*
 exprs(#20062,4,#20055,0,"'test'")
 hasLocation(#20062,#20017)
-enclosingStmt(#20062,#20054)
+enclosing_stmt(#20062,#20054)
 exprContainers(#20062,#20001)
 literals("test","'test'",#20062)
 #20063=*
@@ -201,19 +201,19 @@ exprs(#20066,64,#20065,0,"x = 5")
 #20067=@"loc,{#10000},2,5,2,9"
 locations_default(#20067,#10000,2,5,2,9)
 hasLocation(#20066,#20067)
-enclosingStmt(#20066,#20065)
+enclosing_stmt(#20066,#20065)
 exprContainers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"x")
 hasLocation(#20068,#20025)
-enclosingStmt(#20068,#20065)
+enclosing_stmt(#20068,#20065)
 exprContainers(#20068,#20001)
 literals("x","x",#20068)
 decl(#20068,#20053)
 #20069=*
 exprs(#20069,3,#20066,1,"5")
 hasLocation(#20069,#20029)
-enclosingStmt(#20069,#20065)
+enclosing_stmt(#20069,#20065)
 exprContainers(#20069,#20001)
 literals("5","5",#20069)
 #20070=*
@@ -225,12 +225,12 @@ exprs(#20071,47,#20070,0,"exports = { x: x }")
 #20072=@"loc,{#10000},3,1,3,18"
 locations_default(#20072,#10000,3,1,3,18)
 hasLocation(#20071,#20072)
-enclosingStmt(#20071,#20070)
+enclosing_stmt(#20071,#20070)
 exprContainers(#20071,#20001)
 #20073=*
 exprs(#20073,79,#20071,0,"exports")
 hasLocation(#20073,#20033)
-enclosingStmt(#20073,#20070)
+enclosing_stmt(#20073,#20070)
 exprContainers(#20073,#20001)
 literals("exports","exports",#20073)
 bind(#20073,#20052)
@@ -239,7 +239,7 @@ exprs(#20074,8,#20071,1,"{ x: x }")
 #20075=@"loc,{#10000},3,11,3,18"
 locations_default(#20075,#10000,3,11,3,18)
 hasLocation(#20074,#20075)
-enclosingStmt(#20074,#20070)
+enclosing_stmt(#20074,#20070)
 exprContainers(#20074,#20001)
 #20076=*
 properties(#20076,#20074,0,0,"x: x")
@@ -249,13 +249,13 @@ hasLocation(#20076,#20077)
 #20078=*
 exprs(#20078,0,#20076,0,"x")
 hasLocation(#20078,#20039)
-enclosingStmt(#20078,#20070)
+enclosing_stmt(#20078,#20070)
 exprContainers(#20078,#20001)
 literals("x","x",#20078)
 #20079=*
 exprs(#20079,79,#20076,1,"x")
 hasLocation(#20079,#20043)
-enclosingStmt(#20079,#20070)
+enclosing_stmt(#20079,#20070)
 exprContainers(#20079,#20001)
 literals("x","x",#20079)
 bind(#20079,#20053)
diff --git a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
index bcb60232e37..649fc4ec46f 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
@@ -111,19 +111,19 @@ exprs(#20038,13,#20037,0,"goog.pr ... est.x')")
 #20039=@"loc,{#10000},1,1,1,22"
 locations_default(#20039,#10000,1,1,1,22)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20037)
+enclosing_stmt(#20038,#20037)
 exprContainers(#20038,#20001)
 #20040=*
 exprs(#20040,14,#20038,-1,"goog.provide")
 #20041=@"loc,{#10000},1,1,1,12"
 locations_default(#20041,#10000,1,1,1,12)
 hasLocation(#20040,#20041)
-enclosingStmt(#20040,#20037)
+enclosing_stmt(#20040,#20037)
 exprContainers(#20040,#20001)
 #20042=*
 exprs(#20042,79,#20040,0,"goog")
 hasLocation(#20042,#20009)
-enclosingStmt(#20042,#20037)
+enclosing_stmt(#20042,#20037)
 exprContainers(#20042,#20001)
 literals("goog","goog",#20042)
 #20043=@"var;{goog};{#20000}"
@@ -132,13 +132,13 @@ bind(#20042,#20043)
 #20044=*
 exprs(#20044,0,#20040,1,"provide")
 hasLocation(#20044,#20013)
-enclosingStmt(#20044,#20037)
+enclosing_stmt(#20044,#20037)
 exprContainers(#20044,#20001)
 literals("provide","provide",#20044)
 #20045=*
 exprs(#20045,4,#20038,0,"'test.x'")
 hasLocation(#20045,#20017)
-enclosingStmt(#20045,#20037)
+enclosing_stmt(#20045,#20037)
 exprContainers(#20045,#20001)
 literals("test.x","'test.x'",#20045)
 #20046=*
@@ -172,19 +172,19 @@ exprs(#20055,47,#20054,0,"test.x = 5")
 #20056=@"loc,{#10000},3,1,3,10"
 locations_default(#20056,#10000,3,1,3,10)
 hasLocation(#20055,#20056)
-enclosingStmt(#20055,#20054)
+enclosing_stmt(#20055,#20054)
 exprContainers(#20055,#20001)
 #20057=*
 exprs(#20057,14,#20055,0,"test.x")
 #20058=@"loc,{#10000},3,1,3,6"
 locations_default(#20058,#10000,3,1,3,6)
 hasLocation(#20057,#20058)
-enclosingStmt(#20057,#20054)
+enclosing_stmt(#20057,#20054)
 exprContainers(#20057,#20001)
 #20059=*
 exprs(#20059,79,#20057,0,"test")
 hasLocation(#20059,#20023)
-enclosingStmt(#20059,#20054)
+enclosing_stmt(#20059,#20054)
 exprContainers(#20059,#20001)
 literals("test","test",#20059)
 #20060=@"var;{test};{#20000}"
@@ -193,13 +193,13 @@ bind(#20059,#20060)
 #20061=*
 exprs(#20061,0,#20057,1,"x")
 hasLocation(#20061,#20027)
-enclosingStmt(#20061,#20054)
+enclosing_stmt(#20061,#20054)
 exprContainers(#20061,#20001)
 literals("x","x",#20061)
 #20062=*
 exprs(#20062,3,#20055,1,"5")
 hasLocation(#20062,#20031)
-enclosingStmt(#20062,#20054)
+enclosing_stmt(#20062,#20054)
 exprContainers(#20062,#20001)
 literals("5","5",#20062)
 #20063=*
diff --git a/javascript/extractor/tests/e4x/output/trap/regress.js.trap b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
index e1f3ed67407..6ea5efa2ab7 100644
--- a/javascript/extractor/tests/e4x/output/trap/regress.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
@@ -57,19 +57,19 @@ stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,7,#20017,0,"[ x in y ]")
 hasLocation(#20018,#20003)
-enclosingStmt(#20018,#20017)
+enclosing_stmt(#20018,#20017)
 exprContainers(#20018,#20001)
 #20019=*
 exprs(#20019,42,#20018,0,"x in y")
 #20020=@"loc,{#10000},1,3,1,8"
 locations_default(#20020,#10000,1,3,1,8)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20017)
+enclosing_stmt(#20019,#20017)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,79,#20019,0,"x")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20017)
+enclosing_stmt(#20021,#20017)
 exprContainers(#20021,#20001)
 literals("x","x",#20021)
 #20022=@"var;{x};{#20000}"
@@ -78,7 +78,7 @@ bind(#20021,#20022)
 #20023=*
 exprs(#20023,79,#20019,1,"y")
 hasLocation(#20023,#20011)
-enclosingStmt(#20023,#20017)
+enclosing_stmt(#20023,#20017)
 exprContainers(#20023,#20001)
 literals("y","y",#20023)
 #20024=@"var;{y};{#20000}"
diff --git a/javascript/extractor/tests/e4x/output/trap/tst.js.trap b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
index 4b6cb23d52d..7e0c073d5af 100644
--- a/javascript/extractor/tests/e4x/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
@@ -499,12 +499,12 @@ exprs(#20187,14,#20186,0,"items.@id")
 #20188=@"loc,{#10000},1,1,1,9"
 locations_default(#20188,#10000,1,1,1,9)
 hasLocation(#20187,#20188)
-enclosingStmt(#20187,#20186)
+enclosing_stmt(#20187,#20186)
 exprContainers(#20187,#20001)
 #20189=*
 exprs(#20189,79,#20187,0,"items")
 hasLocation(#20189,#20029)
-enclosingStmt(#20189,#20186)
+enclosing_stmt(#20189,#20186)
 exprContainers(#20189,#20001)
 literals("items","items",#20189)
 #20190=@"var;{items};{#20000}"
@@ -515,12 +515,12 @@ exprs(#20191,109,#20187,1,"@id")
 #20192=@"loc,{#10000},1,7,1,9"
 locations_default(#20192,#10000,1,7,1,9)
 hasLocation(#20191,#20192)
-enclosingStmt(#20191,#20186)
+enclosing_stmt(#20191,#20186)
 exprContainers(#20191,#20001)
 #20193=*
 exprs(#20193,0,#20191,0,"id")
 hasLocation(#20193,#20035)
-enclosingStmt(#20193,#20186)
+enclosing_stmt(#20193,#20186)
 exprContainers(#20193,#20001)
 literals("id","id",#20193)
 #20194=*
@@ -532,31 +532,31 @@ exprs(#20195,15,#20194,0,"items.*[1]")
 #20196=@"loc,{#10000},2,1,2,10"
 locations_default(#20196,#10000,2,1,2,10)
 hasLocation(#20195,#20196)
-enclosingStmt(#20195,#20194)
+enclosing_stmt(#20195,#20194)
 exprContainers(#20195,#20001)
 #20197=*
 exprs(#20197,14,#20195,0,"items.*")
 #20198=@"loc,{#10000},2,1,2,7"
 locations_default(#20198,#10000,2,1,2,7)
 hasLocation(#20197,#20198)
-enclosingStmt(#20197,#20194)
+enclosing_stmt(#20197,#20194)
 exprContainers(#20197,#20001)
 #20199=*
 exprs(#20199,79,#20197,0,"items")
 hasLocation(#20199,#20039)
-enclosingStmt(#20199,#20194)
+enclosing_stmt(#20199,#20194)
 exprContainers(#20199,#20001)
 literals("items","items",#20199)
 bind(#20199,#20190)
 #20200=*
 exprs(#20200,108,#20197,1,"*")
 hasLocation(#20200,#20043)
-enclosingStmt(#20200,#20194)
+enclosing_stmt(#20200,#20194)
 exprContainers(#20200,#20001)
 #20201=*
 exprs(#20201,3,#20195,1,"1")
 hasLocation(#20201,#20047)
-enclosingStmt(#20201,#20194)
+enclosing_stmt(#20201,#20194)
 exprContainers(#20201,#20001)
 literals("1","1",#20201)
 #20202=*
@@ -568,12 +568,12 @@ exprs(#20203,14,#20202,0,"order.@*")
 #20204=@"loc,{#10000},3,1,3,8"
 locations_default(#20204,#10000,3,1,3,8)
 hasLocation(#20203,#20204)
-enclosingStmt(#20203,#20202)
+enclosing_stmt(#20203,#20202)
 exprContainers(#20203,#20001)
 #20205=*
 exprs(#20205,79,#20203,0,"order")
 hasLocation(#20205,#20053)
-enclosingStmt(#20205,#20202)
+enclosing_stmt(#20205,#20202)
 exprContainers(#20205,#20001)
 literals("order","order",#20205)
 #20206=@"var;{order};{#20000}"
@@ -584,12 +584,12 @@ exprs(#20207,109,#20203,1,"@*")
 #20208=@"loc,{#10000},3,7,3,8"
 locations_default(#20208,#10000,3,7,3,8)
 hasLocation(#20207,#20208)
-enclosingStmt(#20207,#20202)
+enclosing_stmt(#20207,#20202)
 exprContainers(#20207,#20001)
 #20209=*
 exprs(#20209,108,#20207,0,"*")
 hasLocation(#20209,#20059)
-enclosingStmt(#20209,#20202)
+enclosing_stmt(#20209,#20202)
 exprContainers(#20209,#20001)
 #20210=*
 stmts(#20210,2,#20001,3,"e..empl ...  == 1);")
@@ -600,26 +600,26 @@ exprs(#20211,111,#20210,0,"e..empl ... d == 1)")
 #20212=@"loc,{#10000},4,1,4,34"
 locations_default(#20212,#10000,4,1,4,34)
 hasLocation(#20211,#20212)
-enclosingStmt(#20211,#20210)
+enclosing_stmt(#20211,#20210)
 exprContainers(#20211,#20001)
 #20213=*
 exprs(#20213,114,#20211,0,"e..employee")
 #20214=@"loc,{#10000},4,1,4,11"
 locations_default(#20214,#10000,4,1,4,11)
 hasLocation(#20213,#20214)
-enclosingStmt(#20213,#20210)
+enclosing_stmt(#20213,#20210)
 exprContainers(#20213,#20001)
 #20215=*
 exprs(#20215,79,#20213,0,"e")
 hasLocation(#20215,#20063)
-enclosingStmt(#20215,#20210)
+enclosing_stmt(#20215,#20210)
 exprContainers(#20215,#20001)
 literals("e","e",#20215)
 bind(#20215,#20185)
 #20216=*
 exprs(#20216,0,#20213,1,"employee")
 hasLocation(#20216,#20067)
-enclosingStmt(#20216,#20210)
+enclosing_stmt(#20216,#20210)
 exprContainers(#20216,#20001)
 literals("employee","employee",#20216)
 #20217=*
@@ -627,32 +627,32 @@ exprs(#20217,45,#20211,1,"@id == 0 || @id == 1")
 #20218=@"loc,{#10000},4,14,4,33"
 locations_default(#20218,#10000,4,14,4,33)
 hasLocation(#20217,#20218)
-enclosingStmt(#20217,#20210)
+enclosing_stmt(#20217,#20210)
 exprContainers(#20217,#20001)
 #20219=*
 exprs(#20219,23,#20217,0,"@id == 0")
 #20220=@"loc,{#10000},4,14,4,21"
 locations_default(#20220,#10000,4,14,4,21)
 hasLocation(#20219,#20220)
-enclosingStmt(#20219,#20210)
+enclosing_stmt(#20219,#20210)
 exprContainers(#20219,#20001)
 #20221=*
 exprs(#20221,109,#20219,0,"@id")
 #20222=@"loc,{#10000},4,14,4,16"
 locations_default(#20222,#10000,4,14,4,16)
 hasLocation(#20221,#20222)
-enclosingStmt(#20221,#20210)
+enclosing_stmt(#20221,#20210)
 exprContainers(#20221,#20001)
 #20223=*
 exprs(#20223,0,#20221,0,"id")
 hasLocation(#20223,#20075)
-enclosingStmt(#20223,#20210)
+enclosing_stmt(#20223,#20210)
 exprContainers(#20223,#20001)
 literals("id","id",#20223)
 #20224=*
 exprs(#20224,3,#20219,1,"0")
 hasLocation(#20224,#20079)
-enclosingStmt(#20224,#20210)
+enclosing_stmt(#20224,#20210)
 exprContainers(#20224,#20001)
 literals("0","0",#20224)
 #20225=*
@@ -660,25 +660,25 @@ exprs(#20225,23,#20217,1,"@id == 1")
 #20226=@"loc,{#10000},4,26,4,33"
 locations_default(#20226,#10000,4,26,4,33)
 hasLocation(#20225,#20226)
-enclosingStmt(#20225,#20210)
+enclosing_stmt(#20225,#20210)
 exprContainers(#20225,#20001)
 #20227=*
 exprs(#20227,109,#20225,0,"@id")
 #20228=@"loc,{#10000},4,26,4,28"
 locations_default(#20228,#10000,4,26,4,28)
 hasLocation(#20227,#20228)
-enclosingStmt(#20227,#20210)
+enclosing_stmt(#20227,#20210)
 exprContainers(#20227,#20001)
 #20229=*
 exprs(#20229,0,#20227,0,"id")
 hasLocation(#20229,#20085)
-enclosingStmt(#20229,#20210)
+enclosing_stmt(#20229,#20210)
 exprContainers(#20229,#20001)
 literals("id","id",#20229)
 #20230=*
 exprs(#20230,3,#20225,1,"1")
 hasLocation(#20230,#20089)
-enclosingStmt(#20230,#20210)
+enclosing_stmt(#20230,#20210)
 exprContainers(#20230,#20001)
 literals("1","1",#20230)
 #20231=*
@@ -690,19 +690,19 @@ exprs(#20232,97,#20231,0,"message ... ngStyle")
 #20233=@"loc,{#10000},5,1,5,28"
 locations_default(#20233,#10000,5,1,5,28)
 hasLocation(#20232,#20233)
-enclosingStmt(#20232,#20231)
+enclosing_stmt(#20232,#20231)
 exprContainers(#20232,#20001)
 #20234=*
 exprs(#20234,14,#20232,0,"message.@soap")
 #20235=@"loc,{#10000},5,1,5,13"
 locations_default(#20235,#10000,5,1,5,13)
 hasLocation(#20234,#20235)
-enclosingStmt(#20234,#20231)
+enclosing_stmt(#20234,#20231)
 exprContainers(#20234,#20001)
 #20236=*
 exprs(#20236,79,#20234,0,"message")
 hasLocation(#20236,#20095)
-enclosingStmt(#20236,#20231)
+enclosing_stmt(#20236,#20231)
 exprContainers(#20236,#20001)
 literals("message","message",#20236)
 #20237=@"var;{message};{#20000}"
@@ -713,18 +713,18 @@ exprs(#20238,109,#20234,1,"@soap")
 #20239=@"loc,{#10000},5,9,5,13"
 locations_default(#20239,#10000,5,9,5,13)
 hasLocation(#20238,#20239)
-enclosingStmt(#20238,#20231)
+enclosing_stmt(#20238,#20231)
 exprContainers(#20238,#20001)
 #20240=*
 exprs(#20240,0,#20238,0,"soap")
 hasLocation(#20240,#20101)
-enclosingStmt(#20240,#20231)
+enclosing_stmt(#20240,#20231)
 exprContainers(#20240,#20001)
 literals("soap","soap",#20240)
 #20241=*
 exprs(#20241,79,#20232,1,"encodingStyle")
 hasLocation(#20241,#20105)
-enclosingStmt(#20241,#20231)
+enclosing_stmt(#20241,#20231)
 exprContainers(#20241,#20001)
 literals("encodingStyle","encodingStyle",#20241)
 #20242=@"var;{encodingStyle};{#20000}"
@@ -739,32 +739,32 @@ exprs(#20244,97,#20243,0,"message.soap::Body")
 #20245=@"loc,{#10000},6,1,6,18"
 locations_default(#20245,#10000,6,1,6,18)
 hasLocation(#20244,#20245)
-enclosingStmt(#20244,#20243)
+enclosing_stmt(#20244,#20243)
 exprContainers(#20244,#20001)
 #20246=*
 exprs(#20246,14,#20244,0,"message.soap")
 #20247=@"loc,{#10000},6,1,6,12"
 locations_default(#20247,#10000,6,1,6,12)
 hasLocation(#20246,#20247)
-enclosingStmt(#20246,#20243)
+enclosing_stmt(#20246,#20243)
 exprContainers(#20246,#20001)
 #20248=*
 exprs(#20248,79,#20246,0,"message")
 hasLocation(#20248,#20109)
-enclosingStmt(#20248,#20243)
+enclosing_stmt(#20248,#20243)
 exprContainers(#20248,#20001)
 literals("message","message",#20248)
 bind(#20248,#20237)
 #20249=*
 exprs(#20249,0,#20246,1,"soap")
 hasLocation(#20249,#20113)
-enclosingStmt(#20249,#20243)
+enclosing_stmt(#20249,#20243)
 exprContainers(#20249,#20001)
 literals("soap","soap",#20249)
 #20250=*
 exprs(#20250,79,#20244,1,"Body")
 hasLocation(#20250,#20117)
-enclosingStmt(#20250,#20243)
+enclosing_stmt(#20250,#20243)
 exprContainers(#20250,#20001)
 literals("Body","Body",#20250)
 #20251=@"var;{Body};{#20000}"
@@ -779,12 +779,12 @@ exprs(#20253,14,#20252,0,"items.@[f()]")
 #20254=@"loc,{#10000},7,1,7,12"
 locations_default(#20254,#10000,7,1,7,12)
 hasLocation(#20253,#20254)
-enclosingStmt(#20253,#20252)
+enclosing_stmt(#20253,#20252)
 exprContainers(#20253,#20001)
 #20255=*
 exprs(#20255,79,#20253,0,"items")
 hasLocation(#20255,#20121)
-enclosingStmt(#20255,#20252)
+enclosing_stmt(#20255,#20252)
 exprContainers(#20255,#20001)
 literals("items","items",#20255)
 bind(#20255,#20190)
@@ -793,19 +793,19 @@ exprs(#20256,110,#20253,1,"@[f()]")
 #20257=@"loc,{#10000},7,7,7,12"
 locations_default(#20257,#10000,7,7,7,12)
 hasLocation(#20256,#20257)
-enclosingStmt(#20256,#20252)
+enclosing_stmt(#20256,#20252)
 exprContainers(#20256,#20001)
 #20258=*
 exprs(#20258,13,#20256,0,"f()")
 #20259=@"loc,{#10000},7,9,7,11"
 locations_default(#20259,#10000,7,9,7,11)
 hasLocation(#20258,#20259)
-enclosingStmt(#20258,#20252)
+enclosing_stmt(#20258,#20252)
 exprContainers(#20258,#20001)
 #20260=*
 exprs(#20260,79,#20258,-1,"f")
 hasLocation(#20260,#20129)
-enclosingStmt(#20260,#20252)
+enclosing_stmt(#20260,#20252)
 exprContainers(#20260,#20001)
 literals("f","f",#20260)
 #20261=@"var;{f};{#20000}"
@@ -820,26 +820,26 @@ exprs(#20263,97,#20262,0,"message.soap::[g()]")
 #20264=@"loc,{#10000},8,1,8,19"
 locations_default(#20264,#10000,8,1,8,19)
 hasLocation(#20263,#20264)
-enclosingStmt(#20263,#20262)
+enclosing_stmt(#20263,#20262)
 exprContainers(#20263,#20001)
 #20265=*
 exprs(#20265,14,#20263,0,"message.soap")
 #20266=@"loc,{#10000},8,1,8,12"
 locations_default(#20266,#10000,8,1,8,12)
 hasLocation(#20265,#20266)
-enclosingStmt(#20265,#20262)
+enclosing_stmt(#20265,#20262)
 exprContainers(#20265,#20001)
 #20267=*
 exprs(#20267,79,#20265,0,"message")
 hasLocation(#20267,#20139)
-enclosingStmt(#20267,#20262)
+enclosing_stmt(#20267,#20262)
 exprContainers(#20267,#20001)
 literals("message","message",#20267)
 bind(#20267,#20237)
 #20268=*
 exprs(#20268,0,#20265,1,"soap")
 hasLocation(#20268,#20143)
-enclosingStmt(#20268,#20262)
+enclosing_stmt(#20268,#20262)
 exprContainers(#20268,#20001)
 literals("soap","soap",#20268)
 #20269=*
@@ -847,19 +847,19 @@ exprs(#20269,7,#20263,1,"[g()]")
 #20270=@"loc,{#10000},8,15,8,19"
 locations_default(#20270,#10000,8,15,8,19)
 hasLocation(#20269,#20270)
-enclosingStmt(#20269,#20262)
+enclosing_stmt(#20269,#20262)
 exprContainers(#20269,#20001)
 #20271=*
 exprs(#20271,13,#20269,0,"g()")
 #20272=@"loc,{#10000},8,16,8,18"
 locations_default(#20272,#10000,8,16,8,18)
 hasLocation(#20271,#20272)
-enclosingStmt(#20271,#20262)
+enclosing_stmt(#20271,#20262)
 exprContainers(#20271,#20001)
 #20273=*
 exprs(#20273,79,#20271,-1,"g")
 hasLocation(#20273,#20149)
-enclosingStmt(#20273,#20262)
+enclosing_stmt(#20273,#20262)
 exprContainers(#20273,#20001)
 literals("g","g",#20273)
 #20274=@"var;{g};{#20000}"
@@ -877,12 +877,12 @@ exprs(#20277,64,#20275,0,"e = <?x ...  </elt>")
 #20278=@"loc,{#10000},10,5,13,8"
 locations_default(#20278,#10000,10,5,13,8)
 hasLocation(#20277,#20278)
-enclosingStmt(#20277,#20275)
+enclosing_stmt(#20277,#20275)
 exprContainers(#20277,#20001)
 #20279=*
 exprs(#20279,78,#20277,0,"e")
 hasLocation(#20279,#20161)
-enclosingStmt(#20279,#20275)
+enclosing_stmt(#20279,#20275)
 exprContainers(#20279,#20001)
 literals("e","e",#20279)
 decl(#20279,#20185)
@@ -891,18 +891,18 @@ exprs(#20280,89,#20277,1,"<?xml v ...  </elt>")
 #20281=@"loc,{#10000},10,9,13,8"
 locations_default(#20281,#10000,10,9,13,8)
 hasLocation(#20280,#20281)
-enclosingStmt(#20280,#20275)
+enclosing_stmt(#20280,#20275)
 exprContainers(#20280,#20001)
 #20282=*
 exprs(#20282,0,#20280,-1,"elt")
 hasLocation(#20282,#20167)
-enclosingStmt(#20282,#20275)
+enclosing_stmt(#20282,#20275)
 exprContainers(#20282,#20001)
 literals("elt","elt",#20282)
 #20283=*
 exprs(#20283,4,#20280,-2,"\n  <!-- ...  ]]>\n  ")
 hasLocation(#20283,#20171)
-enclosingStmt(#20283,#20275)
+enclosing_stmt(#20283,#20275)
 exprContainers(#20283,#20001)
 literals("
   
diff --git a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
index 0f92fa65401..1b25ab3cdf2 100644
--- a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
@@ -216,7 +216,7 @@ stmt_containers(#20074,#20001)
 #20075=*
 exprs(#20075,4,#20074,0,"'\ud800'")
 hasLocation(#20075,#20032)
-enclosingStmt(#20075,#20074)
+enclosing_stmt(#20075,#20074)
 exprContainers(#20075,#20001)
 literals("?","'\ud800'",#20075)
 #20076=*
@@ -232,7 +232,7 @@ stmt_containers(#20078,#20001)
 #20079=*
 exprs(#20079,4,#20078,0,"'foo\ud800'")
 hasLocation(#20079,#20036)
-enclosingStmt(#20079,#20078)
+enclosing_stmt(#20079,#20078)
 exprContainers(#20079,#20001)
 literals("foo?","'foo\ud800'",#20079)
 #20080=*
@@ -248,7 +248,7 @@ stmt_containers(#20082,#20001)
 #20083=*
 exprs(#20083,4,#20082,0,"'\ud800bar'")
 hasLocation(#20083,#20040)
-enclosingStmt(#20083,#20082)
+enclosing_stmt(#20083,#20082)
 exprContainers(#20083,#20001)
 literals("?bar","'\ud800bar'",#20083)
 #20084=*
@@ -264,7 +264,7 @@ stmt_containers(#20086,#20001)
 #20087=*
 exprs(#20087,4,#20086,0,"'foo\ud800bar'")
 hasLocation(#20087,#20044)
-enclosingStmt(#20087,#20086)
+enclosing_stmt(#20087,#20086)
 exprContainers(#20087,#20001)
 literals("foo?bar","'foo\ud800bar'",#20087)
 #20088=*
@@ -280,7 +280,7 @@ stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,5,#20090,0,"/\uD800/")
 hasLocation(#20091,#20048)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20001)
 literals("/\uD800/","/\uD800/",#20091)
 #20092=*
@@ -296,7 +296,7 @@ stmt_containers(#20094,#20001)
 #20095=*
 exprs(#20095,5,#20094,0,"/foo\ud800/")
 hasLocation(#20095,#20052)
-enclosingStmt(#20095,#20094)
+enclosing_stmt(#20095,#20094)
 exprContainers(#20095,#20001)
 literals("/foo\ud800/","/foo\ud800/",#20095)
 #20096=*
@@ -323,7 +323,7 @@ stmt_containers(#20102,#20001)
 #20103=*
 exprs(#20103,5,#20102,0,"/\ud800bar/")
 hasLocation(#20103,#20056)
-enclosingStmt(#20103,#20102)
+enclosing_stmt(#20103,#20102)
 exprContainers(#20103,#20001)
 literals("/\ud800bar/","/\ud800bar/",#20103)
 #20104=*
@@ -350,7 +350,7 @@ stmt_containers(#20110,#20001)
 #20111=*
 exprs(#20111,5,#20110,0,"/foo\ud800bar/")
 hasLocation(#20111,#20060)
-enclosingStmt(#20111,#20110)
+enclosing_stmt(#20111,#20110)
 exprContainers(#20111,#20001)
 literals("/foo\ud800bar/","/foo\ud800bar/",#20111)
 #20112=*
@@ -383,7 +383,7 @@ stmt_containers(#20120,#20001)
 #20121=*
 exprs(#20121,4,#20120,0,"'\udc00\ud800'")
 hasLocation(#20121,#20064)
-enclosingStmt(#20121,#20120)
+enclosing_stmt(#20121,#20120)
 exprContainers(#20121,#20001)
 literals("??","'\udc00\ud800'",#20121)
 #20122=*
@@ -399,7 +399,7 @@ stmt_containers(#20124,#20001)
 #20125=*
 exprs(#20125,4,#20124,0,"'\uD834\uDF06'")
 hasLocation(#20125,#20068)
-enclosingStmt(#20125,#20124)
+enclosing_stmt(#20125,#20124)
 exprContainers(#20125,#20001)
 literals("𝌆","'\uD834\uDF06'",#20125)
 #20126=*
diff --git a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
index 46b2ad2ece7..a3a8e990567 100644
--- a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
@@ -32,7 +32,7 @@ stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,4,#20007,0,"""Semml\u00e9""")
 hasLocation(#20008,#20003)
-enclosingStmt(#20008,#20007)
+enclosing_stmt(#20008,#20007)
 exprContainers(#20008,#20001)
 literals("Semmlé","""Semmlé""",#20008)
 #20009=*
diff --git a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
index 9b774c927e0..ed7ea3ed758 100644
--- a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
@@ -67,24 +67,24 @@ stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,47,#20021,0,"(x = 0) = y")
 hasLocation(#20022,#20003)
-enclosingStmt(#20022,#20021)
+enclosing_stmt(#20022,#20021)
 exprContainers(#20022,#20001)
 #20023=*
 exprs(#20023,63,#20022,0,"(x = 0)")
 #20024=@"loc,{#10000},1,1,1,7"
 locations_default(#20024,#10000,1,1,1,7)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20021)
+enclosing_stmt(#20023,#20021)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,79,#20023,0,"x")
 hasLocation(#20025,#20007)
-enclosingStmt(#20025,#20021)
+enclosing_stmt(#20025,#20021)
 exprContainers(#20025,#20001)
 #20026=*
 exprs(#20026,79,#20022,1,"y")
 hasLocation(#20026,#20017)
-enclosingStmt(#20026,#20021)
+enclosing_stmt(#20026,#20021)
 exprContainers(#20026,#20001)
 literals("y","y",#20026)
 #20027=@"var;{y};{#20000}"
diff --git a/javascript/extractor/tests/errors/output/trap/kwident.js.trap b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
index 11e63aeba8f..077882d85aa 100644
--- a/javascript/extractor/tests/errors/output/trap/kwident.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
@@ -61,19 +61,19 @@ exprs(#20019,64,#20018,0,"class = 23")
 #20020=@"loc,{#10000},1,5,1,14"
 locations_default(#20020,#10000,1,5,1,14)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,78,#20019,0,"class")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 literals("class","class",#20021)
 decl(#20021,#20017)
 #20022=*
 exprs(#20022,3,#20019,1,"23")
 hasLocation(#20022,#20011)
-enclosingStmt(#20022,#20018)
+enclosing_stmt(#20022,#20018)
 exprContainers(#20022,#20001)
 literals("23","23",#20022)
 #20023=*
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
index 5ea9cc2184e..339e6efcd96 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
@@ -76,19 +76,19 @@ exprs(#20025,47,#20024,0,"[x=42] = []")
 #20026=@"loc,{#10000},1,1,1,11"
 locations_default(#20026,#10000,1,1,1,11)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20024)
+enclosing_stmt(#20025,#20024)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,67,#20025,0,"[x=42]")
 #20028=@"loc,{#10000},1,1,1,6"
 locations_default(#20028,#10000,1,1,1,6)
 hasLocation(#20027,#20028)
-enclosingStmt(#20027,#20024)
+enclosing_stmt(#20027,#20024)
 exprContainers(#20027,#20001)
 #20029=*
 exprs(#20029,79,#20027,0,"x")
 hasLocation(#20029,#20007)
-enclosingStmt(#20029,#20024)
+enclosing_stmt(#20029,#20024)
 exprContainers(#20029,#20001)
 literals("x","x",#20029)
 #20030=@"var;{x};{#20000}"
@@ -97,7 +97,7 @@ bind(#20029,#20030)
 #20031=*
 exprs(#20031,3,#20027,-2,"42")
 hasLocation(#20031,#20011)
-enclosingStmt(#20031,#20024)
+enclosing_stmt(#20031,#20024)
 exprContainers(#20031,#20001)
 literals("42","42",#20031)
 arraySize(#20027,1)
@@ -106,7 +106,7 @@ exprs(#20032,7,#20025,1,"[]")
 #20033=@"loc,{#10000},1,10,1,11"
 locations_default(#20033,#10000,1,10,1,11)
 hasLocation(#20032,#20033)
-enclosingStmt(#20032,#20024)
+enclosing_stmt(#20032,#20024)
 exprContainers(#20032,#20001)
 arraySize(#20032,0)
 #20034=*
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
index 723b6d0c7e1..cb0d1d2a61c 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
@@ -183,19 +183,19 @@ exprs(#20062,64,#20060,0,"[, ...ys] = o")
 #20063=@"loc,{#10000},2,7,2,19"
 locations_default(#20063,#10000,2,7,2,19)
 hasLocation(#20062,#20063)
-enclosingStmt(#20062,#20060)
+enclosing_stmt(#20062,#20060)
 exprContainers(#20062,#20051)
 #20064=*
 exprs(#20064,67,#20062,0,"[, ...ys]")
 #20065=@"loc,{#10000},2,7,2,15"
 locations_default(#20065,#10000,2,7,2,15)
 hasLocation(#20064,#20065)
-enclosingStmt(#20064,#20060)
+enclosing_stmt(#20064,#20060)
 exprContainers(#20064,#20051)
 #20066=*
 exprs(#20066,78,#20064,-1,"ys")
 hasLocation(#20066,#20031)
-enclosingStmt(#20066,#20060)
+enclosing_stmt(#20066,#20060)
 exprContainers(#20066,#20051)
 literals("ys","ys",#20066)
 decl(#20066,#20054)
@@ -203,7 +203,7 @@ arraySize(#20064,1)
 #20067=*
 exprs(#20067,79,#20062,1,"o")
 hasLocation(#20067,#20037)
-enclosingStmt(#20067,#20060)
+enclosing_stmt(#20067,#20060)
 exprContainers(#20067,#20051)
 literals("o","o",#20067)
 bind(#20067,#20055)
@@ -216,7 +216,7 @@ stmt_containers(#20068,#20051)
 #20070=*
 exprs(#20070,79,#20068,0,"ys")
 hasLocation(#20070,#20043)
-enclosingStmt(#20070,#20068)
+enclosing_stmt(#20070,#20068)
 exprContainers(#20070,#20051)
 literals("ys","ys",#20070)
 bind(#20070,#20054)
diff --git a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
index 1ee98d565ec..6671e790d1e 100644
--- a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
@@ -265,26 +265,26 @@ exprs(#20100,13,#20099,0,"[""a"", "" ... length)")
 #20101=@"loc,{#10000},1,1,1,37"
 locations_default(#20101,#10000,1,1,1,37)
 hasLocation(#20100,#20101)
-enclosingStmt(#20100,#20099)
+enclosing_stmt(#20100,#20099)
 exprContainers(#20100,#20001)
 #20102=*
 exprs(#20102,14,#20100,-1,"[""a"", "" ... c""].map")
 #20103=@"loc,{#10000},1,1,1,22"
 locations_default(#20103,#10000,1,1,1,22)
 hasLocation(#20102,#20103)
-enclosingStmt(#20102,#20099)
+enclosing_stmt(#20102,#20099)
 exprContainers(#20102,#20001)
 #20104=*
 exprs(#20104,7,#20102,0,"[""a"", ""ab"", ""abc""]")
 #20105=@"loc,{#10000},1,1,1,18"
 locations_default(#20105,#10000,1,1,1,18)
 hasLocation(#20104,#20105)
-enclosingStmt(#20104,#20099)
+enclosing_stmt(#20104,#20099)
 exprContainers(#20104,#20001)
 #20106=*
 exprs(#20106,4,#20104,0,"""a""")
 hasLocation(#20106,#20011)
-enclosingStmt(#20106,#20099)
+enclosing_stmt(#20106,#20099)
 exprContainers(#20106,#20001)
 literals("a","""a""",#20106)
 #20107=*
@@ -296,7 +296,7 @@ regexpConstValue(#20107,"a")
 #20109=*
 exprs(#20109,4,#20104,1,"""ab""")
 hasLocation(#20109,#20015)
-enclosingStmt(#20109,#20099)
+enclosing_stmt(#20109,#20099)
 exprContainers(#20109,#20001)
 literals("ab","""ab""",#20109)
 #20110=*
@@ -308,7 +308,7 @@ regexpConstValue(#20110,"ab")
 #20112=*
 exprs(#20112,4,#20104,2,"""abc""")
 hasLocation(#20112,#20019)
-enclosingStmt(#20112,#20099)
+enclosing_stmt(#20112,#20099)
 exprContainers(#20112,#20001)
 literals("abc","""abc""",#20112)
 #20113=*
@@ -321,7 +321,7 @@ arraySize(#20104,3)
 #20115=*
 exprs(#20115,0,#20102,1,"map")
 hasLocation(#20115,#20025)
-enclosingStmt(#20115,#20099)
+enclosing_stmt(#20115,#20099)
 exprContainers(#20115,#20001)
 literals("map","map",#20115)
 #20116=*
@@ -329,7 +329,7 @@ exprs(#20116,65,#20100,0,"s => s.length")
 #20117=@"loc,{#10000},1,24,1,36"
 locations_default(#20117,#10000,1,24,1,36)
 hasLocation(#20116,#20117)
-enclosingStmt(#20116,#20099)
+enclosing_stmt(#20116,#20099)
 exprContainers(#20116,#20001)
 #20118=*
 scopes(#20118,1)
@@ -369,12 +369,12 @@ exprs(#20126,13,#20125,0,"setInte ... , 1000)")
 #20127=@"loc,{#10000},2,1,2,30"
 locations_default(#20127,#10000,2,1,2,30)
 hasLocation(#20126,#20127)
-enclosingStmt(#20126,#20125)
+enclosing_stmt(#20126,#20125)
 exprContainers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,-1,"setInterval")
 hasLocation(#20128,#20043)
-enclosingStmt(#20128,#20125)
+enclosing_stmt(#20128,#20125)
 exprContainers(#20128,#20001)
 literals("setInterval","setInterval",#20128)
 #20129=@"var;{setInterval};{#20000}"
@@ -385,7 +385,7 @@ exprs(#20130,65,#20126,0,"() => ++cnt")
 #20131=@"loc,{#10000},2,13,2,23"
 locations_default(#20131,#10000,2,13,2,23)
 hasLocation(#20130,#20131)
-enclosingStmt(#20130,#20125)
+enclosing_stmt(#20130,#20125)
 exprContainers(#20130,#20001)
 #20132=*
 scopes(#20132,1)
@@ -408,7 +408,7 @@ bind(#20135,#20136)
 #20137=*
 exprs(#20137,3,#20126,1,"1000")
 hasLocation(#20137,#20059)
-enclosingStmt(#20137,#20125)
+enclosing_stmt(#20137,#20125)
 exprContainers(#20137,#20001)
 literals("1000","1000",#20137)
 #20138=*
@@ -420,12 +420,12 @@ exprs(#20139,13,#20138,0,"setTime ...  60000)")
 #20140=@"loc,{#10000},3,1,3,47"
 locations_default(#20140,#10000,3,1,3,47)
 hasLocation(#20139,#20140)
-enclosingStmt(#20139,#20138)
+enclosing_stmt(#20139,#20138)
 exprContainers(#20139,#20001)
 #20141=*
 exprs(#20141,79,#20139,-1,"setTimeout")
 hasLocation(#20141,#20065)
-enclosingStmt(#20141,#20138)
+enclosing_stmt(#20141,#20138)
 exprContainers(#20141,#20001)
 literals("setTimeout","setTimeout",#20141)
 #20142=@"var;{setTimeout};{#20000}"
@@ -436,7 +436,7 @@ exprs(#20143,65,#20139,0,"() => { ... p!""); }")
 #20144=@"loc,{#10000},3,12,3,39"
 locations_default(#20144,#10000,3,12,3,39)
 hasLocation(#20143,#20144)
-enclosingStmt(#20143,#20138)
+enclosing_stmt(#20143,#20138)
 exprContainers(#20143,#20001)
 #20145=*
 scopes(#20145,1)
@@ -459,12 +459,12 @@ exprs(#20150,13,#20148,0,"alert(""Wake up!"")")
 #20151=@"loc,{#10000},3,20,3,36"
 locations_default(#20151,#10000,3,20,3,36)
 hasLocation(#20150,#20151)
-enclosingStmt(#20150,#20148)
+enclosing_stmt(#20150,#20148)
 exprContainers(#20150,#20143)
 #20152=*
 exprs(#20152,79,#20150,-1,"alert")
 hasLocation(#20152,#20077)
-enclosingStmt(#20152,#20148)
+enclosing_stmt(#20152,#20148)
 exprContainers(#20152,#20143)
 literals("alert","alert",#20152)
 #20153=@"var;{alert};{#20000}"
@@ -473,7 +473,7 @@ bind(#20152,#20153)
 #20154=*
 exprs(#20154,4,#20150,0,"""Wake up!""")
 hasLocation(#20154,#20081)
-enclosingStmt(#20154,#20148)
+enclosing_stmt(#20154,#20148)
 exprContainers(#20154,#20143)
 literals("Wake up!","""Wake up!""",#20154)
 #20155=*
@@ -485,7 +485,7 @@ regexpConstValue(#20155,"Wake up!")
 #20157=*
 exprs(#20157,3,#20139,1,"60000")
 hasLocation(#20157,#20091)
-enclosingStmt(#20157,#20138)
+enclosing_stmt(#20157,#20138)
 exprContainers(#20157,#20001)
 literals("60000","60000",#20157)
 #20158=*
diff --git a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
index 52b8ce2e17c..958663e6e6c 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
@@ -226,7 +226,7 @@ stmt_containers(#20080,#20001)
 #20081=*
 exprs(#20081,78,#20080,0,"A")
 hasLocation(#20081,#20021)
-enclosingStmt(#20081,#20080)
+enclosing_stmt(#20081,#20080)
 exprContainers(#20081,#20001)
 literals("A","A",#20081)
 decl(#20081,#20078)
@@ -243,7 +243,7 @@ hasLocation(#20083,#20084)
 #20085=*
 exprs(#20085,0,#20083,0,"x")
 hasLocation(#20085,#20027)
-enclosingStmt(#20085,#20080)
+enclosing_stmt(#20085,#20080)
 exprContainers(#20085,#20001)
 literals("x","x",#20085)
 #20086=*
@@ -251,7 +251,7 @@ exprs(#20086,9,#20083,1,"() {\n   ... _x;\n  }")
 #20087=@"loc,{#10000},2,8,4,3"
 locations_default(#20087,#10000,2,8,4,3)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20080)
+enclosing_stmt(#20086,#20080)
 exprContainers(#20086,#20001)
 #20088=*
 scopes(#20088,1)
@@ -277,17 +277,17 @@ exprs(#20094,14,#20092,0,"this._x")
 #20095=@"loc,{#10000},3,12,3,18"
 locations_default(#20095,#10000,3,12,3,18)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20092)
+enclosing_stmt(#20094,#20092)
 exprContainers(#20094,#20086)
 #20096=*
 exprs(#20096,6,#20094,0,"this")
 hasLocation(#20096,#20037)
-enclosingStmt(#20096,#20092)
+enclosing_stmt(#20096,#20092)
 exprContainers(#20096,#20086)
 #20097=*
 exprs(#20097,0,#20094,1,"_x")
 hasLocation(#20097,#20041)
-enclosingStmt(#20097,#20092)
+enclosing_stmt(#20097,#20092)
 exprContainers(#20097,#20086)
 literals("_x","_x",#20097)
 isMethod(#20083)
@@ -299,7 +299,7 @@ hasLocation(#20098,#20099)
 #20100=*
 exprs(#20100,0,#20098,0,"x")
 hasLocation(#20100,#20049)
-enclosingStmt(#20100,#20080)
+enclosing_stmt(#20100,#20080)
 exprContainers(#20100,#20001)
 literals("x","x",#20100)
 #20101=*
@@ -307,7 +307,7 @@ exprs(#20101,9,#20098,1,"(v) {\n  ... +v;\n  }")
 #20102=@"loc,{#10000},5,8,7,3"
 locations_default(#20102,#10000,5,8,7,3)
 hasLocation(#20101,#20102)
-enclosingStmt(#20101,#20080)
+enclosing_stmt(#20101,#20080)
 exprContainers(#20101,#20001)
 #20103=*
 scopes(#20103,1)
@@ -341,24 +341,24 @@ exprs(#20111,47,#20109,0,"this._x = +v")
 #20112=@"loc,{#10000},6,5,6,16"
 locations_default(#20112,#10000,6,5,6,16)
 hasLocation(#20111,#20112)
-enclosingStmt(#20111,#20109)
+enclosing_stmt(#20111,#20109)
 exprContainers(#20111,#20101)
 #20113=*
 exprs(#20113,14,#20111,0,"this._x")
 #20114=@"loc,{#10000},6,5,6,11"
 locations_default(#20114,#10000,6,5,6,11)
 hasLocation(#20113,#20114)
-enclosingStmt(#20113,#20109)
+enclosing_stmt(#20113,#20109)
 exprContainers(#20113,#20101)
 #20115=*
 exprs(#20115,6,#20113,0,"this")
 hasLocation(#20115,#20059)
-enclosingStmt(#20115,#20109)
+enclosing_stmt(#20115,#20109)
 exprContainers(#20115,#20101)
 #20116=*
 exprs(#20116,0,#20113,1,"_x")
 hasLocation(#20116,#20063)
-enclosingStmt(#20116,#20109)
+enclosing_stmt(#20116,#20109)
 exprContainers(#20116,#20101)
 literals("_x","_x",#20116)
 #20117=*
@@ -366,12 +366,12 @@ exprs(#20117,17,#20111,1,"+v")
 #20118=@"loc,{#10000},6,15,6,16"
 locations_default(#20118,#10000,6,15,6,16)
 hasLocation(#20117,#20118)
-enclosingStmt(#20117,#20109)
+enclosing_stmt(#20117,#20109)
 exprContainers(#20117,#20101)
 #20119=*
 exprs(#20119,79,#20117,0,"v")
 hasLocation(#20119,#20069)
-enclosingStmt(#20119,#20109)
+enclosing_stmt(#20119,#20109)
 exprContainers(#20119,#20101)
 literals("v","v",#20119)
 bind(#20119,#20104)
@@ -384,13 +384,13 @@ hasLocation(#20120,#20121)
 #20122=*
 exprs(#20122,0,#20120,0,"constructor")
 hasLocation(#20122,#20121)
-enclosingStmt(#20122,#20080)
+enclosing_stmt(#20122,#20080)
 exprContainers(#20122,#20001)
 literals("constructor","constructor",#20122)
 #20123=*
 exprs(#20123,9,#20120,1,"() {}")
 hasLocation(#20123,#20121)
-enclosingStmt(#20123,#20080)
+enclosing_stmt(#20123,#20080)
 exprContainers(#20123,#20001)
 #20124=*
 scopes(#20124,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
index 6bd2d1888bf..8c4fd87fd33 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
@@ -140,7 +140,7 @@ stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
-enclosingStmt(#20049,#20048)
+enclosing_stmt(#20049,#20048)
 exprContainers(#20049,#20001)
 literals("A","A",#20049)
 decl(#20049,#20046)
@@ -157,7 +157,7 @@ hasLocation(#20051,#20052)
 #20053=*
 exprs(#20053,0,#20051,0,"constructor")
 hasLocation(#20053,#20019)
-enclosingStmt(#20053,#20048)
+enclosing_stmt(#20053,#20048)
 exprContainers(#20053,#20001)
 literals("constructor","constructor",#20053)
 #20054=*
@@ -165,7 +165,7 @@ exprs(#20054,9,#20051,1,"(x) {\n  ...  x;\n  }")
 #20055=@"loc,{#10000},2,14,4,3"
 locations_default(#20055,#10000,2,14,4,3)
 hasLocation(#20054,#20055)
-enclosingStmt(#20054,#20048)
+enclosing_stmt(#20054,#20048)
 exprContainers(#20054,#20001)
 #20056=*
 scopes(#20056,1)
@@ -199,30 +199,30 @@ exprs(#20064,47,#20062,0,"this.x = x")
 #20065=@"loc,{#10000},3,5,3,14"
 locations_default(#20065,#10000,3,5,3,14)
 hasLocation(#20064,#20065)
-enclosingStmt(#20064,#20062)
+enclosing_stmt(#20064,#20062)
 exprContainers(#20064,#20054)
 #20066=*
 exprs(#20066,14,#20064,0,"this.x")
 #20067=@"loc,{#10000},3,5,3,10"
 locations_default(#20067,#10000,3,5,3,10)
 hasLocation(#20066,#20067)
-enclosingStmt(#20066,#20062)
+enclosing_stmt(#20066,#20062)
 exprContainers(#20066,#20054)
 #20068=*
 exprs(#20068,6,#20066,0,"this")
 hasLocation(#20068,#20029)
-enclosingStmt(#20068,#20062)
+enclosing_stmt(#20068,#20062)
 exprContainers(#20068,#20054)
 #20069=*
 exprs(#20069,0,#20066,1,"x")
 hasLocation(#20069,#20033)
-enclosingStmt(#20069,#20062)
+enclosing_stmt(#20069,#20062)
 exprContainers(#20069,#20054)
 literals("x","x",#20069)
 #20070=*
 exprs(#20070,79,#20064,1,"x")
 hasLocation(#20070,#20037)
-enclosingStmt(#20070,#20062)
+enclosing_stmt(#20070,#20062)
 exprContainers(#20070,#20054)
 literals("x","x",#20070)
 bind(#20070,#20057)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
index 538b244f35d..ceccee2ced1 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
@@ -63,7 +63,7 @@ stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,78,#20020,0,"Point")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20020)
+enclosing_stmt(#20021,#20020)
 exprContainers(#20021,#20001)
 literals("Point","Point",#20021)
 decl(#20021,#20018)
@@ -75,7 +75,7 @@ scopenesting(#20022,#20000)
 #20023=*
 exprs(#20023,79,#20020,1,"Object")
 hasLocation(#20023,#20011)
-enclosingStmt(#20023,#20020)
+enclosing_stmt(#20023,#20020)
 exprContainers(#20023,#20001)
 literals("Object","Object",#20023)
 #20024=@"var;{Object};{#20000}"
@@ -89,13 +89,13 @@ hasLocation(#20025,#20026)
 #20027=*
 exprs(#20027,0,#20025,0,"constructor")
 hasLocation(#20027,#20026)
-enclosingStmt(#20027,#20020)
+enclosing_stmt(#20027,#20020)
 exprContainers(#20027,#20001)
 literals("constructor","constructor",#20027)
 #20028=*
 exprs(#20028,9,#20025,1,"(...arg ... rgs); }")
 hasLocation(#20028,#20026)
-enclosingStmt(#20028,#20020)
+enclosing_stmt(#20028,#20020)
 exprContainers(#20028,#20001)
 #20029=*
 scopes(#20029,1)
@@ -124,22 +124,22 @@ stmt_containers(#20034,#20028)
 #20035=*
 exprs(#20035,13,#20034,0,"super(...args)")
 hasLocation(#20035,#20026)
-enclosingStmt(#20035,#20034)
+enclosing_stmt(#20035,#20034)
 exprContainers(#20035,#20028)
 #20036=*
 exprs(#20036,81,#20035,-1,"super")
 hasLocation(#20036,#20026)
-enclosingStmt(#20036,#20034)
+enclosing_stmt(#20036,#20034)
 exprContainers(#20036,#20028)
 #20037=*
 exprs(#20037,66,#20035,0,"...args")
 hasLocation(#20037,#20026)
-enclosingStmt(#20037,#20034)
+enclosing_stmt(#20037,#20034)
 exprContainers(#20037,#20028)
 #20038=*
 exprs(#20038,79,#20037,0,"args")
 hasLocation(#20038,#20026)
-enclosingStmt(#20038,#20034)
+enclosing_stmt(#20038,#20034)
 exprContainers(#20038,#20028)
 literals("args","args",#20038)
 bind(#20038,#20030)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
index d914b5c113d..809f9402093 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
@@ -113,7 +113,7 @@ stmt_containers(#20040,#20001)
 #20041=*
 exprs(#20041,78,#20040,0,"Point")
 hasLocation(#20041,#20007)
-enclosingStmt(#20041,#20040)
+enclosing_stmt(#20041,#20040)
 exprContainers(#20041,#20001)
 literals("Point","Point",#20041)
 decl(#20041,#20038)
@@ -127,33 +127,33 @@ exprs(#20043,63,#20040,1,"(Math.r ...  Array)")
 #20044=@"loc,{#10000},1,21,1,52"
 locations_default(#20044,#10000,1,21,1,52)
 hasLocation(#20043,#20044)
-enclosingStmt(#20043,#20040)
+enclosing_stmt(#20043,#20040)
 exprContainers(#20043,#20001)
 #20045=*
 exprs(#20045,11,#20043,0,"Math.ra ... : Array")
 #20046=@"loc,{#10000},1,22,1,51"
 locations_default(#20046,#10000,1,22,1,51)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20040)
+enclosing_stmt(#20045,#20040)
 exprContainers(#20045,#20001)
 #20047=*
 exprs(#20047,13,#20045,0,"Math.random()")
 #20048=@"loc,{#10000},1,22,1,34"
 locations_default(#20048,#10000,1,22,1,34)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20040)
+enclosing_stmt(#20047,#20040)
 exprContainers(#20047,#20001)
 #20049=*
 exprs(#20049,14,#20047,-1,"Math.random")
 #20050=@"loc,{#10000},1,22,1,32"
 locations_default(#20050,#10000,1,22,1,32)
 hasLocation(#20049,#20050)
-enclosingStmt(#20049,#20040)
+enclosing_stmt(#20049,#20040)
 exprContainers(#20049,#20001)
 #20051=*
 exprs(#20051,79,#20049,0,"Math")
 hasLocation(#20051,#20013)
-enclosingStmt(#20051,#20040)
+enclosing_stmt(#20051,#20040)
 exprContainers(#20051,#20001)
 literals("Math","Math",#20051)
 #20052=@"var;{Math};{#20000}"
@@ -162,13 +162,13 @@ bind(#20051,#20052)
 #20053=*
 exprs(#20053,0,#20049,1,"random")
 hasLocation(#20053,#20017)
-enclosingStmt(#20053,#20040)
+enclosing_stmt(#20053,#20040)
 exprContainers(#20053,#20001)
 literals("random","random",#20053)
 #20054=*
 exprs(#20054,79,#20045,1,"Object")
 hasLocation(#20054,#20025)
-enclosingStmt(#20054,#20040)
+enclosing_stmt(#20054,#20040)
 exprContainers(#20054,#20001)
 literals("Object","Object",#20054)
 #20055=@"var;{Object};{#20000}"
@@ -177,7 +177,7 @@ bind(#20054,#20055)
 #20056=*
 exprs(#20056,79,#20045,2,"Array")
 hasLocation(#20056,#20029)
-enclosingStmt(#20056,#20040)
+enclosing_stmt(#20056,#20040)
 exprContainers(#20056,#20001)
 literals("Array","Array",#20056)
 #20057=@"var;{Array};{#20000}"
@@ -191,13 +191,13 @@ hasLocation(#20058,#20059)
 #20060=*
 exprs(#20060,0,#20058,0,"constructor")
 hasLocation(#20060,#20059)
-enclosingStmt(#20060,#20040)
+enclosing_stmt(#20060,#20040)
 exprContainers(#20060,#20001)
 literals("constructor","constructor",#20060)
 #20061=*
 exprs(#20061,9,#20058,1,"(...arg ... rgs); }")
 hasLocation(#20061,#20059)
-enclosingStmt(#20061,#20040)
+enclosing_stmt(#20061,#20040)
 exprContainers(#20061,#20001)
 #20062=*
 scopes(#20062,1)
@@ -226,22 +226,22 @@ stmt_containers(#20067,#20061)
 #20068=*
 exprs(#20068,13,#20067,0,"super(...args)")
 hasLocation(#20068,#20059)
-enclosingStmt(#20068,#20067)
+enclosing_stmt(#20068,#20067)
 exprContainers(#20068,#20061)
 #20069=*
 exprs(#20069,81,#20068,-1,"super")
 hasLocation(#20069,#20059)
-enclosingStmt(#20069,#20067)
+enclosing_stmt(#20069,#20067)
 exprContainers(#20069,#20061)
 #20070=*
 exprs(#20070,66,#20068,0,"...args")
 hasLocation(#20070,#20059)
-enclosingStmt(#20070,#20067)
+enclosing_stmt(#20070,#20067)
 exprContainers(#20070,#20061)
 #20071=*
 exprs(#20071,79,#20070,0,"args")
 hasLocation(#20071,#20059)
-enclosingStmt(#20071,#20067)
+enclosing_stmt(#20071,#20067)
 exprContainers(#20071,#20061)
 literals("args","args",#20071)
 bind(#20071,#20063)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
index deb6ee2e649..f87dfe7108b 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
@@ -130,7 +130,7 @@ stmt_containers(#20044,#20001)
 #20045=*
 exprs(#20045,78,#20044,0,"A")
 hasLocation(#20045,#20015)
-enclosingStmt(#20045,#20044)
+enclosing_stmt(#20045,#20044)
 exprContainers(#20045,#20001)
 literals("A","A",#20045)
 decl(#20045,#20042)
@@ -147,7 +147,7 @@ hasLocation(#20047,#20048)
 #20049=*
 exprs(#20049,0,#20047,0,"getX")
 hasLocation(#20049,#20019)
-enclosingStmt(#20049,#20044)
+enclosing_stmt(#20049,#20044)
 exprContainers(#20049,#20001)
 literals("getX","getX",#20049)
 #20050=*
@@ -155,7 +155,7 @@ exprs(#20050,9,#20047,1,"() {\n   ... .x;\n  }")
 #20051=@"loc,{#10000},2,7,4,3"
 locations_default(#20051,#10000,2,7,4,3)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20044)
+enclosing_stmt(#20050,#20044)
 exprContainers(#20050,#20001)
 #20052=*
 scopes(#20052,1)
@@ -181,17 +181,17 @@ exprs(#20058,14,#20056,0,"this.x")
 #20059=@"loc,{#10000},3,12,3,17"
 locations_default(#20059,#10000,3,12,3,17)
 hasLocation(#20058,#20059)
-enclosingStmt(#20058,#20056)
+enclosing_stmt(#20058,#20056)
 exprContainers(#20058,#20050)
 #20060=*
 exprs(#20060,6,#20058,0,"this")
 hasLocation(#20060,#20029)
-enclosingStmt(#20060,#20056)
+enclosing_stmt(#20060,#20056)
 exprContainers(#20060,#20050)
 #20061=*
 exprs(#20061,0,#20058,1,"x")
 hasLocation(#20061,#20033)
-enclosingStmt(#20061,#20056)
+enclosing_stmt(#20061,#20056)
 exprContainers(#20061,#20050)
 literals("x","x",#20061)
 isMethod(#20047)
@@ -203,13 +203,13 @@ hasLocation(#20062,#20063)
 #20064=*
 exprs(#20064,0,#20062,0,"constructor")
 hasLocation(#20064,#20063)
-enclosingStmt(#20064,#20044)
+enclosing_stmt(#20064,#20044)
 exprContainers(#20064,#20001)
 literals("constructor","constructor",#20064)
 #20065=*
 exprs(#20065,9,#20062,1,"() {}")
 hasLocation(#20065,#20063)
-enclosingStmt(#20065,#20044)
+enclosing_stmt(#20065,#20044)
 exprContainers(#20065,#20001)
 #20066=*
 scopes(#20066,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
index 135444f6d2e..1bfdb33f8e0 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
@@ -125,7 +125,7 @@ stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,78,#20042,0,"A")
 hasLocation(#20043,#20015)
-enclosingStmt(#20043,#20042)
+enclosing_stmt(#20043,#20042)
 exprContainers(#20043,#20001)
 literals("A","A",#20043)
 decl(#20043,#20040)
@@ -142,7 +142,7 @@ hasLocation(#20045,#20046)
 #20047=*
 exprs(#20047,0,#20045,0,"className")
 hasLocation(#20047,#20021)
-enclosingStmt(#20047,#20042)
+enclosing_stmt(#20047,#20042)
 exprContainers(#20047,#20001)
 literals("className","className",#20047)
 #20048=*
@@ -150,7 +150,7 @@ exprs(#20048,9,#20045,1,"() {\n   ... A"";\n  }")
 #20049=@"loc,{#10000},2,19,4,3"
 locations_default(#20049,#10000,2,19,4,3)
 hasLocation(#20048,#20049)
-enclosingStmt(#20048,#20042)
+enclosing_stmt(#20048,#20042)
 exprContainers(#20048,#20001)
 #20050=*
 scopes(#20050,1)
@@ -174,7 +174,7 @@ stmt_containers(#20054,#20048)
 #20056=*
 exprs(#20056,4,#20054,0,"""A""")
 hasLocation(#20056,#20031)
-enclosingStmt(#20056,#20054)
+enclosing_stmt(#20056,#20054)
 exprContainers(#20056,#20048)
 literals("A","""A""",#20056)
 #20057=*
@@ -193,13 +193,13 @@ hasLocation(#20059,#20060)
 #20061=*
 exprs(#20061,0,#20059,0,"constructor")
 hasLocation(#20061,#20060)
-enclosingStmt(#20061,#20042)
+enclosing_stmt(#20061,#20042)
 exprContainers(#20061,#20001)
 literals("constructor","constructor",#20061)
 #20062=*
 exprs(#20062,9,#20059,1,"() {}")
 hasLocation(#20062,#20060)
-enclosingStmt(#20062,#20042)
+enclosing_stmt(#20062,#20042)
 exprContainers(#20062,#20001)
 #20063=*
 scopes(#20063,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
index 5785a0b7fee..be35974e361 100644
--- a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
@@ -53,7 +53,7 @@ stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,78,#20016,0,"Point")
 hasLocation(#20017,#20007)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 literals("Point","Point",#20017)
 decl(#20017,#20014)
@@ -70,13 +70,13 @@ hasLocation(#20019,#20020)
 #20021=*
 exprs(#20021,0,#20019,0,"constructor")
 hasLocation(#20021,#20020)
-enclosingStmt(#20021,#20016)
+enclosing_stmt(#20021,#20016)
 exprContainers(#20021,#20001)
 literals("constructor","constructor",#20021)
 #20022=*
 exprs(#20022,9,#20019,1,"() {}")
 hasLocation(#20022,#20020)
-enclosingStmt(#20022,#20016)
+enclosing_stmt(#20022,#20016)
 exprContainers(#20022,#20001)
 #20023=*
 scopes(#20023,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
index 5ce01a05e14..d0af2b44e2e 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
@@ -59,14 +59,14 @@ stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,63,#20018,0,"(class Point {})")
 hasLocation(#20019,#20003)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20020=*
 exprs(#20020,80,#20019,0,"class Point {}")
 #20021=@"loc,{#10000},1,2,1,15"
 locations_default(#20021,#10000,1,2,1,15)
 hasLocation(#20020,#20021)
-enclosingStmt(#20020,#20018)
+enclosing_stmt(#20020,#20018)
 exprContainers(#20020,#20001)
 #20022=*
 scopes(#20022,8)
@@ -79,7 +79,7 @@ local_type_names(#20024,"Point",#20022)
 #20025=*
 exprs(#20025,78,#20020,0,"Point")
 hasLocation(#20025,#20009)
-enclosingStmt(#20025,#20018)
+enclosing_stmt(#20025,#20018)
 exprContainers(#20025,#20001)
 literals("Point","Point",#20025)
 decl(#20025,#20023)
@@ -92,13 +92,13 @@ hasLocation(#20026,#20027)
 #20028=*
 exprs(#20028,0,#20026,0,"constructor")
 hasLocation(#20028,#20027)
-enclosingStmt(#20028,#20018)
+enclosing_stmt(#20028,#20018)
 exprContainers(#20028,#20001)
 literals("constructor","constructor",#20028)
 #20029=*
 exprs(#20029,9,#20026,1,"() {}")
 hasLocation(#20029,#20027)
-enclosingStmt(#20029,#20018)
+enclosing_stmt(#20029,#20018)
 exprContainers(#20029,#20001)
 #20030=*
 scopes(#20030,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
index f2cfff7fdce..4f5a0da2762 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
@@ -54,14 +54,14 @@ stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,63,#20016,0,"(class       {})")
 hasLocation(#20017,#20003)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 #20018=*
 exprs(#20018,80,#20017,0,"class       {}")
 #20019=@"loc,{#10000},1,2,1,15"
 locations_default(#20019,#10000,1,2,1,15)
 hasLocation(#20018,#20019)
-enclosingStmt(#20018,#20016)
+enclosing_stmt(#20018,#20016)
 exprContainers(#20018,#20001)
 #20020=*
 properties(#20020,#20018,2,0,"constructor() {}")
@@ -71,13 +71,13 @@ hasLocation(#20020,#20021)
 #20022=*
 exprs(#20022,0,#20020,0,"constructor")
 hasLocation(#20022,#20021)
-enclosingStmt(#20022,#20016)
+enclosing_stmt(#20022,#20016)
 exprContainers(#20022,#20001)
 literals("constructor","constructor",#20022)
 #20023=*
 exprs(#20023,9,#20020,1,"() {}")
 hasLocation(#20023,#20021)
-enclosingStmt(#20023,#20016)
+enclosing_stmt(#20023,#20016)
 exprContainers(#20023,#20001)
 #20024=*
 scopes(#20024,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
index a3f65d9acc4..a96e96071bb 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
@@ -81,26 +81,26 @@ exprs(#20027,47,#20026,0,"[o.x] = [42]")
 #20028=@"loc,{#10000},1,1,1,12"
 locations_default(#20028,#10000,1,1,1,12)
 hasLocation(#20027,#20028)
-enclosingStmt(#20027,#20026)
+enclosing_stmt(#20027,#20026)
 exprContainers(#20027,#20001)
 #20029=*
 exprs(#20029,67,#20027,0,"[o.x]")
 #20030=@"loc,{#10000},1,1,1,5"
 locations_default(#20030,#10000,1,1,1,5)
 hasLocation(#20029,#20030)
-enclosingStmt(#20029,#20026)
+enclosing_stmt(#20029,#20026)
 exprContainers(#20029,#20001)
 #20031=*
 exprs(#20031,14,#20029,0,"o.x")
 #20032=@"loc,{#10000},1,2,1,4"
 locations_default(#20032,#10000,1,2,1,4)
 hasLocation(#20031,#20032)
-enclosingStmt(#20031,#20026)
+enclosing_stmt(#20031,#20026)
 exprContainers(#20031,#20001)
 #20033=*
 exprs(#20033,79,#20031,0,"o")
 hasLocation(#20033,#20007)
-enclosingStmt(#20033,#20026)
+enclosing_stmt(#20033,#20026)
 exprContainers(#20033,#20001)
 literals("o","o",#20033)
 #20034=@"var;{o};{#20000}"
@@ -109,7 +109,7 @@ bind(#20033,#20034)
 #20035=*
 exprs(#20035,0,#20031,1,"x")
 hasLocation(#20035,#20011)
-enclosingStmt(#20035,#20026)
+enclosing_stmt(#20035,#20026)
 exprContainers(#20035,#20001)
 literals("x","x",#20035)
 arraySize(#20029,1)
@@ -118,12 +118,12 @@ exprs(#20036,7,#20027,1,"[42]")
 #20037=@"loc,{#10000},1,9,1,12"
 locations_default(#20037,#10000,1,9,1,12)
 hasLocation(#20036,#20037)
-enclosingStmt(#20036,#20026)
+enclosing_stmt(#20036,#20026)
 exprContainers(#20036,#20001)
 #20038=*
 exprs(#20038,3,#20036,0,"42")
 hasLocation(#20038,#20019)
-enclosingStmt(#20038,#20026)
+enclosing_stmt(#20038,#20026)
 exprContainers(#20038,#20001)
 literals("42","42",#20038)
 arraySize(#20036,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
index d8c5ecc47ec..54bd8bd0fc0 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
@@ -91,21 +91,21 @@ exprs(#20031,63,#20030,0,"({ x: o.x } = q)")
 #20032=@"loc,{#10000},1,1,1,16"
 locations_default(#20032,#10000,1,1,1,16)
 hasLocation(#20031,#20032)
-enclosingStmt(#20031,#20030)
+enclosing_stmt(#20031,#20030)
 exprContainers(#20031,#20001)
 #20033=*
 exprs(#20033,47,#20031,0,"{ x: o.x } = q")
 #20034=@"loc,{#10000},1,2,1,15"
 locations_default(#20034,#10000,1,2,1,15)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20030)
+enclosing_stmt(#20033,#20030)
 exprContainers(#20033,#20001)
 #20035=*
 exprs(#20035,68,#20033,0,"{ x: o.x }")
 #20036=@"loc,{#10000},1,2,1,11"
 locations_default(#20036,#10000,1,2,1,11)
 hasLocation(#20035,#20036)
-enclosingStmt(#20035,#20030)
+enclosing_stmt(#20035,#20030)
 exprContainers(#20035,#20001)
 #20037=*
 properties(#20037,#20035,0,0,"x: o.x")
@@ -115,7 +115,7 @@ hasLocation(#20037,#20038)
 #20039=*
 exprs(#20039,0,#20037,0,"x")
 hasLocation(#20039,#20009)
-enclosingStmt(#20039,#20030)
+enclosing_stmt(#20039,#20030)
 exprContainers(#20039,#20001)
 literals("x","x",#20039)
 #20040=*
@@ -123,12 +123,12 @@ exprs(#20040,14,#20037,1,"o.x")
 #20041=@"loc,{#10000},1,7,1,9"
 locations_default(#20041,#10000,1,7,1,9)
 hasLocation(#20040,#20041)
-enclosingStmt(#20040,#20030)
+enclosing_stmt(#20040,#20030)
 exprContainers(#20040,#20001)
 #20042=*
 exprs(#20042,79,#20040,0,"o")
 hasLocation(#20042,#20013)
-enclosingStmt(#20042,#20030)
+enclosing_stmt(#20042,#20030)
 exprContainers(#20042,#20001)
 literals("o","o",#20042)
 #20043=@"var;{o};{#20000}"
@@ -137,13 +137,13 @@ bind(#20042,#20043)
 #20044=*
 exprs(#20044,0,#20040,1,"x")
 hasLocation(#20044,#20017)
-enclosingStmt(#20044,#20030)
+enclosing_stmt(#20044,#20030)
 exprContainers(#20044,#20001)
 literals("x","x",#20044)
 #20045=*
 exprs(#20045,79,#20033,1,"q")
 hasLocation(#20045,#20023)
-enclosingStmt(#20045,#20030)
+enclosing_stmt(#20045,#20030)
 exprContainers(#20045,#20001)
 literals("q","q",#20045)
 #20046=@"var;{q};{#20000}"
diff --git a/javascript/extractor/tests/es2015/output/trap/const.js.trap b/javascript/extractor/tests/es2015/output/trap/const.js.trap
index 69de4cf05f7..b13b5fb697b 100644
--- a/javascript/extractor/tests/es2015/output/trap/const.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/const.js.trap
@@ -61,19 +61,19 @@ exprs(#20019,64,#20018,0,"x = 23")
 #20020=@"loc,{#10000},1,7,1,12"
 locations_default(#20020,#10000,1,7,1,12)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,78,#20019,0,"x")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 literals("x","x",#20021)
 decl(#20021,#20017)
 #20022=*
 exprs(#20022,3,#20019,1,"23")
 hasLocation(#20022,#20011)
-enclosingStmt(#20022,#20018)
+enclosing_stmt(#20022,#20018)
 exprContainers(#20022,#20001)
 literals("23","23",#20022)
 #20023=*
diff --git a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
index d6760addc96..a1f5e5d539f 100644
--- a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
@@ -137,19 +137,19 @@ exprs(#20045,69,#20043,0,"yield* g()")
 #20046=@"loc,{#10000},2,5,2,14"
 locations_default(#20046,#10000,2,5,2,14)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20043)
+enclosing_stmt(#20045,#20043)
 exprContainers(#20045,#20037)
 #20047=*
 exprs(#20047,13,#20045,0,"g()")
 #20048=@"loc,{#10000},2,12,2,14"
 locations_default(#20048,#10000,2,12,2,14)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20043)
+enclosing_stmt(#20047,#20043)
 exprContainers(#20047,#20037)
 #20049=*
 exprs(#20049,79,#20047,-1,"g")
 hasLocation(#20049,#20025)
-enclosingStmt(#20049,#20043)
+enclosing_stmt(#20049,#20043)
 exprContainers(#20049,#20037)
 literals("g","g",#20049)
 #20050=@"var;{g};{#20000}"
diff --git a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
index 756ae3226e2..64feaf2c4f7 100644
--- a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
@@ -532,19 +532,19 @@ exprs(#20194,64,#20192,0,"[a, [, c]] = x")
 #20195=@"loc,{#10000},2,6,2,19"
 locations_default(#20195,#10000,2,6,2,19)
 hasLocation(#20194,#20195)
-enclosingStmt(#20194,#20192)
+enclosing_stmt(#20194,#20192)
 exprContainers(#20194,#20177)
 #20196=*
 exprs(#20196,67,#20194,0,"[a, [, c]]")
 #20197=@"loc,{#10000},2,6,2,15"
 locations_default(#20197,#10000,2,6,2,15)
 hasLocation(#20196,#20197)
-enclosingStmt(#20196,#20192)
+enclosing_stmt(#20196,#20192)
 exprContainers(#20196,#20177)
 #20198=*
 exprs(#20198,78,#20196,0,"a")
 hasLocation(#20198,#20053)
-enclosingStmt(#20198,#20192)
+enclosing_stmt(#20198,#20192)
 exprContainers(#20198,#20177)
 literals("a","a",#20198)
 decl(#20198,#20181)
@@ -553,12 +553,12 @@ exprs(#20199,67,#20196,1,"[, c]")
 #20200=@"loc,{#10000},2,10,2,14"
 locations_default(#20200,#10000,2,10,2,14)
 hasLocation(#20199,#20200)
-enclosingStmt(#20199,#20192)
+enclosing_stmt(#20199,#20192)
 exprContainers(#20199,#20177)
 #20201=*
 exprs(#20201,78,#20199,1,"c")
 hasLocation(#20201,#20061)
-enclosingStmt(#20201,#20192)
+enclosing_stmt(#20201,#20192)
 exprContainers(#20201,#20177)
 literals("c","c",#20201)
 decl(#20201,#20182)
@@ -567,7 +567,7 @@ arraySize(#20196,2)
 #20202=*
 exprs(#20202,79,#20194,1,"x")
 hasLocation(#20202,#20069)
-enclosingStmt(#20202,#20192)
+enclosing_stmt(#20202,#20192)
 exprContainers(#20202,#20177)
 literals("x","x",#20202)
 bind(#20202,#20183)
@@ -594,19 +594,19 @@ exprs(#20209,7,#20207,0,"[a, c]")
 #20210=@"loc,{#10000},4,9,4,14"
 locations_default(#20210,#10000,4,9,4,14)
 hasLocation(#20209,#20210)
-enclosingStmt(#20209,#20207)
+enclosing_stmt(#20209,#20207)
 exprContainers(#20209,#20177)
 #20211=*
 exprs(#20211,79,#20209,0,"a")
 hasLocation(#20211,#20081)
-enclosingStmt(#20211,#20207)
+enclosing_stmt(#20211,#20207)
 exprContainers(#20211,#20177)
 literals("a","a",#20211)
 bind(#20211,#20181)
 #20212=*
 exprs(#20212,79,#20209,1,"c")
 hasLocation(#20212,#20085)
-enclosingStmt(#20212,#20207)
+enclosing_stmt(#20212,#20207)
 exprContainers(#20212,#20177)
 literals("c","c",#20212)
 bind(#20212,#20182)
@@ -626,7 +626,7 @@ variables(#20216,"d",#20215)
 #20217=*
 exprs(#20217,78,#20213,0,"d")
 hasLocation(#20217,#20097)
-enclosingStmt(#20217,#20213)
+enclosing_stmt(#20217,#20213)
 exprContainers(#20217,#20177)
 literals("d","d",#20217)
 decl(#20217,#20216)
@@ -647,19 +647,19 @@ exprs(#20222,13,#20220,0,"console.log(d)")
 #20223=@"loc,{#10000},6,3,6,16"
 locations_default(#20223,#10000,6,3,6,16)
 hasLocation(#20222,#20223)
-enclosingStmt(#20222,#20220)
+enclosing_stmt(#20222,#20220)
 exprContainers(#20222,#20177)
 #20224=*
 exprs(#20224,14,#20222,-1,"console.log")
 #20225=@"loc,{#10000},6,3,6,13"
 locations_default(#20225,#10000,6,3,6,13)
 hasLocation(#20224,#20225)
-enclosingStmt(#20224,#20220)
+enclosing_stmt(#20224,#20220)
 exprContainers(#20224,#20177)
 #20226=*
 exprs(#20226,79,#20224,0,"console")
 hasLocation(#20226,#20103)
-enclosingStmt(#20226,#20220)
+enclosing_stmt(#20226,#20220)
 exprContainers(#20226,#20177)
 literals("console","console",#20226)
 #20227=@"var;{console};{#20000}"
@@ -668,13 +668,13 @@ bind(#20226,#20227)
 #20228=*
 exprs(#20228,0,#20224,1,"log")
 hasLocation(#20228,#20107)
-enclosingStmt(#20228,#20220)
+enclosing_stmt(#20228,#20220)
 exprContainers(#20228,#20177)
 literals("log","log",#20228)
 #20229=*
 exprs(#20229,79,#20222,0,"d")
 hasLocation(#20229,#20111)
-enclosingStmt(#20229,#20220)
+enclosing_stmt(#20229,#20220)
 exprContainers(#20229,#20177)
 literals("d","d",#20229)
 bind(#20229,#20216)
@@ -756,14 +756,14 @@ exprs(#20251,64,#20249,0,"{ [x]: w } = z")
 #20252=@"loc,{#10000},11,6,11,19"
 locations_default(#20252,#10000,11,6,11,19)
 hasLocation(#20251,#20252)
-enclosingStmt(#20251,#20249)
+enclosing_stmt(#20251,#20249)
 exprContainers(#20251,#20230)
 #20253=*
 exprs(#20253,68,#20251,0,"{ [x]: w }")
 #20254=@"loc,{#10000},11,6,11,15"
 locations_default(#20254,#10000,11,6,11,15)
 hasLocation(#20253,#20254)
-enclosingStmt(#20253,#20249)
+enclosing_stmt(#20253,#20249)
 exprContainers(#20253,#20230)
 #20255=*
 properties(#20255,#20253,0,0,"[x]: w")
@@ -773,14 +773,14 @@ hasLocation(#20255,#20256)
 #20257=*
 exprs(#20257,79,#20255,0,"x")
 hasLocation(#20257,#20150)
-enclosingStmt(#20257,#20249)
+enclosing_stmt(#20257,#20249)
 exprContainers(#20257,#20230)
 literals("x","x",#20257)
 bind(#20257,#20235)
 #20258=*
 exprs(#20258,78,#20255,1,"w")
 hasLocation(#20258,#20156)
-enclosingStmt(#20258,#20249)
+enclosing_stmt(#20258,#20249)
 exprContainers(#20258,#20230)
 literals("w","w",#20258)
 decl(#20258,#20234)
@@ -788,7 +788,7 @@ isComputed(#20255)
 #20259=*
 exprs(#20259,79,#20251,1,"z")
 hasLocation(#20259,#20162)
-enclosingStmt(#20259,#20249)
+enclosing_stmt(#20259,#20249)
 exprContainers(#20259,#20230)
 literals("z","z",#20259)
 bind(#20259,#20236)
@@ -801,7 +801,7 @@ stmt_containers(#20260,#20230)
 #20262=*
 exprs(#20262,79,#20260,0,"w")
 hasLocation(#20262,#20168)
-enclosingStmt(#20262,#20260)
+enclosing_stmt(#20262,#20260)
 exprContainers(#20262,#20230)
 literals("w","w",#20262)
 bind(#20262,#20234)
diff --git a/javascript/extractor/tests/es2015/output/trap/export1.js.trap b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
index ec6a38a8f77..e9a863eca1a 100644
--- a/javascript/extractor/tests/es2015/output/trap/export1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
@@ -75,19 +75,19 @@ exprs(#20023,64,#20021,0,"x = 23")
 #20024=@"loc,{#10000},1,12,1,17"
 locations_default(#20024,#10000,1,12,1,17)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20021)
+enclosing_stmt(#20023,#20021)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,78,#20023,0,"x")
 hasLocation(#20025,#20009)
-enclosingStmt(#20025,#20021)
+enclosing_stmt(#20025,#20021)
 exprContainers(#20025,#20001)
 literals("x","x",#20025)
 decl(#20025,#20019)
 #20026=*
 exprs(#20026,3,#20023,1,"23")
 hasLocation(#20026,#20013)
-enclosingStmt(#20026,#20021)
+enclosing_stmt(#20026,#20021)
 exprContainers(#20026,#20001)
 literals("23","23",#20026)
 #20027=*
diff --git a/javascript/extractor/tests/es2015/output/trap/export10.js.trap b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
index 3148caa2995..4bc0fe03814 100644
--- a/javascript/extractor/tests/es2015/output/trap/export10.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
@@ -128,7 +128,7 @@ stmt_containers(#20040,#20001)
 #20042=*
 exprs(#20042,7,#20040,0,"[,]")
 hasLocation(#20042,#20041)
-enclosingStmt(#20042,#20040)
+enclosing_stmt(#20042,#20040)
 exprContainers(#20042,#20001)
 arraySize(#20042,1)
 #20043=*
diff --git a/javascript/extractor/tests/es2015/output/trap/export11.js.trap b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
index e02b39a9242..c43a76ad134 100644
--- a/javascript/extractor/tests/es2015/output/trap/export11.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
@@ -65,7 +65,7 @@ exprs(#20019,80,#20018,0,"class {}")
 #20020=@"loc,{#10000},1,16,1,23"
 locations_default(#20020,#10000,1,16,1,23)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 properties(#20021,#20019,2,0,"constructor() {}")
@@ -75,13 +75,13 @@ hasLocation(#20021,#20022)
 #20023=*
 exprs(#20023,0,#20021,0,"constructor")
 hasLocation(#20023,#20022)
-enclosingStmt(#20023,#20018)
+enclosing_stmt(#20023,#20018)
 exprContainers(#20023,#20001)
 literals("constructor","constructor",#20023)
 #20024=*
 exprs(#20024,9,#20021,1,"() {}")
 hasLocation(#20024,#20022)
-enclosingStmt(#20024,#20018)
+enclosing_stmt(#20024,#20018)
 exprContainers(#20024,#20001)
 #20025=*
 scopes(#20025,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/export4.js.trap b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
index 89588f1e4cf..9ff95b12a88 100644
--- a/javascript/extractor/tests/es2015/output/trap/export4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
@@ -79,7 +79,7 @@ exprs(#20025,9,#20023,0,"function () {}")
 #20026=@"loc,{#10000},1,16,1,29"
 locations_default(#20026,#10000,1,16,1,29)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20023)
+enclosing_stmt(#20025,#20023)
 exprContainers(#20025,#20001)
 #20027=*
 scopes(#20027,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/export5.js.trap b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
index 7dd0be308e8..01269079a80 100644
--- a/javascript/extractor/tests/es2015/output/trap/export5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
@@ -139,19 +139,19 @@ exprs(#20049,64,#20048,0,"x = 23")
 #20050=@"loc,{#10000},1,5,1,10"
 locations_default(#20050,#10000,1,5,1,10)
 hasLocation(#20049,#20050)
-enclosingStmt(#20049,#20048)
+enclosing_stmt(#20049,#20048)
 exprContainers(#20049,#20001)
 #20051=*
 exprs(#20051,78,#20049,0,"x")
 hasLocation(#20051,#20009)
-enclosingStmt(#20051,#20048)
+enclosing_stmt(#20051,#20048)
 exprContainers(#20051,#20001)
 literals("x","x",#20051)
 decl(#20051,#20046)
 #20052=*
 exprs(#20052,3,#20049,1,"23")
 hasLocation(#20052,#20013)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20001)
 literals("23","23",#20052)
 #20053=*
@@ -159,19 +159,19 @@ exprs(#20053,64,#20048,1,"y = 42")
 #20054=@"loc,{#10000},1,13,1,18"
 locations_default(#20054,#10000,1,13,1,18)
 hasLocation(#20053,#20054)
-enclosingStmt(#20053,#20048)
+enclosing_stmt(#20053,#20048)
 exprContainers(#20053,#20001)
 #20055=*
 exprs(#20055,78,#20053,0,"y")
 hasLocation(#20055,#20017)
-enclosingStmt(#20055,#20048)
+enclosing_stmt(#20055,#20048)
 exprContainers(#20055,#20001)
 literals("y","y",#20055)
 decl(#20055,#20047)
 #20056=*
 exprs(#20056,3,#20053,1,"42")
 hasLocation(#20056,#20021)
-enclosingStmt(#20056,#20048)
+enclosing_stmt(#20056,#20048)
 exprContainers(#20056,#20001)
 literals("42","42",#20056)
 #20057=*
@@ -181,19 +181,19 @@ stmt_containers(#20057,#20001)
 #20058=*
 exprs(#20058,86,#20057,0,"x")
 hasLocation(#20058,#20029)
-enclosingStmt(#20058,#20057)
+enclosing_stmt(#20058,#20057)
 exprContainers(#20058,#20001)
 #20059=*
 exprs(#20059,103,#20058,0,"x")
 hasLocation(#20059,#20029)
-enclosingStmt(#20059,#20057)
+enclosing_stmt(#20059,#20057)
 exprContainers(#20059,#20001)
 literals("x","x",#20059)
 bind(#20059,#20046)
 #20060=*
 exprs(#20060,0,#20058,1,"x")
 hasLocation(#20060,#20029)
-enclosingStmt(#20060,#20057)
+enclosing_stmt(#20060,#20057)
 exprContainers(#20060,#20001)
 literals("x","x",#20060)
 #20061=*
@@ -201,19 +201,19 @@ exprs(#20061,86,#20057,1,"y as z")
 #20062=@"loc,{#10000},2,13,2,18"
 locations_default(#20062,#10000,2,13,2,18)
 hasLocation(#20061,#20062)
-enclosingStmt(#20061,#20057)
+enclosing_stmt(#20061,#20057)
 exprContainers(#20061,#20001)
 #20063=*
 exprs(#20063,103,#20061,0,"y")
 hasLocation(#20063,#20033)
-enclosingStmt(#20063,#20057)
+enclosing_stmt(#20063,#20057)
 exprContainers(#20063,#20001)
 literals("y","y",#20063)
 bind(#20063,#20047)
 #20064=*
 exprs(#20064,0,#20061,1,"z")
 hasLocation(#20064,#20037)
-enclosingStmt(#20064,#20057)
+enclosing_stmt(#20064,#20057)
 exprContainers(#20064,#20001)
 literals("z","z",#20064)
 #20065=*
diff --git a/javascript/extractor/tests/es2015/output/trap/export6.js.trap b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
index 7e754f97020..dfdd764502e 100644
--- a/javascript/extractor/tests/es2015/output/trap/export6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
@@ -60,7 +60,7 @@ stmt_containers(#20017,#20001)
 #20018=*
 exprs(#20018,4,#20017,0,"'foo'")
 hasLocation(#20018,#20011)
-enclosingStmt(#20018,#20017)
+enclosing_stmt(#20018,#20017)
 exprContainers(#20018,#20001)
 literals("foo","'foo'",#20018)
 #20019=*
diff --git a/javascript/extractor/tests/es2015/output/trap/export7.js.trap b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
index 4a776e93006..0879f249a55 100644
--- a/javascript/extractor/tests/es2015/output/trap/export7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
@@ -90,7 +90,7 @@ stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,4,#20029,-2,"'foo'")
 hasLocation(#20030,#20023)
-enclosingStmt(#20030,#20029)
+enclosing_stmt(#20030,#20029)
 exprContainers(#20030,#20001)
 literals("foo","'foo'",#20030)
 #20031=*
@@ -102,18 +102,18 @@ regexpConstValue(#20031,"foo")
 #20033=*
 exprs(#20033,86,#20029,0,"x")
 hasLocation(#20033,#20009)
-enclosingStmt(#20033,#20029)
+enclosing_stmt(#20033,#20029)
 exprContainers(#20033,#20001)
 #20034=*
 exprs(#20034,0,#20033,0,"x")
 hasLocation(#20034,#20009)
-enclosingStmt(#20034,#20029)
+enclosing_stmt(#20034,#20029)
 exprContainers(#20034,#20001)
 literals("x","x",#20034)
 #20035=*
 exprs(#20035,0,#20033,1,"x")
 hasLocation(#20035,#20009)
-enclosingStmt(#20035,#20029)
+enclosing_stmt(#20035,#20029)
 exprContainers(#20035,#20001)
 literals("x","x",#20035)
 #20036=*
@@ -121,18 +121,18 @@ exprs(#20036,86,#20029,1,"y as z")
 #20037=@"loc,{#10000},1,13,1,18"
 locations_default(#20037,#10000,1,13,1,18)
 hasLocation(#20036,#20037)
-enclosingStmt(#20036,#20029)
+enclosing_stmt(#20036,#20029)
 exprContainers(#20036,#20001)
 #20038=*
 exprs(#20038,0,#20036,0,"y")
 hasLocation(#20038,#20013)
-enclosingStmt(#20038,#20029)
+enclosing_stmt(#20038,#20029)
 exprContainers(#20038,#20001)
 literals("y","y",#20038)
 #20039=*
 exprs(#20039,0,#20036,1,"z")
 hasLocation(#20039,#20017)
-enclosingStmt(#20039,#20029)
+enclosing_stmt(#20039,#20029)
 exprContainers(#20039,#20001)
 literals("z","z",#20039)
 #20040=*
diff --git a/javascript/extractor/tests/es2015/output/trap/export8.js.trap b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
index 0ae81680445..9fc88c425a0 100644
--- a/javascript/extractor/tests/es2015/output/trap/export8.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
@@ -85,12 +85,12 @@ exprs(#20027,47,#20026,0,"foo = 42")
 #20028=@"loc,{#10000},1,1,1,8"
 locations_default(#20028,#10000,1,1,1,8)
 hasLocation(#20027,#20028)
-enclosingStmt(#20027,#20026)
+enclosing_stmt(#20027,#20026)
 exprContainers(#20027,#20001)
 #20029=*
 exprs(#20029,79,#20027,0,"foo")
 hasLocation(#20029,#20007)
-enclosingStmt(#20029,#20026)
+enclosing_stmt(#20029,#20026)
 exprContainers(#20029,#20001)
 literals("foo","foo",#20029)
 #20030=@"var;{foo};{#20000}"
@@ -99,7 +99,7 @@ bind(#20029,#20030)
 #20031=*
 exprs(#20031,3,#20027,1,"42")
 hasLocation(#20031,#20011)
-enclosingStmt(#20031,#20026)
+enclosing_stmt(#20031,#20026)
 exprContainers(#20031,#20001)
 literals("42","42",#20031)
 #20032=*
@@ -109,7 +109,7 @@ stmt_containers(#20032,#20001)
 #20033=*
 exprs(#20033,103,#20032,0,"foo")
 hasLocation(#20033,#20019)
-enclosingStmt(#20033,#20032)
+enclosing_stmt(#20033,#20032)
 exprContainers(#20033,#20001)
 literals("foo","foo",#20033)
 bind(#20033,#20030)
diff --git a/javascript/extractor/tests/es2015/output/trap/export9.js.trap b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
index d784e28ca48..e178d214936 100644
--- a/javascript/extractor/tests/es2015/output/trap/export9.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
@@ -95,7 +95,7 @@ stmt_containers(#20030,#20001)
 #20032=*
 exprs(#20032,78,#20030,0,"C")
 hasLocation(#20032,#20011)
-enclosingStmt(#20032,#20030)
+enclosing_stmt(#20032,#20030)
 exprContainers(#20032,#20001)
 literals("C","C",#20032)
 decl(#20032,#20026)
@@ -112,13 +112,13 @@ hasLocation(#20034,#20035)
 #20036=*
 exprs(#20036,0,#20034,0,"constructor")
 hasLocation(#20036,#20035)
-enclosingStmt(#20036,#20030)
+enclosing_stmt(#20036,#20030)
 exprContainers(#20036,#20001)
 literals("constructor","constructor",#20036)
 #20037=*
 exprs(#20037,9,#20034,1,"() {}")
 hasLocation(#20037,#20035)
-enclosingStmt(#20037,#20030)
+enclosing_stmt(#20037,#20030)
 exprContainers(#20037,#20001)
 #20038=*
 scopes(#20038,1)
@@ -141,7 +141,7 @@ stmt_containers(#20041,#20001)
 #20043=*
 exprs(#20043,7,#20041,0,"[,]")
 hasLocation(#20043,#20042)
-enclosingStmt(#20043,#20041)
+enclosing_stmt(#20043,#20041)
 exprContainers(#20043,#20001)
 arraySize(#20043,1)
 #20044=*
diff --git a/javascript/extractor/tests/es2015/output/trap/forof.js.trap b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
index 4acc4ff622a..8562eb3845d 100644
--- a/javascript/extractor/tests/es2015/output/trap/forof.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
@@ -257,24 +257,24 @@ exprs(#20094,7,#20092,1,"[1,2,3]")
 #20095=@"loc,{#10000},1,15,1,21"
 locations_default(#20095,#10000,1,15,1,21)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20092)
+enclosing_stmt(#20094,#20092)
 exprContainers(#20094,#20001)
 #20096=*
 exprs(#20096,3,#20094,0,"1")
 hasLocation(#20096,#20029)
-enclosingStmt(#20096,#20092)
+enclosing_stmt(#20096,#20092)
 exprContainers(#20096,#20001)
 literals("1","1",#20096)
 #20097=*
 exprs(#20097,3,#20094,1,"2")
 hasLocation(#20097,#20033)
-enclosingStmt(#20097,#20092)
+enclosing_stmt(#20097,#20092)
 exprContainers(#20097,#20001)
 literals("2","2",#20097)
 #20098=*
 exprs(#20098,3,#20094,2,"3")
 hasLocation(#20098,#20037)
-enclosingStmt(#20098,#20092)
+enclosing_stmt(#20098,#20092)
 exprContainers(#20098,#20001)
 literals("3","3",#20098)
 arraySize(#20094,3)
@@ -293,12 +293,12 @@ stmt_containers(#20101,#20001)
 #20103=*
 exprs(#20103,64,#20101,0,"x")
 hasLocation(#20103,#20023)
-enclosingStmt(#20103,#20101)
+enclosing_stmt(#20103,#20101)
 exprContainers(#20103,#20001)
 #20104=*
 exprs(#20104,78,#20103,0,"x")
 hasLocation(#20104,#20023)
-enclosingStmt(#20104,#20101)
+enclosing_stmt(#20104,#20101)
 exprContainers(#20104,#20001)
 literals("x","x",#20104)
 decl(#20104,#20100)
@@ -325,12 +325,12 @@ exprs(#20111,64,#20109,0,"y = x+1")
 #20112=@"loc,{#10000},2,9,2,15"
 locations_default(#20112,#10000,2,9,2,15)
 hasLocation(#20111,#20112)
-enclosingStmt(#20111,#20109)
+enclosing_stmt(#20111,#20109)
 exprContainers(#20111,#20001)
 #20113=*
 exprs(#20113,78,#20111,0,"y")
 hasLocation(#20113,#20047)
-enclosingStmt(#20113,#20109)
+enclosing_stmt(#20113,#20109)
 exprContainers(#20113,#20001)
 literals("y","y",#20113)
 decl(#20113,#20108)
@@ -339,19 +339,19 @@ exprs(#20114,34,#20111,1,"x+1")
 #20115=@"loc,{#10000},2,13,2,15"
 locations_default(#20115,#10000,2,13,2,15)
 hasLocation(#20114,#20115)
-enclosingStmt(#20114,#20109)
+enclosing_stmt(#20114,#20109)
 exprContainers(#20114,#20001)
 #20116=*
 exprs(#20116,79,#20114,0,"x")
 hasLocation(#20116,#20051)
-enclosingStmt(#20116,#20109)
+enclosing_stmt(#20116,#20109)
 exprContainers(#20116,#20001)
 literals("x","x",#20116)
 bind(#20116,#20100)
 #20117=*
 exprs(#20117,3,#20114,1,"1")
 hasLocation(#20117,#20055)
-enclosingStmt(#20117,#20109)
+enclosing_stmt(#20117,#20109)
 exprContainers(#20117,#20001)
 literals("1","1",#20117)
 #20118=*
@@ -392,7 +392,7 @@ exprs(#20128,7,#20126,1,"[]")
 #20129=@"loc,{#10000},6,19,6,20"
 locations_default(#20129,#10000,6,19,6,20)
 hasLocation(#20128,#20129)
-enclosingStmt(#20128,#20126)
+enclosing_stmt(#20128,#20126)
 exprContainers(#20128,#20118)
 arraySize(#20128,0)
 #20130=*
@@ -404,12 +404,12 @@ stmt_containers(#20130,#20118)
 #20132=*
 exprs(#20132,64,#20130,0,"x")
 hasLocation(#20132,#20076)
-enclosingStmt(#20132,#20130)
+enclosing_stmt(#20132,#20130)
 exprContainers(#20132,#20118)
 #20133=*
 exprs(#20133,78,#20132,0,"x")
 hasLocation(#20133,#20076)
-enclosingStmt(#20133,#20130)
+enclosing_stmt(#20133,#20130)
 exprContainers(#20133,#20118)
 literals("x","x",#20133)
 decl(#20133,#20122)
diff --git a/javascript/extractor/tests/es2015/output/trap/import1.js.trap b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
index db825ea3602..91daee1dfa5 100644
--- a/javascript/extractor/tests/es2015/output/trap/import1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
@@ -69,7 +69,7 @@ stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,4,#20020,-1,"'foo'")
 hasLocation(#20021,#20011)
-enclosingStmt(#20021,#20020)
+enclosing_stmt(#20021,#20020)
 exprContainers(#20021,#20001)
 literals("foo","'foo'",#20021)
 #20022=*
@@ -81,12 +81,12 @@ regexpConstValue(#20022,"foo")
 #20024=*
 exprs(#20024,84,#20020,0,"x")
 hasLocation(#20024,#20007)
-enclosingStmt(#20024,#20020)
+enclosing_stmt(#20024,#20020)
 exprContainers(#20024,#20001)
 #20025=*
 exprs(#20025,78,#20024,1,"x")
 hasLocation(#20025,#20007)
-enclosingStmt(#20025,#20020)
+enclosing_stmt(#20025,#20020)
 exprContainers(#20025,#20001)
 literals("x","x",#20025)
 decl(#20025,#20017)
diff --git a/javascript/extractor/tests/es2015/output/trap/import2.js.trap b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
index 0954cd45acd..9a6ebb16b9f 100644
--- a/javascript/extractor/tests/es2015/output/trap/import2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
@@ -79,7 +79,7 @@ stmt_containers(#20024,#20001)
 #20025=*
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
-enclosingStmt(#20025,#20024)
+enclosing_stmt(#20025,#20024)
 exprContainers(#20025,#20001)
 literals("foo","'foo'",#20025)
 #20026=*
@@ -91,18 +91,18 @@ regexpConstValue(#20026,"foo")
 #20028=*
 exprs(#20028,83,#20024,0,"y")
 hasLocation(#20028,#20009)
-enclosingStmt(#20028,#20024)
+enclosing_stmt(#20028,#20024)
 exprContainers(#20028,#20001)
 #20029=*
 exprs(#20029,0,#20028,0,"y")
 hasLocation(#20029,#20009)
-enclosingStmt(#20029,#20024)
+enclosing_stmt(#20029,#20024)
 exprContainers(#20029,#20001)
 literals("y","y",#20029)
 #20030=*
 exprs(#20030,78,#20028,1,"y")
 hasLocation(#20030,#20009)
-enclosingStmt(#20030,#20024)
+enclosing_stmt(#20030,#20024)
 exprContainers(#20030,#20001)
 literals("y","y",#20030)
 decl(#20030,#20021)
diff --git a/javascript/extractor/tests/es2015/output/trap/import3.js.trap b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
index e0e94edbab7..afcd5925115 100644
--- a/javascript/extractor/tests/es2015/output/trap/import3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
@@ -89,7 +89,7 @@ stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,4,#20028,-1,"'foo'")
 hasLocation(#20029,#20019)
-enclosingStmt(#20029,#20028)
+enclosing_stmt(#20029,#20028)
 exprContainers(#20029,#20001)
 literals("foo","'foo'",#20029)
 #20030=*
@@ -103,18 +103,18 @@ exprs(#20032,83,#20028,0,"y as z")
 #20033=@"loc,{#10000},1,10,1,15"
 locations_default(#20033,#10000,1,10,1,15)
 hasLocation(#20032,#20033)
-enclosingStmt(#20032,#20028)
+enclosing_stmt(#20032,#20028)
 exprContainers(#20032,#20001)
 #20034=*
 exprs(#20034,0,#20032,0,"y")
 hasLocation(#20034,#20009)
-enclosingStmt(#20034,#20028)
+enclosing_stmt(#20034,#20028)
 exprContainers(#20034,#20001)
 literals("y","y",#20034)
 #20035=*
 exprs(#20035,78,#20032,1,"z")
 hasLocation(#20035,#20013)
-enclosingStmt(#20035,#20028)
+enclosing_stmt(#20035,#20028)
 exprContainers(#20035,#20001)
 literals("z","z",#20035)
 decl(#20035,#20025)
diff --git a/javascript/extractor/tests/es2015/output/trap/import4.js.trap b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
index e3e1ef06aa8..ac8c71d76c7 100644
--- a/javascript/extractor/tests/es2015/output/trap/import4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
@@ -108,7 +108,7 @@ stmt_containers(#20035,#20001)
 #20036=*
 exprs(#20036,4,#20035,-1,"'foo'")
 hasLocation(#20036,#20023)
-enclosingStmt(#20036,#20035)
+enclosing_stmt(#20036,#20035)
 exprContainers(#20036,#20001)
 literals("foo","'foo'",#20036)
 #20037=*
@@ -120,12 +120,12 @@ regexpConstValue(#20037,"foo")
 #20039=*
 exprs(#20039,84,#20035,0,"x")
 hasLocation(#20039,#20007)
-enclosingStmt(#20039,#20035)
+enclosing_stmt(#20039,#20035)
 exprContainers(#20039,#20001)
 #20040=*
 exprs(#20040,78,#20039,1,"x")
 hasLocation(#20040,#20007)
-enclosingStmt(#20040,#20035)
+enclosing_stmt(#20040,#20035)
 exprContainers(#20040,#20001)
 literals("x","x",#20040)
 decl(#20040,#20029)
@@ -136,18 +136,18 @@ exprs(#20041,83,#20035,1,"y as z")
 #20042=@"loc,{#10000},1,13,1,18"
 locations_default(#20042,#10000,1,13,1,18)
 hasLocation(#20041,#20042)
-enclosingStmt(#20041,#20035)
+enclosing_stmt(#20041,#20035)
 exprContainers(#20041,#20001)
 #20043=*
 exprs(#20043,0,#20041,0,"y")
 hasLocation(#20043,#20013)
-enclosingStmt(#20043,#20035)
+enclosing_stmt(#20043,#20035)
 exprContainers(#20043,#20001)
 literals("y","y",#20043)
 #20044=*
 exprs(#20044,78,#20041,1,"z")
 hasLocation(#20044,#20017)
-enclosingStmt(#20044,#20035)
+enclosing_stmt(#20044,#20035)
 exprContainers(#20044,#20001)
 literals("z","z",#20044)
 decl(#20044,#20030)
diff --git a/javascript/extractor/tests/es2015/output/trap/import5.js.trap b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
index 6667cdca9d1..5623666ed6f 100644
--- a/javascript/extractor/tests/es2015/output/trap/import5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
@@ -79,7 +79,7 @@ stmt_containers(#20024,#20001)
 #20025=*
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
-enclosingStmt(#20025,#20024)
+enclosing_stmt(#20025,#20024)
 exprContainers(#20025,#20001)
 literals("foo","'foo'",#20025)
 #20026=*
@@ -93,12 +93,12 @@ exprs(#20028,85,#20024,0,"* as foo")
 #20029=@"loc,{#10000},1,8,1,15"
 locations_default(#20029,#10000,1,8,1,15)
 hasLocation(#20028,#20029)
-enclosingStmt(#20028,#20024)
+enclosing_stmt(#20028,#20024)
 exprContainers(#20028,#20001)
 #20030=*
 exprs(#20030,78,#20028,1,"foo")
 hasLocation(#20030,#20011)
-enclosingStmt(#20030,#20024)
+enclosing_stmt(#20030,#20024)
 exprContainers(#20030,#20001)
 literals("foo","foo",#20030)
 decl(#20030,#20021)
diff --git a/javascript/extractor/tests/es2015/output/trap/import6.js.trap b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
index 67bc044387a..741c8d30597 100644
--- a/javascript/extractor/tests/es2015/output/trap/import6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
@@ -50,7 +50,7 @@ stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,4,#20013,-1,"'foo'")
 hasLocation(#20014,#20007)
-enclosingStmt(#20014,#20013)
+enclosing_stmt(#20014,#20013)
 exprContainers(#20014,#20001)
 literals("foo","'foo'",#20014)
 #20015=*
diff --git a/javascript/extractor/tests/es2015/output/trap/import7.js.trap b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
index 5b0fc36358a..a5f2bffa378 100644
--- a/javascript/extractor/tests/es2015/output/trap/import7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
@@ -152,7 +152,7 @@ stmt_containers(#20052,#20001)
 #20053=*
 exprs(#20053,4,#20052,-1,"'foo'")
 hasLocation(#20053,#20015)
-enclosingStmt(#20053,#20052)
+enclosing_stmt(#20053,#20052)
 exprContainers(#20053,#20001)
 literals("foo","'foo'",#20053)
 #20054=*
@@ -164,12 +164,12 @@ regexpConstValue(#20054,"foo")
 #20056=*
 exprs(#20056,84,#20052,0,"x")
 hasLocation(#20056,#20011)
-enclosingStmt(#20056,#20052)
+enclosing_stmt(#20056,#20052)
 exprContainers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,1,"x")
 hasLocation(#20057,#20011)
-enclosingStmt(#20057,#20052)
+enclosing_stmt(#20057,#20052)
 exprContainers(#20057,#20001)
 literals("x","x",#20057)
 decl(#20057,#20046)
@@ -182,7 +182,7 @@ stmt_containers(#20058,#20001)
 #20059=*
 exprs(#20059,4,#20058,-1,"'bar'")
 hasLocation(#20059,#20021)
-enclosingStmt(#20059,#20058)
+enclosing_stmt(#20059,#20058)
 exprContainers(#20059,#20001)
 literals("bar","'bar'",#20059)
 #20060=*
@@ -198,7 +198,7 @@ stmt_containers(#20062,#20001)
 #20063=*
 exprs(#20063,4,#20062,-1,"'baz'")
 hasLocation(#20063,#20039)
-enclosingStmt(#20063,#20062)
+enclosing_stmt(#20063,#20062)
 exprContainers(#20063,#20001)
 literals("baz","'baz'",#20063)
 #20064=*
@@ -212,18 +212,18 @@ exprs(#20066,83,#20062,0,"y as z")
 #20067=@"loc,{#10000},3,10,3,15"
 locations_default(#20067,#10000,3,10,3,15)
 hasLocation(#20066,#20067)
-enclosingStmt(#20066,#20062)
+enclosing_stmt(#20066,#20062)
 exprContainers(#20066,#20001)
 #20068=*
 exprs(#20068,0,#20066,0,"y")
 hasLocation(#20068,#20029)
-enclosingStmt(#20068,#20062)
+enclosing_stmt(#20068,#20062)
 exprContainers(#20068,#20001)
 literals("y","y",#20068)
 #20069=*
 exprs(#20069,78,#20066,1,"z")
 hasLocation(#20069,#20033)
-enclosingStmt(#20069,#20062)
+enclosing_stmt(#20069,#20062)
 exprContainers(#20069,#20001)
 literals("z","z",#20069)
 decl(#20069,#20047)
diff --git a/javascript/extractor/tests/es2015/output/trap/let.js.trap b/javascript/extractor/tests/es2015/output/trap/let.js.trap
index 44071093768..68b82a458c3 100644
--- a/javascript/extractor/tests/es2015/output/trap/let.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let.js.trap
@@ -392,19 +392,19 @@ exprs(#20142,64,#20140,0,"x = 23")
 #20143=@"loc,{#10000},2,9,2,14"
 locations_default(#20143,#10000,2,9,2,14)
 hasLocation(#20142,#20143)
-enclosingStmt(#20142,#20140)
+enclosing_stmt(#20142,#20140)
 exprContainers(#20142,#20001)
 #20144=*
 exprs(#20144,78,#20142,0,"x")
 hasLocation(#20144,#20030)
-enclosingStmt(#20144,#20140)
+enclosing_stmt(#20144,#20140)
 exprContainers(#20144,#20001)
 literals("x","x",#20144)
 decl(#20144,#20139)
 #20145=*
 exprs(#20145,3,#20142,1,"23")
 hasLocation(#20145,#20034)
-enclosingStmt(#20145,#20140)
+enclosing_stmt(#20145,#20140)
 exprContainers(#20145,#20001)
 literals("23","23",#20145)
 #20146=*
@@ -430,19 +430,19 @@ exprs(#20152,64,#20150,0,"x = 42")
 #20153=@"loc,{#10000},4,13,4,18"
 locations_default(#20153,#10000,4,13,4,18)
 hasLocation(#20152,#20153)
-enclosingStmt(#20152,#20150)
+enclosing_stmt(#20152,#20150)
 exprContainers(#20152,#20001)
 #20154=*
 exprs(#20154,78,#20152,0,"x")
 hasLocation(#20154,#20042)
-enclosingStmt(#20154,#20150)
+enclosing_stmt(#20154,#20150)
 exprContainers(#20154,#20001)
 literals("x","x",#20154)
 decl(#20154,#20149)
 #20155=*
 exprs(#20155,3,#20152,1,"42")
 hasLocation(#20155,#20046)
-enclosingStmt(#20155,#20150)
+enclosing_stmt(#20155,#20150)
 exprContainers(#20155,#20001)
 literals("42","42",#20155)
 #20156=*
@@ -462,19 +462,19 @@ exprs(#20160,27,#20156,1,"x<42")
 #20161=@"loc,{#10000},5,28,5,31"
 locations_default(#20161,#10000,5,28,5,31)
 hasLocation(#20160,#20161)
-enclosingStmt(#20160,#20156)
+enclosing_stmt(#20160,#20156)
 exprContainers(#20160,#20001)
 #20162=*
 exprs(#20162,79,#20160,0,"x")
 hasLocation(#20162,#20068)
-enclosingStmt(#20162,#20156)
+enclosing_stmt(#20162,#20156)
 exprContainers(#20162,#20001)
 literals("x","x",#20162)
 bind(#20162,#20159)
 #20163=*
 exprs(#20163,3,#20160,1,"42")
 hasLocation(#20163,#20072)
-enclosingStmt(#20163,#20156)
+enclosing_stmt(#20163,#20156)
 exprContainers(#20163,#20001)
 literals("42","42",#20163)
 #20164=*
@@ -488,12 +488,12 @@ exprs(#20166,64,#20164,0,"x = x-19")
 #20167=@"loc,{#10000},5,18,5,25"
 locations_default(#20167,#10000,5,18,5,25)
 hasLocation(#20166,#20167)
-enclosingStmt(#20166,#20164)
+enclosing_stmt(#20166,#20164)
 exprContainers(#20166,#20001)
 #20168=*
 exprs(#20168,78,#20166,0,"x")
 hasLocation(#20168,#20056)
-enclosingStmt(#20168,#20164)
+enclosing_stmt(#20168,#20164)
 exprContainers(#20168,#20001)
 literals("x","x",#20168)
 decl(#20168,#20159)
@@ -502,19 +502,19 @@ exprs(#20169,35,#20166,1,"x-19")
 #20170=@"loc,{#10000},5,22,5,25"
 locations_default(#20170,#10000,5,22,5,25)
 hasLocation(#20169,#20170)
-enclosingStmt(#20169,#20164)
+enclosing_stmt(#20169,#20164)
 exprContainers(#20169,#20001)
 #20171=*
 exprs(#20171,79,#20169,0,"x")
 hasLocation(#20171,#20060)
-enclosingStmt(#20171,#20164)
+enclosing_stmt(#20171,#20164)
 exprContainers(#20171,#20001)
 literals("x","x",#20171)
 bind(#20171,#20149)
 #20172=*
 exprs(#20172,3,#20169,1,"19")
 hasLocation(#20172,#20064)
-enclosingStmt(#20172,#20164)
+enclosing_stmt(#20172,#20164)
 exprContainers(#20172,#20001)
 literals("19","19",#20172)
 #20173=*
@@ -540,19 +540,19 @@ exprs(#20179,64,#20177,0,"x = 56")
 #20180=@"loc,{#10000},6,17,6,22"
 locations_default(#20180,#10000,6,17,6,22)
 hasLocation(#20179,#20180)
-enclosingStmt(#20179,#20177)
+enclosing_stmt(#20179,#20177)
 exprContainers(#20179,#20001)
 #20181=*
 exprs(#20181,78,#20179,0,"x")
 hasLocation(#20181,#20082)
-enclosingStmt(#20181,#20177)
+enclosing_stmt(#20181,#20177)
 exprContainers(#20181,#20001)
 literals("x","x",#20181)
 decl(#20181,#20176)
 #20182=*
 exprs(#20182,3,#20179,1,"56")
 hasLocation(#20182,#20086)
-enclosingStmt(#20182,#20177)
+enclosing_stmt(#20182,#20177)
 exprContainers(#20182,#20001)
 literals("56","56",#20182)
 #20183=*
@@ -566,19 +566,19 @@ exprs(#20185,13,#20183,0,"console.log(x)")
 #20186=@"loc,{#10000},7,13,7,26"
 locations_default(#20186,#10000,7,13,7,26)
 hasLocation(#20185,#20186)
-enclosingStmt(#20185,#20183)
+enclosing_stmt(#20185,#20183)
 exprContainers(#20185,#20001)
 #20187=*
 exprs(#20187,14,#20185,-1,"console.log")
 #20188=@"loc,{#10000},7,13,7,23"
 locations_default(#20188,#10000,7,13,7,23)
 hasLocation(#20187,#20188)
-enclosingStmt(#20187,#20183)
+enclosing_stmt(#20187,#20183)
 exprContainers(#20187,#20001)
 #20189=*
 exprs(#20189,79,#20187,0,"console")
 hasLocation(#20189,#20090)
-enclosingStmt(#20189,#20183)
+enclosing_stmt(#20189,#20183)
 exprContainers(#20189,#20001)
 literals("console","console",#20189)
 #20190=@"var;{console};{#20000}"
@@ -587,13 +587,13 @@ bind(#20189,#20190)
 #20191=*
 exprs(#20191,0,#20187,1,"log")
 hasLocation(#20191,#20094)
-enclosingStmt(#20191,#20183)
+enclosing_stmt(#20191,#20183)
 exprContainers(#20191,#20001)
 literals("log","log",#20191)
 #20192=*
 exprs(#20192,79,#20185,0,"x")
 hasLocation(#20192,#20098)
-enclosingStmt(#20192,#20183)
+enclosing_stmt(#20192,#20183)
 exprContainers(#20192,#20001)
 literals("x","x",#20192)
 bind(#20192,#20176)
@@ -608,7 +608,7 @@ exprs(#20195,8,#20193,1,"{ x: x }")
 #20196=@"loc,{#10000},9,23,9,30"
 locations_default(#20196,#10000,9,23,9,30)
 hasLocation(#20195,#20196)
-enclosingStmt(#20195,#20193)
+enclosing_stmt(#20195,#20193)
 exprContainers(#20195,#20001)
 #20197=*
 properties(#20197,#20195,0,0,"x: x")
@@ -618,13 +618,13 @@ hasLocation(#20197,#20198)
 #20199=*
 exprs(#20199,0,#20197,0,"x")
 hasLocation(#20199,#20118)
-enclosingStmt(#20199,#20193)
+enclosing_stmt(#20199,#20193)
 exprContainers(#20199,#20001)
 literals("x","x",#20199)
 #20200=*
 exprs(#20200,79,#20197,1,"x")
 hasLocation(#20200,#20122)
-enclosingStmt(#20200,#20193)
+enclosing_stmt(#20200,#20193)
 exprContainers(#20200,#20001)
 literals("x","x",#20200)
 bind(#20200,#20149)
@@ -643,12 +643,12 @@ stmt_containers(#20203,#20001)
 #20205=*
 exprs(#20205,64,#20203,0,"x")
 hasLocation(#20205,#20112)
-enclosingStmt(#20205,#20203)
+enclosing_stmt(#20205,#20203)
 exprContainers(#20205,#20001)
 #20206=*
 exprs(#20206,78,#20205,0,"x")
 hasLocation(#20206,#20112)
-enclosingStmt(#20206,#20203)
+enclosing_stmt(#20206,#20203)
 exprContainers(#20206,#20001)
 literals("x","x",#20206)
 decl(#20206,#20202)
@@ -661,7 +661,7 @@ stmt_containers(#20207,#20001)
 #20209=*
 exprs(#20209,79,#20207,0,"x")
 hasLocation(#20209,#20128)
-enclosingStmt(#20209,#20207)
+enclosing_stmt(#20209,#20207)
 exprContainers(#20209,#20001)
 literals("x","x",#20209)
 bind(#20209,#20202)
diff --git a/javascript/extractor/tests/es2015/output/trap/let2.js.trap b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
index 2fd48bc1613..8d81d6a060b 100644
--- a/javascript/extractor/tests/es2015/output/trap/let2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
@@ -67,19 +67,19 @@ exprs(#20021,64,#20020,0,"x = 42")
 #20022=@"loc,{#10000},1,12,1,17"
 locations_default(#20022,#10000,1,12,1,17)
 hasLocation(#20021,#20022)
-enclosingStmt(#20021,#20020)
+enclosing_stmt(#20021,#20020)
 exprContainers(#20021,#20001)
 #20023=*
 exprs(#20023,78,#20021,0,"x")
 hasLocation(#20023,#20009)
-enclosingStmt(#20023,#20020)
+enclosing_stmt(#20023,#20020)
 exprContainers(#20023,#20001)
 literals("x","x",#20023)
 decl(#20023,#20019)
 #20024=*
 exprs(#20024,3,#20021,1,"42")
 hasLocation(#20024,#20013)
-enclosingStmt(#20024,#20020)
+enclosing_stmt(#20024,#20020)
 exprContainers(#20024,#20001)
 literals("42","42",#20024)
 #20025=*
diff --git a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
index 87c7bffe67e..d63269a0b5b 100644
--- a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
@@ -202,7 +202,7 @@ stmt_containers(#20071,#20001)
 #20072=*
 exprs(#20072,4,#20071,-1,"'m'")
 hasLocation(#20072,#20023)
-enclosingStmt(#20072,#20071)
+enclosing_stmt(#20072,#20071)
 exprContainers(#20072,#20001)
 literals("m","'m'",#20072)
 #20073=*
@@ -214,18 +214,18 @@ regexpConstValue(#20073,"m")
 #20075=*
 exprs(#20075,83,#20071,0,"x")
 hasLocation(#20075,#20017)
-enclosingStmt(#20075,#20071)
+enclosing_stmt(#20075,#20071)
 exprContainers(#20075,#20001)
 #20076=*
 exprs(#20076,0,#20075,0,"x")
 hasLocation(#20076,#20017)
-enclosingStmt(#20076,#20071)
+enclosing_stmt(#20076,#20071)
 exprContainers(#20076,#20001)
 literals("x","x",#20076)
 #20077=*
 exprs(#20077,78,#20075,1,"x")
 hasLocation(#20077,#20017)
-enclosingStmt(#20077,#20071)
+enclosing_stmt(#20077,#20071)
 exprContainers(#20077,#20001)
 literals("x","x",#20077)
 decl(#20077,#20065)
@@ -242,12 +242,12 @@ exprs(#20080,18,#20078,0,"!x")
 #20081=@"loc,{#10000},2,5,2,6"
 locations_default(#20081,#10000,2,5,2,6)
 hasLocation(#20080,#20081)
-enclosingStmt(#20080,#20078)
+enclosing_stmt(#20080,#20078)
 exprContainers(#20080,#20001)
 #20082=*
 exprs(#20082,79,#20080,0,"x")
 hasLocation(#20082,#20033)
-enclosingStmt(#20082,#20078)
+enclosing_stmt(#20082,#20078)
 exprContainers(#20082,#20001)
 literals("x","x",#20082)
 bind(#20082,#20065)
@@ -276,7 +276,7 @@ stmt_containers(#20089,#20001)
 #20091=*
 exprs(#20091,4,#20089,-1,"'m'")
 hasLocation(#20091,#20049)
-enclosingStmt(#20091,#20089)
+enclosing_stmt(#20091,#20089)
 exprContainers(#20091,#20001)
 literals("m","'m'",#20091)
 #20092=*
@@ -288,18 +288,18 @@ regexpConstValue(#20092,"m")
 #20094=*
 exprs(#20094,83,#20089,0,"y")
 hasLocation(#20094,#20043)
-enclosingStmt(#20094,#20089)
+enclosing_stmt(#20094,#20089)
 exprContainers(#20094,#20001)
 #20095=*
 exprs(#20095,0,#20094,0,"y")
 hasLocation(#20095,#20043)
-enclosingStmt(#20095,#20089)
+enclosing_stmt(#20095,#20089)
 exprContainers(#20095,#20001)
 literals("y","y",#20095)
 #20096=*
 exprs(#20096,78,#20094,1,"y")
 hasLocation(#20096,#20043)
-enclosingStmt(#20096,#20089)
+enclosing_stmt(#20096,#20089)
 exprContainers(#20096,#20001)
 literals("y","y",#20096)
 decl(#20096,#20086)
@@ -316,19 +316,19 @@ exprs(#20099,47,#20097,0,"x = y")
 #20100=@"loc,{#10000},4,3,4,7"
 locations_default(#20100,#10000,4,3,4,7)
 hasLocation(#20099,#20100)
-enclosingStmt(#20099,#20097)
+enclosing_stmt(#20099,#20097)
 exprContainers(#20099,#20001)
 #20101=*
 exprs(#20101,79,#20099,0,"x")
 hasLocation(#20101,#20053)
-enclosingStmt(#20101,#20097)
+enclosing_stmt(#20101,#20097)
 exprContainers(#20101,#20001)
 literals("x","x",#20101)
 bind(#20101,#20065)
 #20102=*
 exprs(#20102,79,#20099,1,"y")
 hasLocation(#20102,#20057)
-enclosingStmt(#20102,#20097)
+enclosing_stmt(#20102,#20097)
 exprContainers(#20102,#20001)
 literals("y","y",#20102)
 bind(#20102,#20086)
diff --git a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
index 8d941f5a240..87d836e625f 100644
--- a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
@@ -136,21 +136,21 @@ exprs(#20045,18,#20043,0,"!!new.target")
 #20046=@"loc,{#10000},2,10,2,21"
 locations_default(#20046,#10000,2,10,2,21)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20043)
+enclosing_stmt(#20045,#20043)
 exprContainers(#20045,#20037)
 #20047=*
 exprs(#20047,18,#20045,0,"!new.target")
 #20048=@"loc,{#10000},2,11,2,21"
 locations_default(#20048,#10000,2,11,2,21)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20043)
+enclosing_stmt(#20047,#20043)
 exprContainers(#20047,#20037)
 #20049=*
 exprs(#20049,82,#20047,0,"new.target")
 #20050=@"loc,{#10000},2,12,2,21"
 locations_default(#20050,#10000,2,12,2,21)
 hasLocation(#20049,#20050)
-enclosingStmt(#20049,#20043)
+enclosing_stmt(#20049,#20043)
 exprContainers(#20049,#20037)
 #20051=*
 entry_cfg_node(#20051,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
index 30fc91120c2..973749e378f 100644
--- a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
@@ -47,7 +47,7 @@ stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,71,#20013,0,"``")
 hasLocation(#20014,#20003)
-enclosingStmt(#20014,#20013)
+enclosing_stmt(#20014,#20013)
 exprContainers(#20014,#20001)
 #20015=*
 entry_cfg_node(#20015,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
index bdf4978dd56..db5d80a1e9f 100644
--- a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
@@ -114,7 +114,7 @@ stmt_containers(#20038,#20001)
 #20040=*
 exprs(#20040,78,#20038,0,"C")
 hasLocation(#20040,#20011)
-enclosingStmt(#20040,#20038)
+enclosing_stmt(#20040,#20038)
 exprContainers(#20040,#20001)
 literals("C","C",#20040)
 decl(#20040,#20036)
@@ -131,7 +131,7 @@ hasLocation(#20042,#20043)
 #20044=*
 exprs(#20044,1,#20042,0,"null")
 hasLocation(#20044,#20019)
-enclosingStmt(#20044,#20038)
+enclosing_stmt(#20044,#20038)
 exprContainers(#20044,#20001)
 literals("null","null",#20044)
 #20045=*
@@ -139,7 +139,7 @@ exprs(#20045,9,#20042,1,"(v) { }")
 #20046=@"loc,{#10000},2,13,2,19"
 locations_default(#20046,#10000,2,13,2,19)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20038)
+enclosing_stmt(#20045,#20038)
 exprContainers(#20045,#20001)
 #20047=*
 scopes(#20047,1)
@@ -172,13 +172,13 @@ hasLocation(#20053,#20054)
 #20055=*
 exprs(#20055,0,#20053,0,"constructor")
 hasLocation(#20055,#20054)
-enclosingStmt(#20055,#20038)
+enclosing_stmt(#20055,#20038)
 exprContainers(#20055,#20001)
 literals("constructor","constructor",#20055)
 #20056=*
 exprs(#20056,9,#20053,1,"() {}")
 hasLocation(#20056,#20054)
-enclosingStmt(#20056,#20038)
+enclosing_stmt(#20056,#20038)
 exprContainers(#20056,#20001)
 #20057=*
 scopes(#20057,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
index ca9b191d6d1..f2f4fb8c329 100644
--- a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
@@ -141,7 +141,7 @@ stmt_containers(#20045,#20039)
 #20047=*
 exprs(#20047,79,#20045,0,"arguments")
 hasLocation(#20047,#20021)
-enclosingStmt(#20047,#20045)
+enclosing_stmt(#20047,#20045)
 exprContainers(#20047,#20039)
 literals("arguments","arguments",#20047)
 bind(#20047,#20042)
@@ -156,12 +156,12 @@ exprs(#20050,13,#20048,0,"let (arguments)")
 #20051=@"loc,{#10000},3,5,3,19"
 locations_default(#20051,#10000,3,5,3,19)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20048)
+enclosing_stmt(#20050,#20048)
 exprContainers(#20050,#20039)
 #20052=*
 exprs(#20052,79,#20050,-1,"let")
 hasLocation(#20052,#20025)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20039)
 literals("let","let",#20052)
 #20053=@"var;{let};{#20000}"
@@ -170,7 +170,7 @@ bind(#20052,#20053)
 #20054=*
 exprs(#20054,79,#20050,0,"arguments")
 hasLocation(#20054,#20029)
-enclosingStmt(#20054,#20048)
+enclosing_stmt(#20054,#20048)
 exprContainers(#20054,#20039)
 literals("arguments","arguments",#20054)
 bind(#20054,#20042)
diff --git a/javascript/extractor/tests/es2015/output/trap/properties.js.trap b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
index 3ddc3a8001e..69f89d2619a 100644
--- a/javascript/extractor/tests/es2015/output/trap/properties.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
@@ -232,19 +232,19 @@ exprs(#20084,64,#20083,0,"x = 42")
 #20085=@"loc,{#10000},1,5,1,10"
 locations_default(#20085,#10000,1,5,1,10)
 hasLocation(#20084,#20085)
-enclosingStmt(#20084,#20083)
+enclosing_stmt(#20084,#20083)
 exprContainers(#20084,#20001)
 #20086=*
 exprs(#20086,78,#20084,0,"x")
 hasLocation(#20086,#20017)
-enclosingStmt(#20086,#20083)
+enclosing_stmt(#20086,#20083)
 exprContainers(#20086,#20001)
 literals("x","x",#20086)
 decl(#20086,#20081)
 #20087=*
 exprs(#20087,3,#20084,1,"42")
 hasLocation(#20087,#20021)
-enclosingStmt(#20087,#20083)
+enclosing_stmt(#20087,#20083)
 exprContainers(#20087,#20001)
 literals("42","42",#20087)
 #20088=*
@@ -252,12 +252,12 @@ exprs(#20088,64,#20083,1,"o = {\n  ... }\n    }")
 #20089=@"loc,{#10000},2,5,6,5"
 locations_default(#20089,#10000,2,5,6,5)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20083)
+enclosing_stmt(#20088,#20083)
 exprContainers(#20088,#20001)
 #20090=*
 exprs(#20090,78,#20088,0,"o")
 hasLocation(#20090,#20025)
-enclosingStmt(#20090,#20083)
+enclosing_stmt(#20090,#20083)
 exprContainers(#20090,#20001)
 literals("o","o",#20090)
 decl(#20090,#20082)
@@ -266,7 +266,7 @@ exprs(#20091,8,#20088,1,"{\n      ... }\n    }")
 #20092=@"loc,{#10000},2,9,6,5"
 locations_default(#20092,#10000,2,9,6,5)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20083)
+enclosing_stmt(#20091,#20083)
 exprContainers(#20091,#20001)
 #20093=*
 properties(#20093,#20091,0,0,"[""prop"" ... ()]: 23")
@@ -278,12 +278,12 @@ exprs(#20095,34,#20093,0,"""prop""  ... andom()")
 #20096=@"loc,{#10000},3,10,3,31"
 locations_default(#20096,#10000,3,10,3,31)
 hasLocation(#20095,#20096)
-enclosingStmt(#20095,#20083)
+enclosing_stmt(#20095,#20083)
 exprContainers(#20095,#20001)
 #20097=*
 exprs(#20097,4,#20095,0,"""prop""")
 hasLocation(#20097,#20033)
-enclosingStmt(#20097,#20083)
+enclosing_stmt(#20097,#20083)
 exprContainers(#20097,#20001)
 literals("prop","""prop""",#20097)
 #20098=*
@@ -297,19 +297,19 @@ exprs(#20100,13,#20095,1,"Math.random()")
 #20101=@"loc,{#10000},3,19,3,31"
 locations_default(#20101,#10000,3,19,3,31)
 hasLocation(#20100,#20101)
-enclosingStmt(#20100,#20083)
+enclosing_stmt(#20100,#20083)
 exprContainers(#20100,#20001)
 #20102=*
 exprs(#20102,14,#20100,-1,"Math.random")
 #20103=@"loc,{#10000},3,19,3,29"
 locations_default(#20103,#10000,3,19,3,29)
 hasLocation(#20102,#20103)
-enclosingStmt(#20102,#20083)
+enclosing_stmt(#20102,#20083)
 exprContainers(#20102,#20001)
 #20104=*
 exprs(#20104,79,#20102,0,"Math")
 hasLocation(#20104,#20037)
-enclosingStmt(#20104,#20083)
+enclosing_stmt(#20104,#20083)
 exprContainers(#20104,#20001)
 literals("Math","Math",#20104)
 #20105=@"var;{Math};{#20000}"
@@ -318,13 +318,13 @@ bind(#20104,#20105)
 #20106=*
 exprs(#20106,0,#20102,1,"random")
 hasLocation(#20106,#20041)
-enclosingStmt(#20106,#20083)
+enclosing_stmt(#20106,#20083)
 exprContainers(#20106,#20001)
 literals("random","random",#20106)
 #20107=*
 exprs(#20107,3,#20093,1,"23")
 hasLocation(#20107,#20051)
-enclosingStmt(#20107,#20083)
+enclosing_stmt(#20107,#20083)
 exprContainers(#20107,#20001)
 literals("23","23",#20107)
 isComputed(#20093)
@@ -334,13 +334,13 @@ hasLocation(#20108,#20055)
 #20109=*
 exprs(#20109,0,#20108,0,"x")
 hasLocation(#20109,#20055)
-enclosingStmt(#20109,#20083)
+enclosing_stmt(#20109,#20083)
 exprContainers(#20109,#20001)
 literals("x","x",#20109)
 #20110=*
 exprs(#20110,79,#20108,1,"x")
 hasLocation(#20110,#20055)
-enclosingStmt(#20110,#20083)
+enclosing_stmt(#20110,#20083)
 exprContainers(#20110,#20001)
 literals("x","x",#20110)
 bind(#20110,#20081)
@@ -352,7 +352,7 @@ hasLocation(#20111,#20112)
 #20113=*
 exprs(#20113,0,#20111,0,"m")
 hasLocation(#20113,#20059)
-enclosingStmt(#20113,#20083)
+enclosing_stmt(#20113,#20083)
 exprContainers(#20113,#20001)
 literals("m","m",#20113)
 #20114=*
@@ -360,7 +360,7 @@ exprs(#20114,9,#20111,1,"() { return 56; }")
 #20115=@"loc,{#10000},5,10,5,26"
 locations_default(#20115,#10000,5,10,5,26)
 hasLocation(#20114,#20115)
-enclosingStmt(#20114,#20083)
+enclosing_stmt(#20114,#20083)
 exprContainers(#20114,#20001)
 #20116=*
 scopes(#20116,1)
@@ -384,7 +384,7 @@ stmt_containers(#20120,#20114)
 #20122=*
 exprs(#20122,3,#20120,0,"56")
 hasLocation(#20122,#20069)
-enclosingStmt(#20122,#20120)
+enclosing_stmt(#20122,#20120)
 exprContainers(#20122,#20114)
 literals("56","56",#20122)
 isMethod(#20111)
diff --git a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
index a7a8f28ab71..f36d12adbd4 100644
--- a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
@@ -81,7 +81,7 @@ exprs(#20027,65,#20026,0,"({x = 1}) => x")
 #20028=@"loc,{#10000},1,1,1,14"
 locations_default(#20028,#10000,1,1,1,14)
 hasLocation(#20027,#20028)
-enclosingStmt(#20027,#20026)
+enclosing_stmt(#20027,#20026)
 exprContainers(#20027,#20001)
 #20029=*
 scopes(#20029,1)
diff --git a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
index d45dfe28ddd..cdcaad65da4 100644
--- a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
@@ -109,12 +109,12 @@ exprs(#20038,7,#20037,0,"[a, ...as]")
 #20039=@"loc,{#10000},1,1,1,10"
 locations_default(#20039,#10000,1,1,1,10)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20037)
+enclosing_stmt(#20038,#20037)
 exprContainers(#20038,#20001)
 #20040=*
 exprs(#20040,79,#20038,0,"a")
 hasLocation(#20040,#20009)
-enclosingStmt(#20040,#20037)
+enclosing_stmt(#20040,#20037)
 exprContainers(#20040,#20001)
 literals("a","a",#20040)
 #20041=@"var;{a};{#20000}"
@@ -125,12 +125,12 @@ exprs(#20042,66,#20038,1,"...as")
 #20043=@"loc,{#10000},1,5,1,9"
 locations_default(#20043,#10000,1,5,1,9)
 hasLocation(#20042,#20043)
-enclosingStmt(#20042,#20037)
+enclosing_stmt(#20042,#20037)
 exprContainers(#20042,#20001)
 #20044=*
 exprs(#20044,79,#20042,0,"as")
 hasLocation(#20044,#20015)
-enclosingStmt(#20044,#20037)
+enclosing_stmt(#20044,#20037)
 exprContainers(#20044,#20001)
 literals("as","as",#20044)
 #20045=@"var;{as};{#20000}"
@@ -146,12 +146,12 @@ exprs(#20047,12,#20046,0,"new Array(...elts)")
 #20048=@"loc,{#10000},2,1,2,18"
 locations_default(#20048,#10000,2,1,2,18)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20046)
+enclosing_stmt(#20047,#20046)
 exprContainers(#20047,#20001)
 #20049=*
 exprs(#20049,79,#20047,-1,"Array")
 hasLocation(#20049,#20023)
-enclosingStmt(#20049,#20046)
+enclosing_stmt(#20049,#20046)
 exprContainers(#20049,#20001)
 literals("Array","Array",#20049)
 #20050=@"var;{Array};{#20000}"
@@ -162,12 +162,12 @@ exprs(#20051,66,#20047,0,"...elts")
 #20052=@"loc,{#10000},2,11,2,17"
 locations_default(#20052,#10000,2,11,2,17)
 hasLocation(#20051,#20052)
-enclosingStmt(#20051,#20046)
+enclosing_stmt(#20051,#20046)
 exprContainers(#20051,#20001)
 #20053=*
 exprs(#20053,79,#20051,0,"elts")
 hasLocation(#20053,#20029)
-enclosingStmt(#20053,#20046)
+enclosing_stmt(#20053,#20046)
 exprContainers(#20053,#20001)
 literals("elts","elts",#20053)
 #20054=@"var;{elts};{#20000}"
diff --git a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
index 37e817698a9..6e0ad282340 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
@@ -160,7 +160,7 @@ stmt_containers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,0,"A")
 hasLocation(#20057,#20015)
-enclosingStmt(#20057,#20056)
+enclosing_stmt(#20057,#20056)
 exprContainers(#20057,#20001)
 literals("A","A",#20057)
 decl(#20057,#20054)
@@ -172,7 +172,7 @@ scopenesting(#20058,#20000)
 #20059=*
 exprs(#20059,79,#20056,1,"B")
 hasLocation(#20059,#20019)
-enclosingStmt(#20059,#20056)
+enclosing_stmt(#20059,#20056)
 exprContainers(#20059,#20001)
 literals("B","B",#20059)
 #20060=@"var;{B};{#20000}"
@@ -186,7 +186,7 @@ hasLocation(#20061,#20062)
 #20063=*
 exprs(#20063,0,#20061,0,"m")
 hasLocation(#20063,#20023)
-enclosingStmt(#20063,#20056)
+enclosing_stmt(#20063,#20056)
 exprContainers(#20063,#20001)
 literals("m","m",#20063)
 #20064=*
@@ -194,7 +194,7 @@ exprs(#20064,9,#20061,1,"() {\n   ... 19;\n  }")
 #20065=@"loc,{#10000},2,4,4,3"
 locations_default(#20065,#10000,2,4,4,3)
 hasLocation(#20064,#20065)
-enclosingStmt(#20064,#20056)
+enclosing_stmt(#20064,#20056)
 exprContainers(#20064,#20001)
 #20066=*
 scopes(#20066,1)
@@ -220,37 +220,37 @@ exprs(#20072,34,#20070,0,"super.m() + 19")
 #20073=@"loc,{#10000},3,12,3,25"
 locations_default(#20073,#10000,3,12,3,25)
 hasLocation(#20072,#20073)
-enclosingStmt(#20072,#20070)
+enclosing_stmt(#20072,#20070)
 exprContainers(#20072,#20064)
 #20074=*
 exprs(#20074,13,#20072,0,"super.m()")
 #20075=@"loc,{#10000},3,12,3,20"
 locations_default(#20075,#10000,3,12,3,20)
 hasLocation(#20074,#20075)
-enclosingStmt(#20074,#20070)
+enclosing_stmt(#20074,#20070)
 exprContainers(#20074,#20064)
 #20076=*
 exprs(#20076,14,#20074,-1,"super.m")
 #20077=@"loc,{#10000},3,12,3,18"
 locations_default(#20077,#10000,3,12,3,18)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20070)
+enclosing_stmt(#20076,#20070)
 exprContainers(#20076,#20064)
 #20078=*
 exprs(#20078,81,#20076,0,"super")
 hasLocation(#20078,#20033)
-enclosingStmt(#20078,#20070)
+enclosing_stmt(#20078,#20070)
 exprContainers(#20078,#20064)
 #20079=*
 exprs(#20079,0,#20076,1,"m")
 hasLocation(#20079,#20037)
-enclosingStmt(#20079,#20070)
+enclosing_stmt(#20079,#20070)
 exprContainers(#20079,#20064)
 literals("m","m",#20079)
 #20080=*
 exprs(#20080,3,#20072,1,"19")
 hasLocation(#20080,#20045)
-enclosingStmt(#20080,#20070)
+enclosing_stmt(#20080,#20070)
 exprContainers(#20080,#20064)
 literals("19","19",#20080)
 isMethod(#20061)
@@ -262,13 +262,13 @@ hasLocation(#20081,#20082)
 #20083=*
 exprs(#20083,0,#20081,0,"constructor")
 hasLocation(#20083,#20082)
-enclosingStmt(#20083,#20056)
+enclosing_stmt(#20083,#20056)
 exprContainers(#20083,#20001)
 literals("constructor","constructor",#20083)
 #20084=*
 exprs(#20084,9,#20081,1,"(...arg ... rgs); }")
 hasLocation(#20084,#20082)
-enclosingStmt(#20084,#20056)
+enclosing_stmt(#20084,#20056)
 exprContainers(#20084,#20001)
 #20085=*
 scopes(#20085,1)
@@ -297,22 +297,22 @@ stmt_containers(#20090,#20084)
 #20091=*
 exprs(#20091,13,#20090,0,"super(...args)")
 hasLocation(#20091,#20082)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20084)
 #20092=*
 exprs(#20092,81,#20091,-1,"super")
 hasLocation(#20092,#20082)
-enclosingStmt(#20092,#20090)
+enclosing_stmt(#20092,#20090)
 exprContainers(#20092,#20084)
 #20093=*
 exprs(#20093,66,#20091,0,"...args")
 hasLocation(#20093,#20082)
-enclosingStmt(#20093,#20090)
+enclosing_stmt(#20093,#20090)
 exprContainers(#20093,#20084)
 #20094=*
 exprs(#20094,79,#20093,0,"args")
 hasLocation(#20094,#20082)
-enclosingStmt(#20094,#20090)
+enclosing_stmt(#20094,#20090)
 exprContainers(#20094,#20084)
 literals("args","args",#20094)
 bind(#20094,#20086)
diff --git a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
index f55b3b016c0..bc0dbcc9882 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
@@ -140,7 +140,7 @@ stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
-enclosingStmt(#20049,#20048)
+enclosing_stmt(#20049,#20048)
 exprContainers(#20049,#20001)
 literals("A","A",#20049)
 decl(#20049,#20046)
@@ -152,7 +152,7 @@ scopenesting(#20050,#20000)
 #20051=*
 exprs(#20051,79,#20048,1,"B")
 hasLocation(#20051,#20019)
-enclosingStmt(#20051,#20048)
+enclosing_stmt(#20051,#20048)
 exprContainers(#20051,#20001)
 literals("B","B",#20051)
 #20052=@"var;{B};{#20000}"
@@ -166,7 +166,7 @@ hasLocation(#20053,#20054)
 #20055=*
 exprs(#20055,0,#20053,0,"constructor")
 hasLocation(#20055,#20023)
-enclosingStmt(#20055,#20048)
+enclosing_stmt(#20055,#20048)
 exprContainers(#20055,#20001)
 literals("constructor","constructor",#20055)
 #20056=*
@@ -174,7 +174,7 @@ exprs(#20056,9,#20053,1,"() {\n   ... 2);\n  }")
 #20057=@"loc,{#10000},2,14,4,3"
 locations_default(#20057,#10000,2,14,4,3)
 hasLocation(#20056,#20057)
-enclosingStmt(#20056,#20048)
+enclosing_stmt(#20056,#20048)
 exprContainers(#20056,#20001)
 #20058=*
 scopes(#20058,1)
@@ -200,17 +200,17 @@ exprs(#20064,13,#20062,0,"super(42)")
 #20065=@"loc,{#10000},3,5,3,13"
 locations_default(#20065,#10000,3,5,3,13)
 hasLocation(#20064,#20065)
-enclosingStmt(#20064,#20062)
+enclosing_stmt(#20064,#20062)
 exprContainers(#20064,#20056)
 #20066=*
 exprs(#20066,81,#20064,-1,"super")
 hasLocation(#20066,#20031)
-enclosingStmt(#20066,#20062)
+enclosing_stmt(#20066,#20062)
 exprContainers(#20066,#20056)
 #20067=*
 exprs(#20067,3,#20064,0,"42")
 hasLocation(#20067,#20035)
-enclosingStmt(#20067,#20062)
+enclosing_stmt(#20067,#20062)
 exprContainers(#20067,#20056)
 literals("42","42",#20067)
 isMethod(#20053)
diff --git a/javascript/extractor/tests/es2015/output/trap/templates.js.trap b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
index 2636b98843e..cbf952349d3 100644
--- a/javascript/extractor/tests/es2015/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
@@ -459,12 +459,12 @@ exprs(#20170,34,#20168,0,"""values ... n(', ')")
 #20171=@"loc,{#10000},2,10,2,39"
 locations_default(#20171,#10000,2,10,2,39)
 hasLocation(#20170,#20171)
-enclosingStmt(#20170,#20168)
+enclosing_stmt(#20170,#20168)
 exprContainers(#20170,#20157)
 #20172=*
 exprs(#20172,4,#20170,0,"""values: """)
 hasLocation(#20172,#20039)
-enclosingStmt(#20172,#20168)
+enclosing_stmt(#20172,#20168)
 exprContainers(#20172,#20157)
 literals("values: ","""values: """,#20172)
 #20173=*
@@ -478,32 +478,32 @@ exprs(#20175,13,#20170,1,"values.join(', ')")
 #20176=@"loc,{#10000},2,23,2,39"
 locations_default(#20176,#10000,2,23,2,39)
 hasLocation(#20175,#20176)
-enclosingStmt(#20175,#20168)
+enclosing_stmt(#20175,#20168)
 exprContainers(#20175,#20157)
 #20177=*
 exprs(#20177,14,#20175,-1,"values.join")
 #20178=@"loc,{#10000},2,23,2,33"
 locations_default(#20178,#10000,2,23,2,33)
 hasLocation(#20177,#20178)
-enclosingStmt(#20177,#20168)
+enclosing_stmt(#20177,#20168)
 exprContainers(#20177,#20157)
 #20179=*
 exprs(#20179,79,#20177,0,"values")
 hasLocation(#20179,#20043)
-enclosingStmt(#20179,#20168)
+enclosing_stmt(#20179,#20168)
 exprContainers(#20179,#20157)
 literals("values","values",#20179)
 bind(#20179,#20163)
 #20180=*
 exprs(#20180,0,#20177,1,"join")
 hasLocation(#20180,#20047)
-enclosingStmt(#20180,#20168)
+enclosing_stmt(#20180,#20168)
 exprContainers(#20180,#20157)
 literals("join","join",#20180)
 #20181=*
 exprs(#20181,4,#20175,0,"', '")
 hasLocation(#20181,#20051)
-enclosingStmt(#20181,#20168)
+enclosing_stmt(#20181,#20168)
 exprContainers(#20181,#20157)
 literals(", ","', '",#20181)
 #20182=*
@@ -521,19 +521,19 @@ exprs(#20185,64,#20184,0,"x = 23")
 #20186=@"loc,{#10000},5,5,5,10"
 locations_default(#20186,#10000,5,5,5,10)
 hasLocation(#20185,#20186)
-enclosingStmt(#20185,#20184)
+enclosing_stmt(#20185,#20184)
 exprContainers(#20185,#20001)
 #20187=*
 exprs(#20187,78,#20185,0,"x")
 hasLocation(#20187,#20060)
-enclosingStmt(#20187,#20184)
+enclosing_stmt(#20187,#20184)
 exprContainers(#20187,#20001)
 literals("x","x",#20187)
 decl(#20187,#20155)
 #20188=*
 exprs(#20188,3,#20185,1,"23")
 hasLocation(#20188,#20064)
-enclosingStmt(#20188,#20184)
+enclosing_stmt(#20188,#20184)
 exprContainers(#20188,#20001)
 literals("23","23",#20188)
 #20189=*
@@ -545,19 +545,19 @@ exprs(#20190,64,#20189,0,"y = 19")
 #20191=@"loc,{#10000},6,5,6,10"
 locations_default(#20191,#10000,6,5,6,10)
 hasLocation(#20190,#20191)
-enclosingStmt(#20190,#20189)
+enclosing_stmt(#20190,#20189)
 exprContainers(#20190,#20001)
 #20192=*
 exprs(#20192,78,#20190,0,"y")
 hasLocation(#20192,#20070)
-enclosingStmt(#20192,#20189)
+enclosing_stmt(#20192,#20189)
 exprContainers(#20192,#20001)
 literals("y","y",#20192)
 decl(#20192,#20156)
 #20193=*
 exprs(#20193,3,#20190,1,"19")
 hasLocation(#20193,#20074)
-enclosingStmt(#20193,#20189)
+enclosing_stmt(#20193,#20189)
 exprContainers(#20193,#20001)
 literals("19","19",#20193)
 #20194=*
@@ -569,32 +569,32 @@ exprs(#20195,71,#20194,0,"`${x} + ... x + y}`")
 #20196=@"loc,{#10000},7,1,7,24"
 locations_default(#20196,#10000,7,1,7,24)
 hasLocation(#20195,#20196)
-enclosingStmt(#20195,#20194)
+enclosing_stmt(#20195,#20194)
 exprContainers(#20195,#20001)
 #20197=*
 exprs(#20197,79,#20195,0,"x")
 hasLocation(#20197,#20084)
-enclosingStmt(#20197,#20194)
+enclosing_stmt(#20197,#20194)
 exprContainers(#20197,#20001)
 literals("x","x",#20197)
 bind(#20197,#20155)
 #20198=*
 exprs(#20198,72,#20195,1," + ")
 hasLocation(#20198,#20088)
-enclosingStmt(#20198,#20194)
+enclosing_stmt(#20198,#20194)
 exprContainers(#20198,#20001)
 literals(" + "," + ",#20198)
 #20199=*
 exprs(#20199,79,#20195,2,"y")
 hasLocation(#20199,#20092)
-enclosingStmt(#20199,#20194)
+enclosing_stmt(#20199,#20194)
 exprContainers(#20199,#20001)
 literals("y","y",#20199)
 bind(#20199,#20156)
 #20200=*
 exprs(#20200,72,#20195,3," = ")
 hasLocation(#20200,#20096)
-enclosingStmt(#20200,#20194)
+enclosing_stmt(#20200,#20194)
 exprContainers(#20200,#20001)
 literals(" = "," = ",#20200)
 #20201=*
@@ -602,19 +602,19 @@ exprs(#20201,34,#20195,4,"x + y")
 #20202=@"loc,{#10000},7,18,7,22"
 locations_default(#20202,#10000,7,18,7,22)
 hasLocation(#20201,#20202)
-enclosingStmt(#20201,#20194)
+enclosing_stmt(#20201,#20194)
 exprContainers(#20201,#20001)
 #20203=*
 exprs(#20203,79,#20201,0,"x")
 hasLocation(#20203,#20100)
-enclosingStmt(#20203,#20194)
+enclosing_stmt(#20203,#20194)
 exprContainers(#20203,#20001)
 literals("x","x",#20203)
 bind(#20203,#20155)
 #20204=*
 exprs(#20204,79,#20201,1,"y")
 hasLocation(#20204,#20104)
-enclosingStmt(#20204,#20194)
+enclosing_stmt(#20204,#20194)
 exprContainers(#20204,#20001)
 literals("y","y",#20204)
 bind(#20204,#20156)
@@ -627,12 +627,12 @@ exprs(#20206,70,#20205,0,"tag `${ ... x + y}`")
 #20207=@"loc,{#10000},8,1,8,28"
 locations_default(#20207,#10000,8,1,8,28)
 hasLocation(#20206,#20207)
-enclosingStmt(#20206,#20205)
+enclosing_stmt(#20206,#20205)
 exprContainers(#20206,#20001)
 #20208=*
 exprs(#20208,79,#20206,0,"tag")
 hasLocation(#20208,#20114)
-enclosingStmt(#20208,#20205)
+enclosing_stmt(#20208,#20205)
 exprContainers(#20208,#20001)
 literals("tag","tag",#20208)
 bind(#20208,#20154)
@@ -641,32 +641,32 @@ exprs(#20209,71,#20206,1,"`${x} + ... x + y}`")
 #20210=@"loc,{#10000},8,5,8,28"
 locations_default(#20210,#10000,8,5,8,28)
 hasLocation(#20209,#20210)
-enclosingStmt(#20209,#20205)
+enclosing_stmt(#20209,#20205)
 exprContainers(#20209,#20001)
 #20211=*
 exprs(#20211,79,#20209,0,"x")
 hasLocation(#20211,#20122)
-enclosingStmt(#20211,#20205)
+enclosing_stmt(#20211,#20205)
 exprContainers(#20211,#20001)
 literals("x","x",#20211)
 bind(#20211,#20155)
 #20212=*
 exprs(#20212,72,#20209,1," + ")
 hasLocation(#20212,#20126)
-enclosingStmt(#20212,#20205)
+enclosing_stmt(#20212,#20205)
 exprContainers(#20212,#20001)
 literals(" + "," + ",#20212)
 #20213=*
 exprs(#20213,79,#20209,2,"y")
 hasLocation(#20213,#20130)
-enclosingStmt(#20213,#20205)
+enclosing_stmt(#20213,#20205)
 exprContainers(#20213,#20001)
 literals("y","y",#20213)
 bind(#20213,#20156)
 #20214=*
 exprs(#20214,72,#20209,3," = ")
 hasLocation(#20214,#20134)
-enclosingStmt(#20214,#20205)
+enclosing_stmt(#20214,#20205)
 exprContainers(#20214,#20001)
 literals(" = "," = ",#20214)
 #20215=*
@@ -674,19 +674,19 @@ exprs(#20215,34,#20209,4,"x + y")
 #20216=@"loc,{#10000},8,22,8,26"
 locations_default(#20216,#10000,8,22,8,26)
 hasLocation(#20215,#20216)
-enclosingStmt(#20215,#20205)
+enclosing_stmt(#20215,#20205)
 exprContainers(#20215,#20001)
 #20217=*
 exprs(#20217,79,#20215,0,"x")
 hasLocation(#20217,#20138)
-enclosingStmt(#20217,#20205)
+enclosing_stmt(#20217,#20205)
 exprContainers(#20217,#20001)
 literals("x","x",#20217)
 bind(#20217,#20155)
 #20218=*
 exprs(#20218,79,#20215,1,"y")
 hasLocation(#20218,#20142)
-enclosingStmt(#20218,#20205)
+enclosing_stmt(#20218,#20205)
 exprContainers(#20218,#20001)
 literals("y","y",#20218)
 bind(#20218,#20156)
diff --git a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
index 245725a6448..c622f3895dc 100644
--- a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
@@ -121,7 +121,7 @@ exprs(#20039,82,#20037,0,"new.source")
 #20040=@"loc,{#10000},2,3,2,12"
 locations_default(#20040,#10000,2,3,2,12)
 hasLocation(#20039,#20040)
-enclosingStmt(#20039,#20037)
+enclosing_stmt(#20039,#20037)
 exprContainers(#20039,#20031)
 #20041=*
 entry_cfg_node(#20041,#20001)
diff --git a/javascript/extractor/tests/es2015/output/trap/yield.js.trap b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
index 3f3d124f4fc..791f7b8a42a 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
@@ -204,19 +204,19 @@ exprs(#20070,64,#20068,0,"index = 0")
 #20071=@"loc,{#10000},2,7,2,15"
 locations_default(#20071,#10000,2,7,2,15)
 hasLocation(#20070,#20071)
-enclosingStmt(#20070,#20068)
+enclosing_stmt(#20070,#20068)
 exprContainers(#20070,#20061)
 #20072=*
 exprs(#20072,78,#20070,0,"index")
 hasLocation(#20072,#20029)
-enclosingStmt(#20072,#20068)
+enclosing_stmt(#20072,#20068)
 exprContainers(#20072,#20061)
 literals("index","index",#20072)
 decl(#20072,#20064)
 #20073=*
 exprs(#20073,3,#20070,1,"0")
 hasLocation(#20073,#20033)
-enclosingStmt(#20073,#20068)
+enclosing_stmt(#20073,#20068)
 exprContainers(#20073,#20061)
 literals("0","0",#20073)
 #20074=*
@@ -230,19 +230,19 @@ exprs(#20076,28,#20074,0,"index <= 2")
 #20077=@"loc,{#10000},3,9,3,18"
 locations_default(#20077,#10000,3,9,3,18)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20074)
+enclosing_stmt(#20076,#20074)
 exprContainers(#20076,#20061)
 #20078=*
 exprs(#20078,79,#20076,0,"index")
 hasLocation(#20078,#20041)
-enclosingStmt(#20078,#20074)
+enclosing_stmt(#20078,#20074)
 exprContainers(#20078,#20061)
 literals("index","index",#20078)
 bind(#20078,#20064)
 #20079=*
 exprs(#20079,3,#20076,1,"2")
 hasLocation(#20079,#20045)
-enclosingStmt(#20079,#20074)
+enclosing_stmt(#20079,#20074)
 exprContainers(#20079,#20061)
 literals("2","2",#20079)
 #20080=*
@@ -256,19 +256,19 @@ exprs(#20082,69,#20080,0,"yield index++")
 #20083=@"loc,{#10000},4,5,4,17"
 locations_default(#20083,#10000,4,5,4,17)
 hasLocation(#20082,#20083)
-enclosingStmt(#20082,#20080)
+enclosing_stmt(#20082,#20080)
 exprContainers(#20082,#20061)
 #20084=*
 exprs(#20084,60,#20082,0,"index++")
 #20085=@"loc,{#10000},4,11,4,17"
 locations_default(#20085,#10000,4,11,4,17)
 hasLocation(#20084,#20085)
-enclosingStmt(#20084,#20080)
+enclosing_stmt(#20084,#20080)
 exprContainers(#20084,#20061)
 #20086=*
 exprs(#20086,79,#20084,0,"index")
 hasLocation(#20086,#20051)
-enclosingStmt(#20086,#20080)
+enclosing_stmt(#20086,#20080)
 exprContainers(#20086,#20061)
 literals("index","index",#20086)
 bind(#20086,#20064)
diff --git a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
index 4f01dc62b1e..659ac923a9e 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
@@ -118,7 +118,7 @@ stmt_containers(#20036,#20029)
 #20038=*
 exprs(#20038,69,#20036,0,"yield")
 hasLocation(#20038,#20021)
-enclosingStmt(#20038,#20036)
+enclosing_stmt(#20038,#20036)
 exprContainers(#20038,#20029)
 #20039=*
 entry_cfg_node(#20039,#20001)
diff --git a/javascript/extractor/tests/es2016/output/trap/exp.js.trap b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
index 885815219bf..570cec835eb 100644
--- a/javascript/extractor/tests/es2016/output/trap/exp.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
@@ -67,18 +67,18 @@ stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,87,#20021,0,"1**0")
 hasLocation(#20022,#20003)
-enclosingStmt(#20022,#20021)
+enclosing_stmt(#20022,#20021)
 exprContainers(#20022,#20001)
 #20023=*
 exprs(#20023,3,#20022,0,"1")
 hasLocation(#20023,#20007)
-enclosingStmt(#20023,#20021)
+enclosing_stmt(#20023,#20021)
 exprContainers(#20023,#20001)
 literals("1","1",#20023)
 #20024=*
 exprs(#20024,3,#20022,1,"0")
 hasLocation(#20024,#20011)
-enclosingStmt(#20024,#20021)
+enclosing_stmt(#20024,#20021)
 exprContainers(#20024,#20001)
 literals("0","0",#20024)
 #20025=*
@@ -88,12 +88,12 @@ stmt_containers(#20025,#20001)
 #20026=*
 exprs(#20026,88,#20025,0,"x**=2")
 hasLocation(#20026,#20005)
-enclosingStmt(#20026,#20025)
+enclosing_stmt(#20026,#20025)
 exprContainers(#20026,#20001)
 #20027=*
 exprs(#20027,79,#20026,0,"x")
 hasLocation(#20027,#20013)
-enclosingStmt(#20027,#20025)
+enclosing_stmt(#20027,#20025)
 exprContainers(#20027,#20001)
 literals("x","x",#20027)
 #20028=@"var;{x};{#20000}"
@@ -102,7 +102,7 @@ bind(#20027,#20028)
 #20029=*
 exprs(#20029,3,#20026,1,"2")
 hasLocation(#20029,#20017)
-enclosingStmt(#20029,#20025)
+enclosing_stmt(#20029,#20025)
 exprContainers(#20029,#20001)
 literals("2","2",#20029)
 #20030=*
diff --git a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
index 6baf32985f0..f077c34bb2b 100644
--- a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
@@ -124,7 +124,7 @@ stmt_containers(#20038,#20029)
 #20040=*
 exprs(#20040,4,#20038,0,"'use strict'")
 hasLocation(#20040,#20021)
-enclosingStmt(#20040,#20038)
+enclosing_stmt(#20040,#20038)
 exprContainers(#20040,#20029)
 literals("use strict","'use strict'",#20040)
 #20041=*
diff --git a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
index a85833a4ef3..ce1f3bba90d 100644
--- a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
@@ -262,12 +262,12 @@ exprs(#20088,92,#20086,0,"await x")
 #20089=@"loc,{#10000},3,5,3,11"
 locations_default(#20089,#10000,3,5,3,11)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20073)
 #20090=*
 exprs(#20090,79,#20088,0,"x")
 hasLocation(#20090,#20039)
-enclosingStmt(#20090,#20086)
+enclosing_stmt(#20090,#20086)
 exprContainers(#20090,#20073)
 literals("x","x",#20090)
 bind(#20090,#20077)
@@ -286,7 +286,7 @@ variables(#20094,"e",#20093)
 #20095=*
 exprs(#20095,78,#20091,0,"e")
 hasLocation(#20095,#20049)
-enclosingStmt(#20095,#20091)
+enclosing_stmt(#20095,#20091)
 exprContainers(#20095,#20073)
 literals("e","e",#20095)
 decl(#20095,#20094)
@@ -305,7 +305,7 @@ stmt_containers(#20098,#20073)
 #20100=*
 exprs(#20100,1,#20098,0,"null")
 hasLocation(#20100,#20057)
-enclosingStmt(#20100,#20098)
+enclosing_stmt(#20100,#20098)
 exprContainers(#20100,#20073)
 literals("null","null",#20100)
 #20101=*
diff --git a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
index a0350dbac2c..e276fe5fa5b 100644
--- a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
@@ -87,7 +87,7 @@ exprs(#20028,9,#20026,0,"async function () {}")
 #20029=@"loc,{#10000},1,16,1,35"
 locations_default(#20029,#10000,1,16,1,35)
 hasLocation(#20028,#20029)
-enclosingStmt(#20028,#20026)
+enclosing_stmt(#20028,#20026)
 exprContainers(#20028,#20001)
 #20030=*
 scopes(#20030,1)
diff --git a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
index 9cec3af2030..e32212174d3 100644
--- a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
@@ -79,12 +79,12 @@ stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,47,#20026,0,"f = async ((x)) => x")
 hasLocation(#20027,#20003)
-enclosingStmt(#20027,#20026)
+enclosing_stmt(#20027,#20026)
 exprContainers(#20027,#20001)
 #20028=*
 exprs(#20028,79,#20027,0,"f")
 hasLocation(#20028,#20005)
-enclosingStmt(#20028,#20026)
+enclosing_stmt(#20028,#20026)
 exprContainers(#20028,#20001)
 literals("f","f",#20028)
 #20029=@"var;{f};{#20000}"
@@ -95,7 +95,7 @@ exprs(#20030,65,#20027,1,"async ((x)) => x")
 #20031=@"loc,{#10000},1,5,1,20"
 locations_default(#20031,#10000,1,5,1,20)
 hasLocation(#20030,#20031)
-enclosingStmt(#20030,#20026)
+enclosing_stmt(#20030,#20026)
 exprContainers(#20030,#20001)
 #20032=*
 scopes(#20032,1)
diff --git a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
index 7c4a17b6f94..f112f42a3ab 100644
--- a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
@@ -64,14 +64,14 @@ exprs(#20020,63,#20019,0,"({ async })")
 #20021=@"loc,{#10000},1,1,1,11"
 locations_default(#20021,#10000,1,1,1,11)
 hasLocation(#20020,#20021)
-enclosingStmt(#20020,#20019)
+enclosing_stmt(#20020,#20019)
 exprContainers(#20020,#20001)
 #20022=*
 exprs(#20022,8,#20020,0,"{ async }")
 #20023=@"loc,{#10000},1,2,1,10"
 locations_default(#20023,#10000,1,2,1,10)
 hasLocation(#20022,#20023)
-enclosingStmt(#20022,#20019)
+enclosing_stmt(#20022,#20019)
 exprContainers(#20022,#20001)
 #20024=*
 properties(#20024,#20022,0,0,"async")
@@ -79,13 +79,13 @@ hasLocation(#20024,#20009)
 #20025=*
 exprs(#20025,0,#20024,0,"async")
 hasLocation(#20025,#20009)
-enclosingStmt(#20025,#20019)
+enclosing_stmt(#20025,#20019)
 exprContainers(#20025,#20001)
 literals("async","async",#20025)
 #20026=*
 exprs(#20026,79,#20024,1,"async")
 hasLocation(#20026,#20009)
-enclosingStmt(#20026,#20019)
+enclosing_stmt(#20026,#20019)
 exprContainers(#20026,#20001)
 literals("async","async",#20026)
 #20027=@"var;{async};{#20000}"
diff --git a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
index a8bde3cff51..db6d718490b 100644
--- a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
@@ -397,7 +397,7 @@ stmt_containers(#20143,#20001)
 #20145=*
 exprs(#20145,78,#20143,0,"C")
 hasLocation(#20145,#20043)
-enclosingStmt(#20145,#20143)
+enclosing_stmt(#20145,#20143)
 exprContainers(#20145,#20001)
 literals("C","C",#20145)
 decl(#20145,#20135)
@@ -414,7 +414,7 @@ hasLocation(#20147,#20148)
 #20149=*
 exprs(#20149,0,#20147,0,"asyncMeth")
 hasLocation(#20149,#20051)
-enclosingStmt(#20149,#20143)
+enclosing_stmt(#20149,#20143)
 exprContainers(#20149,#20001)
 literals("asyncMeth","asyncMeth",#20149)
 #20150=*
@@ -422,7 +422,7 @@ exprs(#20150,9,#20147,1,"() {}")
 #20151=@"loc,{#10000},4,19,4,23"
 locations_default(#20151,#10000,4,19,4,23)
 hasLocation(#20150,#20151)
-enclosingStmt(#20150,#20143)
+enclosing_stmt(#20150,#20143)
 exprContainers(#20150,#20001)
 #20152=*
 scopes(#20152,1)
@@ -450,12 +450,12 @@ exprs(#20158,14,#20156,0,"Symbol.asyncIterator")
 #20159=@"loc,{#10000},5,11,5,30"
 locations_default(#20159,#10000,5,11,5,30)
 hasLocation(#20158,#20159)
-enclosingStmt(#20158,#20143)
+enclosing_stmt(#20158,#20143)
 exprContainers(#20158,#20001)
 #20160=*
 exprs(#20160,79,#20158,0,"Symbol")
 hasLocation(#20160,#20067)
-enclosingStmt(#20160,#20143)
+enclosing_stmt(#20160,#20143)
 exprContainers(#20160,#20001)
 literals("Symbol","Symbol",#20160)
 #20161=@"var;{Symbol};{#20000}"
@@ -464,7 +464,7 @@ bind(#20160,#20161)
 #20162=*
 exprs(#20162,0,#20158,1,"asyncIterator")
 hasLocation(#20162,#20071)
-enclosingStmt(#20162,#20143)
+enclosing_stmt(#20162,#20143)
 exprContainers(#20162,#20001)
 literals("asyncIterator","asyncIterator",#20162)
 #20163=*
@@ -472,7 +472,7 @@ exprs(#20163,9,#20156,1,"() {}")
 #20164=@"loc,{#10000},5,32,5,36"
 locations_default(#20164,#10000,5,32,5,36)
 hasLocation(#20163,#20164)
-enclosingStmt(#20163,#20143)
+enclosing_stmt(#20163,#20143)
 exprContainers(#20163,#20001)
 #20165=*
 scopes(#20165,1)
@@ -499,13 +499,13 @@ hasLocation(#20169,#20170)
 #20171=*
 exprs(#20171,0,#20169,0,"constructor")
 hasLocation(#20171,#20170)
-enclosingStmt(#20171,#20143)
+enclosing_stmt(#20171,#20143)
 exprContainers(#20171,#20001)
 literals("constructor","constructor",#20171)
 #20172=*
 exprs(#20172,9,#20169,1,"() {}")
 hasLocation(#20172,#20170)
-enclosingStmt(#20172,#20143)
+enclosing_stmt(#20172,#20143)
 exprContainers(#20172,#20001)
 #20173=*
 scopes(#20173,1)
@@ -530,12 +530,12 @@ exprs(#20178,64,#20176,0,"o = {\n  ... () {}\n}")
 #20179=@"loc,{#10000},8,5,11,1"
 locations_default(#20179,#10000,8,5,11,1)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20176)
+enclosing_stmt(#20178,#20176)
 exprContainers(#20178,#20001)
 #20180=*
 exprs(#20180,78,#20178,0,"o")
 hasLocation(#20180,#20086)
-enclosingStmt(#20180,#20176)
+enclosing_stmt(#20180,#20176)
 exprContainers(#20180,#20001)
 literals("o","o",#20180)
 decl(#20180,#20134)
@@ -544,7 +544,7 @@ exprs(#20181,8,#20178,1,"{\n  asy ... () {}\n}")
 #20182=@"loc,{#10000},8,9,11,1"
 locations_default(#20182,#10000,8,9,11,1)
 hasLocation(#20181,#20182)
-enclosingStmt(#20181,#20176)
+enclosing_stmt(#20181,#20176)
 exprContainers(#20181,#20001)
 #20183=*
 properties(#20183,#20181,0,0,"async * ... th() {}")
@@ -554,7 +554,7 @@ hasLocation(#20183,#20184)
 #20185=*
 exprs(#20185,0,#20183,0,"asyncMeth")
 hasLocation(#20185,#20096)
-enclosingStmt(#20185,#20176)
+enclosing_stmt(#20185,#20176)
 exprContainers(#20185,#20001)
 literals("asyncMeth","asyncMeth",#20185)
 #20186=*
@@ -562,7 +562,7 @@ exprs(#20186,9,#20183,1,"() {}")
 #20187=@"loc,{#10000},9,19,9,23"
 locations_default(#20187,#10000,9,19,9,23)
 hasLocation(#20186,#20187)
-enclosingStmt(#20186,#20176)
+enclosing_stmt(#20186,#20176)
 exprContainers(#20186,#20001)
 #20188=*
 scopes(#20188,1)
@@ -590,19 +590,19 @@ exprs(#20194,14,#20192,0,"Symbol.asyncIterator")
 #20195=@"loc,{#10000},10,11,10,30"
 locations_default(#20195,#10000,10,11,10,30)
 hasLocation(#20194,#20195)
-enclosingStmt(#20194,#20176)
+enclosing_stmt(#20194,#20176)
 exprContainers(#20194,#20001)
 #20196=*
 exprs(#20196,79,#20194,0,"Symbol")
 hasLocation(#20196,#20114)
-enclosingStmt(#20196,#20176)
+enclosing_stmt(#20196,#20176)
 exprContainers(#20196,#20001)
 literals("Symbol","Symbol",#20196)
 bind(#20196,#20161)
 #20197=*
 exprs(#20197,0,#20194,1,"asyncIterator")
 hasLocation(#20197,#20118)
-enclosingStmt(#20197,#20176)
+enclosing_stmt(#20197,#20176)
 exprContainers(#20197,#20001)
 literals("asyncIterator","asyncIterator",#20197)
 #20198=*
@@ -610,7 +610,7 @@ exprs(#20198,9,#20192,1,"() {}")
 #20199=@"loc,{#10000},10,32,10,36"
 locations_default(#20199,#10000,10,32,10,36)
 hasLocation(#20198,#20199)
-enclosingStmt(#20198,#20176)
+enclosing_stmt(#20198,#20176)
 exprContainers(#20198,#20001)
 #20200=*
 scopes(#20200,1)
diff --git a/javascript/extractor/tests/es2018/output/trap/templates.js.trap b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
index b2881fe607d..cfb729d1905 100644
--- a/javascript/extractor/tests/es2018/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
@@ -385,52 +385,52 @@ stmt_containers(#20143,#20001)
 #20145=*
 exprs(#20145,70,#20143,0,"`foo`\n` ... \u25a0`")
 hasLocation(#20145,#20144)
-enclosingStmt(#20145,#20143)
+enclosing_stmt(#20145,#20143)
 exprContainers(#20145,#20001)
 #20146=*
 exprs(#20146,70,#20145,0,"`foo`\n`foo\u25a0`")
 #20147=@"loc,{#10000},1,1,2,11"
 locations_default(#20147,#10000,1,1,2,11)
 hasLocation(#20146,#20147)
-enclosingStmt(#20146,#20143)
+enclosing_stmt(#20146,#20143)
 exprContainers(#20146,#20001)
 #20148=*
 exprs(#20148,71,#20146,0,"`foo`")
 hasLocation(#20148,#20003)
-enclosingStmt(#20148,#20143)
+enclosing_stmt(#20148,#20143)
 exprContainers(#20148,#20001)
 #20149=*
 exprs(#20149,72,#20148,0,"foo")
 hasLocation(#20149,#20029)
-enclosingStmt(#20149,#20143)
+enclosing_stmt(#20149,#20143)
 exprContainers(#20149,#20001)
 literals("foo","foo",#20149)
 #20150=*
 exprs(#20150,71,#20146,1,"`foo\u25a0`")
 hasLocation(#20150,#20005)
-enclosingStmt(#20150,#20143)
+enclosing_stmt(#20150,#20143)
 exprContainers(#20150,#20001)
 #20151=*
 exprs(#20151,72,#20150,0,"foo\u25a0")
 hasLocation(#20151,#20035)
-enclosingStmt(#20151,#20143)
+enclosing_stmt(#20151,#20143)
 exprContainers(#20151,#20001)
 literals("foo■","foo\u25a0",#20151)
 #20152=*
 exprs(#20152,71,#20145,1,"`foo${bar}\u25a0`")
 hasLocation(#20152,#20007)
-enclosingStmt(#20152,#20143)
+enclosing_stmt(#20152,#20143)
 exprContainers(#20152,#20001)
 #20153=*
 exprs(#20153,72,#20152,0,"foo")
 hasLocation(#20153,#20041)
-enclosingStmt(#20153,#20143)
+enclosing_stmt(#20153,#20143)
 exprContainers(#20153,#20001)
 literals("foo","foo",#20153)
 #20154=*
 exprs(#20154,79,#20152,1,"bar")
 hasLocation(#20154,#20045)
-enclosingStmt(#20154,#20143)
+enclosing_stmt(#20154,#20143)
 exprContainers(#20154,#20001)
 literals("bar","bar",#20154)
 #20155=@"var;{bar};{#20000}"
@@ -439,7 +439,7 @@ bind(#20154,#20155)
 #20156=*
 exprs(#20156,72,#20152,2,"\u25a0")
 hasLocation(#20156,#20049)
-enclosingStmt(#20156,#20143)
+enclosing_stmt(#20156,#20143)
 exprContainers(#20156,#20001)
 literals("■","\u25a0",#20156)
 #20157=*
@@ -449,12 +449,12 @@ stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,70,#20157,0,"foo `\u25a0`")
 hasLocation(#20158,#20009)
-enclosingStmt(#20158,#20157)
+enclosing_stmt(#20158,#20157)
 exprContainers(#20158,#20001)
 #20159=*
 exprs(#20159,79,#20158,0,"foo")
 hasLocation(#20159,#20053)
-enclosingStmt(#20159,#20157)
+enclosing_stmt(#20159,#20157)
 exprContainers(#20159,#20001)
 literals("foo","foo",#20159)
 #20160=@"var;{foo};{#20000}"
@@ -465,12 +465,12 @@ exprs(#20161,71,#20158,1,"`\u25a0`")
 #20162=@"loc,{#10000},4,5,4,12"
 locations_default(#20162,#10000,4,5,4,12)
 hasLocation(#20161,#20162)
-enclosingStmt(#20161,#20157)
+enclosing_stmt(#20161,#20157)
 exprContainers(#20161,#20001)
 #20163=*
 exprs(#20163,72,#20161,0,"\u25a0")
 hasLocation(#20163,#20057)
-enclosingStmt(#20163,#20157)
+enclosing_stmt(#20163,#20157)
 exprContainers(#20163,#20001)
 literals("■","\u25a0",#20163)
 #20164=*
@@ -480,12 +480,12 @@ stmt_containers(#20164,#20001)
 #20165=*
 exprs(#20165,70,#20164,0,"foo `fo ... \u25a0`")
 hasLocation(#20165,#20011)
-enclosingStmt(#20165,#20164)
+enclosing_stmt(#20165,#20164)
 exprContainers(#20165,#20001)
 #20166=*
 exprs(#20166,79,#20165,0,"foo")
 hasLocation(#20166,#20061)
-enclosingStmt(#20166,#20164)
+enclosing_stmt(#20166,#20164)
 exprContainers(#20166,#20001)
 literals("foo","foo",#20166)
 bind(#20166,#20160)
@@ -494,25 +494,25 @@ exprs(#20167,71,#20165,1,"`foo${bar}\u25a0`")
 #20168=@"loc,{#10000},5,5,5,21"
 locations_default(#20168,#10000,5,5,5,21)
 hasLocation(#20167,#20168)
-enclosingStmt(#20167,#20164)
+enclosing_stmt(#20167,#20164)
 exprContainers(#20167,#20001)
 #20169=*
 exprs(#20169,72,#20167,0,"foo")
 hasLocation(#20169,#20065)
-enclosingStmt(#20169,#20164)
+enclosing_stmt(#20169,#20164)
 exprContainers(#20169,#20001)
 literals("foo","foo",#20169)
 #20170=*
 exprs(#20170,79,#20167,1,"bar")
 hasLocation(#20170,#20069)
-enclosingStmt(#20170,#20164)
+enclosing_stmt(#20170,#20164)
 exprContainers(#20170,#20001)
 literals("bar","bar",#20170)
 bind(#20170,#20155)
 #20171=*
 exprs(#20171,72,#20167,2,"\u25a0")
 hasLocation(#20171,#20073)
-enclosingStmt(#20171,#20164)
+enclosing_stmt(#20171,#20164)
 exprContainers(#20171,#20001)
 literals("■","\u25a0",#20171)
 #20172=*
@@ -522,12 +522,12 @@ stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,70,#20172,0,"foo `\unicode`")
 hasLocation(#20173,#20013)
-enclosingStmt(#20173,#20172)
+enclosing_stmt(#20173,#20172)
 exprContainers(#20173,#20001)
 #20174=*
 exprs(#20174,79,#20173,0,"foo")
 hasLocation(#20174,#20077)
-enclosingStmt(#20174,#20172)
+enclosing_stmt(#20174,#20172)
 exprContainers(#20174,#20001)
 literals("foo","foo",#20174)
 bind(#20174,#20160)
@@ -536,12 +536,12 @@ exprs(#20175,71,#20173,1,"`\unicode`")
 #20176=@"loc,{#10000},6,5,6,14"
 locations_default(#20176,#10000,6,5,6,14)
 hasLocation(#20175,#20176)
-enclosingStmt(#20175,#20172)
+enclosing_stmt(#20175,#20172)
 exprContainers(#20175,#20001)
 #20177=*
 exprs(#20177,72,#20175,0,"\unicode")
 hasLocation(#20177,#20081)
-enclosingStmt(#20177,#20172)
+enclosing_stmt(#20177,#20172)
 exprContainers(#20177,#20001)
 literals("","\unicode",#20177)
 #20178=*
@@ -551,12 +551,12 @@ stmt_containers(#20178,#20001)
 #20179=*
 exprs(#20179,70,#20178,0,"foo `fo ... nicode`")
 hasLocation(#20179,#20015)
-enclosingStmt(#20179,#20178)
+enclosing_stmt(#20179,#20178)
 exprContainers(#20179,#20001)
 #20180=*
 exprs(#20180,79,#20179,0,"foo")
 hasLocation(#20180,#20085)
-enclosingStmt(#20180,#20178)
+enclosing_stmt(#20180,#20178)
 exprContainers(#20180,#20001)
 literals("foo","foo",#20180)
 bind(#20180,#20160)
@@ -565,25 +565,25 @@ exprs(#20181,71,#20179,1,"`foo${bar}\unicode`")
 #20182=@"loc,{#10000},7,5,7,23"
 locations_default(#20182,#10000,7,5,7,23)
 hasLocation(#20181,#20182)
-enclosingStmt(#20181,#20178)
+enclosing_stmt(#20181,#20178)
 exprContainers(#20181,#20001)
 #20183=*
 exprs(#20183,72,#20181,0,"foo")
 hasLocation(#20183,#20089)
-enclosingStmt(#20183,#20178)
+enclosing_stmt(#20183,#20178)
 exprContainers(#20183,#20001)
 literals("foo","foo",#20183)
 #20184=*
 exprs(#20184,79,#20181,1,"bar")
 hasLocation(#20184,#20093)
-enclosingStmt(#20184,#20178)
+enclosing_stmt(#20184,#20178)
 exprContainers(#20184,#20001)
 literals("bar","bar",#20184)
 bind(#20184,#20155)
 #20185=*
 exprs(#20185,72,#20181,2,"\unicode")
 hasLocation(#20185,#20097)
-enclosingStmt(#20185,#20178)
+enclosing_stmt(#20185,#20178)
 exprContainers(#20185,#20001)
 literals("","\unicode",#20185)
 #20186=*
@@ -593,12 +593,12 @@ stmt_containers(#20186,#20001)
 #20187=*
 exprs(#20187,70,#20186,0,"foo `\u`")
 hasLocation(#20187,#20017)
-enclosingStmt(#20187,#20186)
+enclosing_stmt(#20187,#20186)
 exprContainers(#20187,#20001)
 #20188=*
 exprs(#20188,79,#20187,0,"foo")
 hasLocation(#20188,#20101)
-enclosingStmt(#20188,#20186)
+enclosing_stmt(#20188,#20186)
 exprContainers(#20188,#20001)
 literals("foo","foo",#20188)
 bind(#20188,#20160)
@@ -607,12 +607,12 @@ exprs(#20189,71,#20187,1,"`\u`")
 #20190=@"loc,{#10000},8,5,8,8"
 locations_default(#20190,#10000,8,5,8,8)
 hasLocation(#20189,#20190)
-enclosingStmt(#20189,#20186)
+enclosing_stmt(#20189,#20186)
 exprContainers(#20189,#20001)
 #20191=*
 exprs(#20191,72,#20189,0,"\u")
 hasLocation(#20191,#20105)
-enclosingStmt(#20191,#20186)
+enclosing_stmt(#20191,#20186)
 exprContainers(#20191,#20001)
 literals("","\u",#20191)
 #20192=*
@@ -622,12 +622,12 @@ stmt_containers(#20192,#20001)
 #20193=*
 exprs(#20193,70,#20192,0,"foo `\u{`")
 hasLocation(#20193,#20019)
-enclosingStmt(#20193,#20192)
+enclosing_stmt(#20193,#20192)
 exprContainers(#20193,#20001)
 #20194=*
 exprs(#20194,79,#20193,0,"foo")
 hasLocation(#20194,#20109)
-enclosingStmt(#20194,#20192)
+enclosing_stmt(#20194,#20192)
 exprContainers(#20194,#20001)
 literals("foo","foo",#20194)
 bind(#20194,#20160)
@@ -636,12 +636,12 @@ exprs(#20195,71,#20193,1,"`\u{`")
 #20196=@"loc,{#10000},9,5,9,9"
 locations_default(#20196,#10000,9,5,9,9)
 hasLocation(#20195,#20196)
-enclosingStmt(#20195,#20192)
+enclosing_stmt(#20195,#20192)
 exprContainers(#20195,#20001)
 #20197=*
 exprs(#20197,72,#20195,0,"\u{")
 hasLocation(#20197,#20113)
-enclosingStmt(#20197,#20192)
+enclosing_stmt(#20197,#20192)
 exprContainers(#20197,#20001)
 literals("","\u{",#20197)
 #20198=*
@@ -651,12 +651,12 @@ stmt_containers(#20198,#20001)
 #20199=*
 exprs(#20199,70,#20198,0,"foo `\u{abcdx`")
 hasLocation(#20199,#20021)
-enclosingStmt(#20199,#20198)
+enclosing_stmt(#20199,#20198)
 exprContainers(#20199,#20001)
 #20200=*
 exprs(#20200,79,#20199,0,"foo")
 hasLocation(#20200,#20117)
-enclosingStmt(#20200,#20198)
+enclosing_stmt(#20200,#20198)
 exprContainers(#20200,#20001)
 literals("foo","foo",#20200)
 bind(#20200,#20160)
@@ -665,12 +665,12 @@ exprs(#20201,71,#20199,1,"`\u{abcdx`")
 #20202=@"loc,{#10000},10,5,10,14"
 locations_default(#20202,#10000,10,5,10,14)
 hasLocation(#20201,#20202)
-enclosingStmt(#20201,#20198)
+enclosing_stmt(#20201,#20198)
 exprContainers(#20201,#20001)
 #20203=*
 exprs(#20203,72,#20201,0,"\u{abcdx")
 hasLocation(#20203,#20121)
-enclosingStmt(#20203,#20198)
+enclosing_stmt(#20203,#20198)
 exprContainers(#20203,#20001)
 literals("","\u{abcdx",#20203)
 #20204=*
@@ -680,12 +680,12 @@ stmt_containers(#20204,#20001)
 #20205=*
 exprs(#20205,70,#20204,0,"foo `\u{abcdx}`")
 hasLocation(#20205,#20023)
-enclosingStmt(#20205,#20204)
+enclosing_stmt(#20205,#20204)
 exprContainers(#20205,#20001)
 #20206=*
 exprs(#20206,79,#20205,0,"foo")
 hasLocation(#20206,#20125)
-enclosingStmt(#20206,#20204)
+enclosing_stmt(#20206,#20204)
 exprContainers(#20206,#20001)
 literals("foo","foo",#20206)
 bind(#20206,#20160)
@@ -694,12 +694,12 @@ exprs(#20207,71,#20205,1,"`\u{abcdx}`")
 #20208=@"loc,{#10000},11,5,11,15"
 locations_default(#20208,#10000,11,5,11,15)
 hasLocation(#20207,#20208)
-enclosingStmt(#20207,#20204)
+enclosing_stmt(#20207,#20204)
 exprContainers(#20207,#20001)
 #20209=*
 exprs(#20209,72,#20207,0,"\u{abcdx}")
 hasLocation(#20209,#20129)
-enclosingStmt(#20209,#20204)
+enclosing_stmt(#20209,#20204)
 exprContainers(#20209,#20001)
 literals("","\u{abcdx}",#20209)
 #20210=*
@@ -709,12 +709,12 @@ stmt_containers(#20210,#20001)
 #20211=*
 exprs(#20211,70,#20210,0,"foo `\unicode\\`")
 hasLocation(#20211,#20025)
-enclosingStmt(#20211,#20210)
+enclosing_stmt(#20211,#20210)
 exprContainers(#20211,#20001)
 #20212=*
 exprs(#20212,79,#20211,0,"foo")
 hasLocation(#20212,#20133)
-enclosingStmt(#20212,#20210)
+enclosing_stmt(#20212,#20210)
 exprContainers(#20212,#20001)
 literals("foo","foo",#20212)
 bind(#20212,#20160)
@@ -723,12 +723,12 @@ exprs(#20213,71,#20211,1,"`\unicode\\`")
 #20214=@"loc,{#10000},12,5,12,16"
 locations_default(#20214,#10000,12,5,12,16)
 hasLocation(#20213,#20214)
-enclosingStmt(#20213,#20210)
+enclosing_stmt(#20213,#20210)
 exprContainers(#20213,#20001)
 #20215=*
 exprs(#20215,72,#20213,0,"\unicode\\")
 hasLocation(#20215,#20137)
-enclosingStmt(#20215,#20210)
+enclosing_stmt(#20215,#20210)
 exprContainers(#20215,#20001)
 literals("","\unicode\\",#20215)
 #20216=*
diff --git a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
index 7a17373a380..bdb79e051d3 100644
--- a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
+++ b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
@@ -104,19 +104,19 @@ exprs(#20036,64,#20034,0,"s1 = ""ab\u2028c""")
 #20037=@"loc,{#10000},1,5,1,15"
 locations_default(#20037,#10000,1,5,1,15)
 hasLocation(#20036,#20037)
-enclosingStmt(#20036,#20034)
+enclosing_stmt(#20036,#20034)
 exprContainers(#20036,#20001)
 #20038=*
 exprs(#20038,78,#20036,0,"s1")
 hasLocation(#20038,#20013)
-enclosingStmt(#20038,#20034)
+enclosing_stmt(#20038,#20034)
 exprContainers(#20038,#20001)
 literals("s1","s1",#20038)
 decl(#20038,#20032)
 #20039=*
 exprs(#20039,4,#20036,1,"""ab\u2028c""")
 hasLocation(#20039,#20017)
-enclosingStmt(#20039,#20034)
+enclosing_stmt(#20039,#20034)
 exprContainers(#20039,#20001)
 literals("ab
c","""ab
c""",#20039)
 #20040=*
@@ -136,19 +136,19 @@ exprs(#20044,64,#20042,0,"s2 = ""ab\u2029c""")
 #20045=@"loc,{#10000},2,5,2,15"
 locations_default(#20045,#10000,2,5,2,15)
 hasLocation(#20044,#20045)
-enclosingStmt(#20044,#20042)
+enclosing_stmt(#20044,#20042)
 exprContainers(#20044,#20001)
 #20046=*
 exprs(#20046,78,#20044,0,"s2")
 hasLocation(#20046,#20022)
-enclosingStmt(#20046,#20042)
+enclosing_stmt(#20046,#20042)
 exprContainers(#20046,#20001)
 literals("s2","s2",#20046)
 decl(#20046,#20033)
 #20047=*
 exprs(#20047,4,#20044,1,"""ab\u2029c""")
 hasLocation(#20047,#20026)
-enclosingStmt(#20047,#20042)
+enclosing_stmt(#20047,#20042)
 exprContainers(#20047,#20001)
 literals("ab
c","""ab
c""",#20047)
 #20048=*
diff --git a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
index 736b12967ec..a28cb44c367 100644
--- a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
@@ -252,12 +252,12 @@ exprs(#20086,13,#20084,1,"foo()")
 #20087=@"loc,{#10000},5,22,5,26"
 locations_default(#20087,#10000,5,22,5,26)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20084)
+enclosing_stmt(#20086,#20084)
 exprContainers(#20086,#20076)
 #20088=*
 exprs(#20088,79,#20086,-1,"foo")
 hasLocation(#20088,#20054)
-enclosingStmt(#20088,#20084)
+enclosing_stmt(#20088,#20084)
 exprContainers(#20088,#20076)
 literals("foo","foo",#20088)
 bind(#20088,#20067)
@@ -270,12 +270,12 @@ stmt_containers(#20089,#20076)
 #20091=*
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20050)
-enclosingStmt(#20091,#20089)
+enclosing_stmt(#20091,#20089)
 exprContainers(#20091,#20076)
 #20092=*
 exprs(#20092,78,#20091,0,"x")
 hasLocation(#20092,#20050)
-enclosingStmt(#20092,#20089)
+enclosing_stmt(#20092,#20089)
 exprContainers(#20092,#20076)
 literals("x","x",#20092)
 decl(#20092,#20080)
diff --git a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
index df2bb2aae24..374bdae0027 100644
--- a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
@@ -379,7 +379,7 @@ variables(#20141,"e",#20140)
 #20142=*
 exprs(#20142,78,#20139,0,"e")
 hasLocation(#20142,#20033)
-enclosingStmt(#20142,#20139)
+enclosing_stmt(#20142,#20139)
 exprContainers(#20142,#20001)
 literals("e","e",#20142)
 decl(#20142,#20141)
@@ -388,19 +388,19 @@ exprs(#20143,43,#20139,2,"e insta ... peError")
 #20144=@"loc,{#10000},2,13,2,34"
 locations_default(#20144,#10000,2,13,2,34)
 hasLocation(#20143,#20144)
-enclosingStmt(#20143,#20139)
+enclosing_stmt(#20143,#20139)
 exprContainers(#20143,#20001)
 #20145=*
 exprs(#20145,79,#20143,0,"e")
 hasLocation(#20145,#20037)
-enclosingStmt(#20145,#20139)
+enclosing_stmt(#20145,#20139)
 exprContainers(#20145,#20001)
 literals("e","e",#20145)
 bind(#20145,#20141)
 #20146=*
 exprs(#20146,79,#20143,1,"TypeError")
 hasLocation(#20146,#20041)
-enclosingStmt(#20146,#20139)
+enclosing_stmt(#20146,#20139)
 exprContainers(#20146,#20001)
 literals("TypeError","TypeError",#20146)
 #20147=@"var;{TypeError};{#20000}"
@@ -425,7 +425,7 @@ variables(#20152,"e",#20151)
 #20153=*
 exprs(#20153,78,#20150,0,"e")
 hasLocation(#20153,#20053)
-enclosingStmt(#20153,#20150)
+enclosing_stmt(#20153,#20150)
 exprContainers(#20153,#20001)
 literals("e","e",#20153)
 decl(#20153,#20152)
@@ -434,19 +434,19 @@ exprs(#20154,43,#20150,2,"e instanceof Error")
 #20155=@"loc,{#10000},3,13,3,30"
 locations_default(#20155,#10000,3,13,3,30)
 hasLocation(#20154,#20155)
-enclosingStmt(#20154,#20150)
+enclosing_stmt(#20154,#20150)
 exprContainers(#20154,#20001)
 #20156=*
 exprs(#20156,79,#20154,0,"e")
 hasLocation(#20156,#20057)
-enclosingStmt(#20156,#20150)
+enclosing_stmt(#20156,#20150)
 exprContainers(#20156,#20001)
 literals("e","e",#20156)
 bind(#20156,#20152)
 #20157=*
 exprs(#20157,79,#20154,1,"Error")
 hasLocation(#20157,#20061)
-enclosingStmt(#20157,#20150)
+enclosing_stmt(#20157,#20150)
 exprContainers(#20157,#20001)
 literals("Error","Error",#20157)
 #20158=@"var;{Error};{#20000}"
@@ -497,7 +497,7 @@ variables(#20171,"e",#20170)
 #20172=*
 exprs(#20172,78,#20169,0,"e")
 hasLocation(#20172,#20085)
-enclosingStmt(#20172,#20169)
+enclosing_stmt(#20172,#20169)
 exprContainers(#20172,#20001)
 literals("e","e",#20172)
 decl(#20172,#20171)
@@ -506,19 +506,19 @@ exprs(#20173,43,#20169,2,"e insta ... peError")
 #20174=@"loc,{#10000},7,13,7,34"
 locations_default(#20174,#10000,7,13,7,34)
 hasLocation(#20173,#20174)
-enclosingStmt(#20173,#20169)
+enclosing_stmt(#20173,#20169)
 exprContainers(#20173,#20001)
 #20175=*
 exprs(#20175,79,#20173,0,"e")
 hasLocation(#20175,#20089)
-enclosingStmt(#20175,#20169)
+enclosing_stmt(#20175,#20169)
 exprContainers(#20175,#20001)
 literals("e","e",#20175)
 bind(#20175,#20171)
 #20176=*
 exprs(#20176,79,#20173,1,"TypeError")
 hasLocation(#20176,#20093)
-enclosingStmt(#20176,#20169)
+enclosing_stmt(#20176,#20169)
 exprContainers(#20176,#20001)
 literals("TypeError","TypeError",#20176)
 bind(#20176,#20147)
@@ -541,7 +541,7 @@ variables(#20181,"e",#20180)
 #20182=*
 exprs(#20182,78,#20179,0,"e")
 hasLocation(#20182,#20105)
-enclosingStmt(#20182,#20179)
+enclosing_stmt(#20182,#20179)
 exprContainers(#20182,#20001)
 literals("e","e",#20182)
 decl(#20182,#20181)
@@ -550,19 +550,19 @@ exprs(#20183,43,#20179,2,"e instanceof Error")
 #20184=@"loc,{#10000},8,13,8,30"
 locations_default(#20184,#10000,8,13,8,30)
 hasLocation(#20183,#20184)
-enclosingStmt(#20183,#20179)
+enclosing_stmt(#20183,#20179)
 exprContainers(#20183,#20001)
 #20185=*
 exprs(#20185,79,#20183,0,"e")
 hasLocation(#20185,#20109)
-enclosingStmt(#20185,#20179)
+enclosing_stmt(#20185,#20179)
 exprContainers(#20185,#20001)
 literals("e","e",#20185)
 bind(#20185,#20181)
 #20186=*
 exprs(#20186,79,#20183,1,"Error")
 hasLocation(#20186,#20113)
-enclosingStmt(#20186,#20179)
+enclosing_stmt(#20186,#20179)
 exprContainers(#20186,#20001)
 literals("Error","Error",#20186)
 bind(#20186,#20158)
diff --git a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
index ce59a1f11a1..37ae079a7a0 100644
--- a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
@@ -202,12 +202,12 @@ exprs(#20073,99,#20072,0,"import(""m"")")
 #20074=@"loc,{#10000},1,1,1,11"
 locations_default(#20074,#10000,1,1,1,11)
 hasLocation(#20073,#20074)
-enclosingStmt(#20073,#20072)
+enclosing_stmt(#20073,#20072)
 exprContainers(#20073,#20001)
 #20075=*
 exprs(#20075,4,#20073,0,"""m""")
 hasLocation(#20075,#20013)
-enclosingStmt(#20075,#20072)
+enclosing_stmt(#20075,#20072)
 exprContainers(#20075,#20001)
 literals("m","""m""",#20075)
 #20076=*
@@ -225,12 +225,12 @@ exprs(#20079,11,#20078,0,"b ? import(""n"") : {}")
 #20080=@"loc,{#10000},2,1,2,20"
 locations_default(#20080,#10000,2,1,2,20)
 hasLocation(#20079,#20080)
-enclosingStmt(#20079,#20078)
+enclosing_stmt(#20079,#20078)
 exprContainers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,0,"b")
 hasLocation(#20081,#20019)
-enclosingStmt(#20081,#20078)
+enclosing_stmt(#20081,#20078)
 exprContainers(#20081,#20001)
 literals("b","b",#20081)
 #20082=@"var;{b};{#20000}"
@@ -241,12 +241,12 @@ exprs(#20083,99,#20079,1,"import(""n"")")
 #20084=@"loc,{#10000},2,5,2,15"
 locations_default(#20084,#10000,2,5,2,15)
 hasLocation(#20083,#20084)
-enclosingStmt(#20083,#20078)
+enclosing_stmt(#20083,#20078)
 exprContainers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""n""")
 hasLocation(#20085,#20027)
-enclosingStmt(#20085,#20078)
+enclosing_stmt(#20085,#20078)
 exprContainers(#20085,#20001)
 literals("n","""n""",#20085)
 #20086=*
@@ -260,7 +260,7 @@ exprs(#20088,8,#20079,2,"{}")
 #20089=@"loc,{#10000},2,19,2,20"
 locations_default(#20089,#10000,2,19,2,20)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20078)
+enclosing_stmt(#20088,#20078)
 exprContainers(#20088,#20001)
 #20090=*
 stmts(#20090,2,#20001,2,"import( ... => {});")
@@ -271,26 +271,26 @@ exprs(#20091,13,#20090,0,"import( ...  => {})")
 #20092=@"loc,{#10000},3,1,3,27"
 locations_default(#20092,#10000,3,1,3,27)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20001)
 #20093=*
 exprs(#20093,14,#20091,-1,"import(""o"").then")
 #20094=@"loc,{#10000},3,1,3,16"
 locations_default(#20094,#10000,3,1,3,16)
 hasLocation(#20093,#20094)
-enclosingStmt(#20093,#20090)
+enclosing_stmt(#20093,#20090)
 exprContainers(#20093,#20001)
 #20095=*
 exprs(#20095,99,#20093,0,"import(""o"")")
 #20096=@"loc,{#10000},3,1,3,11"
 locations_default(#20096,#10000,3,1,3,11)
 hasLocation(#20095,#20096)
-enclosingStmt(#20095,#20090)
+enclosing_stmt(#20095,#20090)
 exprContainers(#20095,#20001)
 #20097=*
 exprs(#20097,4,#20095,0,"""o""")
 hasLocation(#20097,#20043)
-enclosingStmt(#20097,#20090)
+enclosing_stmt(#20097,#20090)
 exprContainers(#20097,#20001)
 literals("o","""o""",#20097)
 #20098=*
@@ -302,7 +302,7 @@ regexpConstValue(#20098,"o")
 #20100=*
 exprs(#20100,0,#20093,1,"then")
 hasLocation(#20100,#20049)
-enclosingStmt(#20100,#20090)
+enclosing_stmt(#20100,#20090)
 exprContainers(#20100,#20001)
 literals("then","then",#20100)
 #20101=*
@@ -310,7 +310,7 @@ exprs(#20101,65,#20091,0,"(o) => {}")
 #20102=@"loc,{#10000},3,18,3,26"
 locations_default(#20102,#10000,3,18,3,26)
 hasLocation(#20101,#20102)
-enclosingStmt(#20101,#20090)
+enclosing_stmt(#20101,#20090)
 exprContainers(#20101,#20001)
 #20103=*
 scopes(#20103,1)
diff --git a/javascript/extractor/tests/esnext/output/trap/fields.js.trap b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
index 6c4aa0b661e..a67d9ffb00c 100644
--- a/javascript/extractor/tests/esnext/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -243,7 +243,7 @@ stmt_containers(#20086,#20001)
 #20088=*
 exprs(#20088,78,#20086,0,"A")
 hasLocation(#20088,#20027)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20001)
 literals("A","A",#20088)
 decl(#20088,#20080)
@@ -277,12 +277,12 @@ hasLocation(#20096,#20097)
 #20098=*
 exprs(#20098,0,#20096,0,"constructor")
 hasLocation(#20098,#20097)
-enclosingStmt(#20098,#20086)
+enclosing_stmt(#20098,#20086)
 exprContainers(#20098,#20001)
 literals("constructor","constructor",#20098)
 exprs(#20092,9,#20096,1,"() {}")
 hasLocation(#20092,#20097)
-enclosingStmt(#20092,#20086)
+enclosing_stmt(#20092,#20086)
 exprContainers(#20092,#20001)
 #20099=*
 scopes(#20099,1)
@@ -305,7 +305,7 @@ stmt_containers(#20102,#20001)
 #20104=*
 exprs(#20104,78,#20102,0,"B")
 hasLocation(#20104,#20046)
-enclosingStmt(#20104,#20102)
+enclosing_stmt(#20104,#20102)
 exprContainers(#20104,#20001)
 literals("B","B",#20104)
 decl(#20104,#20081)
@@ -317,7 +317,7 @@ scopenesting(#20105,#20000)
 #20106=*
 exprs(#20106,79,#20102,1,"A")
 hasLocation(#20106,#20050)
-enclosingStmt(#20106,#20102)
+enclosing_stmt(#20106,#20102)
 exprContainers(#20106,#20001)
 literals("A","A",#20106)
 bind(#20106,#20080)
@@ -355,12 +355,12 @@ hasLocation(#20115,#20116)
 #20117=*
 exprs(#20117,0,#20115,0,"constructor")
 hasLocation(#20117,#20116)
-enclosingStmt(#20117,#20102)
+enclosing_stmt(#20117,#20102)
 exprContainers(#20117,#20001)
 literals("constructor","constructor",#20117)
 exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
 hasLocation(#20109,#20116)
-enclosingStmt(#20109,#20102)
+enclosing_stmt(#20109,#20102)
 exprContainers(#20109,#20001)
 #20118=*
 scopes(#20118,1)
@@ -389,22 +389,22 @@ stmt_containers(#20123,#20109)
 #20124=*
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
-enclosingStmt(#20124,#20123)
+enclosing_stmt(#20124,#20123)
 exprContainers(#20124,#20109)
 #20125=*
 exprs(#20125,81,#20124,-1,"super")
 hasLocation(#20125,#20116)
-enclosingStmt(#20125,#20123)
+enclosing_stmt(#20125,#20123)
 exprContainers(#20125,#20109)
 #20126=*
 exprs(#20126,66,#20124,0,"...args")
 hasLocation(#20126,#20116)
-enclosingStmt(#20126,#20123)
+enclosing_stmt(#20126,#20123)
 exprContainers(#20126,#20109)
 #20127=*
 exprs(#20127,79,#20126,0,"args")
 hasLocation(#20127,#20116)
-enclosingStmt(#20127,#20123)
+enclosing_stmt(#20127,#20123)
 exprContainers(#20127,#20109)
 literals("args","args",#20127)
 bind(#20127,#20119)
@@ -418,7 +418,7 @@ stmt_containers(#20128,#20001)
 #20130=*
 exprs(#20130,78,#20128,0,"C")
 hasLocation(#20130,#20069)
-enclosingStmt(#20130,#20128)
+enclosing_stmt(#20130,#20128)
 exprContainers(#20130,#20001)
 literals("C","C",#20130)
 decl(#20130,#20082)
@@ -446,12 +446,12 @@ hasLocation(#20136,#20137)
 #20138=*
 exprs(#20138,0,#20136,0,"constructor")
 hasLocation(#20138,#20137)
-enclosingStmt(#20138,#20128)
+enclosing_stmt(#20138,#20128)
 exprContainers(#20138,#20001)
 literals("constructor","constructor",#20138)
 exprs(#20134,9,#20136,1,"() {}")
 hasLocation(#20134,#20137)
-enclosingStmt(#20134,#20128)
+enclosing_stmt(#20134,#20128)
 exprContainers(#20134,#20001)
 #20139=*
 scopes(#20139,1)
diff --git a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
index 290287676b3..7968f79306f 100644
--- a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
@@ -209,12 +209,12 @@ exprs(#20076,107,#20075,0,"x1 ?? y1")
 #20077=@"loc,{#10000},1,1,1,8"
 locations_default(#20077,#10000,1,1,1,8)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20075)
+enclosing_stmt(#20076,#20075)
 exprContainers(#20076,#20001)
 #20078=*
 exprs(#20078,79,#20076,0,"x1")
 hasLocation(#20078,#20017)
-enclosingStmt(#20078,#20075)
+enclosing_stmt(#20078,#20075)
 exprContainers(#20078,#20001)
 literals("x1","x1",#20078)
 #20079=@"var;{x1};{#20000}"
@@ -223,7 +223,7 @@ bind(#20078,#20079)
 #20080=*
 exprs(#20080,79,#20076,1,"y1")
 hasLocation(#20080,#20021)
-enclosingStmt(#20080,#20075)
+enclosing_stmt(#20080,#20075)
 exprContainers(#20080,#20001)
 literals("y1","y1",#20080)
 #20081=@"var;{y1};{#20000}"
@@ -238,19 +238,19 @@ exprs(#20083,107,#20082,0,"x2 || y2 ?? z2")
 #20084=@"loc,{#10000},3,1,3,14"
 locations_default(#20084,#10000,3,1,3,14)
 hasLocation(#20083,#20084)
-enclosingStmt(#20083,#20082)
+enclosing_stmt(#20083,#20082)
 exprContainers(#20083,#20001)
 #20085=*
 exprs(#20085,45,#20083,0,"x2 || y2")
 #20086=@"loc,{#10000},3,1,3,8"
 locations_default(#20086,#10000,3,1,3,8)
 hasLocation(#20085,#20086)
-enclosingStmt(#20085,#20082)
+enclosing_stmt(#20085,#20082)
 exprContainers(#20085,#20001)
 #20087=*
 exprs(#20087,79,#20085,0,"x2")
 hasLocation(#20087,#20025)
-enclosingStmt(#20087,#20082)
+enclosing_stmt(#20087,#20082)
 exprContainers(#20087,#20001)
 literals("x2","x2",#20087)
 #20088=@"var;{x2};{#20000}"
@@ -259,7 +259,7 @@ bind(#20087,#20088)
 #20089=*
 exprs(#20089,79,#20085,1,"y2")
 hasLocation(#20089,#20029)
-enclosingStmt(#20089,#20082)
+enclosing_stmt(#20089,#20082)
 exprContainers(#20089,#20001)
 literals("y2","y2",#20089)
 #20090=@"var;{y2};{#20000}"
@@ -268,7 +268,7 @@ bind(#20089,#20090)
 #20091=*
 exprs(#20091,79,#20083,1,"z2")
 hasLocation(#20091,#20033)
-enclosingStmt(#20091,#20082)
+enclosing_stmt(#20091,#20082)
 exprContainers(#20091,#20001)
 literals("z2","z2",#20091)
 #20092=@"var;{z2};{#20000}"
@@ -283,19 +283,19 @@ exprs(#20094,45,#20093,0,"x3 ?? y3 || z3")
 #20095=@"loc,{#10000},4,1,4,14"
 locations_default(#20095,#10000,4,1,4,14)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20093)
+enclosing_stmt(#20094,#20093)
 exprContainers(#20094,#20001)
 #20096=*
 exprs(#20096,107,#20094,0,"x3 ?? y3")
 #20097=@"loc,{#10000},4,1,4,8"
 locations_default(#20097,#10000,4,1,4,8)
 hasLocation(#20096,#20097)
-enclosingStmt(#20096,#20093)
+enclosing_stmt(#20096,#20093)
 exprContainers(#20096,#20001)
 #20098=*
 exprs(#20098,79,#20096,0,"x3")
 hasLocation(#20098,#20037)
-enclosingStmt(#20098,#20093)
+enclosing_stmt(#20098,#20093)
 exprContainers(#20098,#20001)
 literals("x3","x3",#20098)
 #20099=@"var;{x3};{#20000}"
@@ -304,7 +304,7 @@ bind(#20098,#20099)
 #20100=*
 exprs(#20100,79,#20096,1,"y3")
 hasLocation(#20100,#20041)
-enclosingStmt(#20100,#20093)
+enclosing_stmt(#20100,#20093)
 exprContainers(#20100,#20001)
 literals("y3","y3",#20100)
 #20101=@"var;{y3};{#20000}"
@@ -313,7 +313,7 @@ bind(#20100,#20101)
 #20102=*
 exprs(#20102,79,#20094,1,"z3")
 hasLocation(#20102,#20045)
-enclosingStmt(#20102,#20093)
+enclosing_stmt(#20102,#20093)
 exprContainers(#20102,#20001)
 literals("z3","z3",#20102)
 #20103=@"var;{z3};{#20000}"
@@ -328,19 +328,19 @@ exprs(#20105,107,#20104,0,"x4 && y4 ?? z4")
 #20106=@"loc,{#10000},6,1,6,14"
 locations_default(#20106,#10000,6,1,6,14)
 hasLocation(#20105,#20106)
-enclosingStmt(#20105,#20104)
+enclosing_stmt(#20105,#20104)
 exprContainers(#20105,#20001)
 #20107=*
 exprs(#20107,44,#20105,0,"x4 && y4")
 #20108=@"loc,{#10000},6,1,6,8"
 locations_default(#20108,#10000,6,1,6,8)
 hasLocation(#20107,#20108)
-enclosingStmt(#20107,#20104)
+enclosing_stmt(#20107,#20104)
 exprContainers(#20107,#20001)
 #20109=*
 exprs(#20109,79,#20107,0,"x4")
 hasLocation(#20109,#20049)
-enclosingStmt(#20109,#20104)
+enclosing_stmt(#20109,#20104)
 exprContainers(#20109,#20001)
 literals("x4","x4",#20109)
 #20110=@"var;{x4};{#20000}"
@@ -349,7 +349,7 @@ bind(#20109,#20110)
 #20111=*
 exprs(#20111,79,#20107,1,"y4")
 hasLocation(#20111,#20053)
-enclosingStmt(#20111,#20104)
+enclosing_stmt(#20111,#20104)
 exprContainers(#20111,#20001)
 literals("y4","y4",#20111)
 #20112=@"var;{y4};{#20000}"
@@ -358,7 +358,7 @@ bind(#20111,#20112)
 #20113=*
 exprs(#20113,79,#20105,1,"z4")
 hasLocation(#20113,#20057)
-enclosingStmt(#20113,#20104)
+enclosing_stmt(#20113,#20104)
 exprContainers(#20113,#20001)
 literals("z4","z4",#20113)
 #20114=@"var;{z4};{#20000}"
@@ -373,12 +373,12 @@ exprs(#20116,107,#20115,0,"x5 ?? y5 && z5")
 #20117=@"loc,{#10000},7,1,7,14"
 locations_default(#20117,#10000,7,1,7,14)
 hasLocation(#20116,#20117)
-enclosingStmt(#20116,#20115)
+enclosing_stmt(#20116,#20115)
 exprContainers(#20116,#20001)
 #20118=*
 exprs(#20118,79,#20116,0,"x5")
 hasLocation(#20118,#20061)
-enclosingStmt(#20118,#20115)
+enclosing_stmt(#20118,#20115)
 exprContainers(#20118,#20001)
 literals("x5","x5",#20118)
 #20119=@"var;{x5};{#20000}"
@@ -389,12 +389,12 @@ exprs(#20120,44,#20116,1,"y5 && z5")
 #20121=@"loc,{#10000},7,7,7,14"
 locations_default(#20121,#10000,7,7,7,14)
 hasLocation(#20120,#20121)
-enclosingStmt(#20120,#20115)
+enclosing_stmt(#20120,#20115)
 exprContainers(#20120,#20001)
 #20122=*
 exprs(#20122,79,#20120,0,"y5")
 hasLocation(#20122,#20065)
-enclosingStmt(#20122,#20115)
+enclosing_stmt(#20122,#20115)
 exprContainers(#20122,#20001)
 literals("y5","y5",#20122)
 #20123=@"var;{y5};{#20000}"
@@ -403,7 +403,7 @@ bind(#20122,#20123)
 #20124=*
 exprs(#20124,79,#20120,1,"z5")
 hasLocation(#20124,#20069)
-enclosingStmt(#20124,#20115)
+enclosing_stmt(#20124,#20115)
 exprContainers(#20124,#20001)
 literals("z5","z5",#20124)
 #20125=@"var;{z5};{#20000}"
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
index 0a39749f231..1241a6b12b1 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
@@ -335,12 +335,12 @@ exprs(#20124,14,#20123,0,"a1?.b1")
 #20125=@"loc,{#10000},1,1,1,6"
 locations_default(#20125,#10000,1,1,1,6)
 hasLocation(#20124,#20125)
-enclosingStmt(#20124,#20123)
+enclosing_stmt(#20124,#20123)
 exprContainers(#20124,#20001)
 #20126=*
 exprs(#20126,79,#20124,0,"a1")
 hasLocation(#20126,#20029)
-enclosingStmt(#20126,#20123)
+enclosing_stmt(#20126,#20123)
 exprContainers(#20126,#20001)
 literals("a1","a1",#20126)
 #20127=@"var;{a1};{#20000}"
@@ -349,7 +349,7 @@ bind(#20126,#20127)
 #20128=*
 exprs(#20128,0,#20124,1,"b1")
 hasLocation(#20128,#20033)
-enclosingStmt(#20128,#20123)
+enclosing_stmt(#20128,#20123)
 exprContainers(#20128,#20001)
 literals("b1","b1",#20128)
 isOptionalChaining(#20124)
@@ -362,12 +362,12 @@ exprs(#20130,15,#20129,0,"a2?.[x2]")
 #20131=@"loc,{#10000},3,1,3,8"
 locations_default(#20131,#10000,3,1,3,8)
 hasLocation(#20130,#20131)
-enclosingStmt(#20130,#20129)
+enclosing_stmt(#20130,#20129)
 exprContainers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,0,"a2")
 hasLocation(#20132,#20037)
-enclosingStmt(#20132,#20129)
+enclosing_stmt(#20132,#20129)
 exprContainers(#20132,#20001)
 literals("a2","a2",#20132)
 #20133=@"var;{a2};{#20000}"
@@ -376,7 +376,7 @@ bind(#20132,#20133)
 #20134=*
 exprs(#20134,79,#20130,1,"x2")
 hasLocation(#20134,#20043)
-enclosingStmt(#20134,#20129)
+enclosing_stmt(#20134,#20129)
 exprContainers(#20134,#20001)
 literals("x2","x2",#20134)
 #20135=@"var;{x2};{#20000}"
@@ -392,19 +392,19 @@ exprs(#20137,13,#20136,0,"a3?.b3()")
 #20138=@"loc,{#10000},5,1,5,8"
 locations_default(#20138,#10000,5,1,5,8)
 hasLocation(#20137,#20138)
-enclosingStmt(#20137,#20136)
+enclosing_stmt(#20137,#20136)
 exprContainers(#20137,#20001)
 #20139=*
 exprs(#20139,14,#20137,-1,"a3?.b3")
 #20140=@"loc,{#10000},5,1,5,6"
 locations_default(#20140,#10000,5,1,5,6)
 hasLocation(#20139,#20140)
-enclosingStmt(#20139,#20136)
+enclosing_stmt(#20139,#20136)
 exprContainers(#20139,#20001)
 #20141=*
 exprs(#20141,79,#20139,0,"a3")
 hasLocation(#20141,#20049)
-enclosingStmt(#20141,#20136)
+enclosing_stmt(#20141,#20136)
 exprContainers(#20141,#20001)
 literals("a3","a3",#20141)
 #20142=@"var;{a3};{#20000}"
@@ -413,7 +413,7 @@ bind(#20141,#20142)
 #20143=*
 exprs(#20143,0,#20139,1,"b3")
 hasLocation(#20143,#20053)
-enclosingStmt(#20143,#20136)
+enclosing_stmt(#20143,#20136)
 exprContainers(#20143,#20001)
 literals("b3","b3",#20143)
 isOptionalChaining(#20139)
@@ -426,12 +426,12 @@ exprs(#20145,13,#20144,0,"a4?.()")
 #20146=@"loc,{#10000},7,1,7,6"
 locations_default(#20146,#10000,7,1,7,6)
 hasLocation(#20145,#20146)
-enclosingStmt(#20145,#20144)
+enclosing_stmt(#20145,#20144)
 exprContainers(#20145,#20001)
 #20147=*
 exprs(#20147,79,#20145,-1,"a4")
 hasLocation(#20147,#20061)
-enclosingStmt(#20147,#20144)
+enclosing_stmt(#20147,#20144)
 exprContainers(#20147,#20001)
 literals("a4","a4",#20147)
 #20148=@"var;{a4};{#20000}"
@@ -447,12 +447,12 @@ exprs(#20150,11,#20149,0,"o5?.3:2")
 #20151=@"loc,{#10000},9,1,9,7"
 locations_default(#20151,#10000,9,1,9,7)
 hasLocation(#20150,#20151)
-enclosingStmt(#20150,#20149)
+enclosing_stmt(#20150,#20149)
 exprContainers(#20150,#20001)
 #20152=*
 exprs(#20152,79,#20150,0,"o5")
 hasLocation(#20152,#20071)
-enclosingStmt(#20152,#20149)
+enclosing_stmt(#20152,#20149)
 exprContainers(#20152,#20001)
 literals("o5","o5",#20152)
 #20153=@"var;{o5};{#20000}"
@@ -461,13 +461,13 @@ bind(#20152,#20153)
 #20154=*
 exprs(#20154,3,#20150,1,".3")
 hasLocation(#20154,#20075)
-enclosingStmt(#20154,#20149)
+enclosing_stmt(#20154,#20149)
 exprContainers(#20154,#20001)
 literals("0.3",".3",#20154)
 #20155=*
 exprs(#20155,3,#20150,2,"2")
 hasLocation(#20155,#20079)
-enclosingStmt(#20155,#20149)
+enclosing_stmt(#20155,#20149)
 exprContainers(#20155,#20001)
 literals("2","2",#20155)
 #20156=*
@@ -479,40 +479,40 @@ exprs(#20157,14,#20156,0,"a6?.b6[ ... (y6).d6")
 #20158=@"loc,{#10000},11,1,11,22"
 locations_default(#20158,#10000,11,1,11,22)
 hasLocation(#20157,#20158)
-enclosingStmt(#20157,#20156)
+enclosing_stmt(#20157,#20156)
 exprContainers(#20157,#20001)
 #20159=*
 exprs(#20159,13,#20157,0,"a6?.b6[x6].c6?.(y6)")
 #20160=@"loc,{#10000},11,1,11,19"
 locations_default(#20160,#10000,11,1,11,19)
 hasLocation(#20159,#20160)
-enclosingStmt(#20159,#20156)
+enclosing_stmt(#20159,#20156)
 exprContainers(#20159,#20001)
 #20161=*
 exprs(#20161,14,#20159,-1,"a6?.b6[x6].c6")
 #20162=@"loc,{#10000},11,1,11,13"
 locations_default(#20162,#10000,11,1,11,13)
 hasLocation(#20161,#20162)
-enclosingStmt(#20161,#20156)
+enclosing_stmt(#20161,#20156)
 exprContainers(#20161,#20001)
 #20163=*
 exprs(#20163,15,#20161,0,"a6?.b6[x6]")
 #20164=@"loc,{#10000},11,1,11,10"
 locations_default(#20164,#10000,11,1,11,10)
 hasLocation(#20163,#20164)
-enclosingStmt(#20163,#20156)
+enclosing_stmt(#20163,#20156)
 exprContainers(#20163,#20001)
 #20165=*
 exprs(#20165,14,#20163,0,"a6?.b6")
 #20166=@"loc,{#10000},11,1,11,6"
 locations_default(#20166,#10000,11,1,11,6)
 hasLocation(#20165,#20166)
-enclosingStmt(#20165,#20156)
+enclosing_stmt(#20165,#20156)
 exprContainers(#20165,#20001)
 #20167=*
 exprs(#20167,79,#20165,0,"a6")
 hasLocation(#20167,#20083)
-enclosingStmt(#20167,#20156)
+enclosing_stmt(#20167,#20156)
 exprContainers(#20167,#20001)
 literals("a6","a6",#20167)
 #20168=@"var;{a6};{#20000}"
@@ -521,14 +521,14 @@ bind(#20167,#20168)
 #20169=*
 exprs(#20169,0,#20165,1,"b6")
 hasLocation(#20169,#20087)
-enclosingStmt(#20169,#20156)
+enclosing_stmt(#20169,#20156)
 exprContainers(#20169,#20001)
 literals("b6","b6",#20169)
 isOptionalChaining(#20165)
 #20170=*
 exprs(#20170,79,#20163,1,"x6")
 hasLocation(#20170,#20091)
-enclosingStmt(#20170,#20156)
+enclosing_stmt(#20170,#20156)
 exprContainers(#20170,#20001)
 literals("x6","x6",#20170)
 #20171=@"var;{x6};{#20000}"
@@ -537,13 +537,13 @@ bind(#20170,#20171)
 #20172=*
 exprs(#20172,0,#20161,1,"c6")
 hasLocation(#20172,#20097)
-enclosingStmt(#20172,#20156)
+enclosing_stmt(#20172,#20156)
 exprContainers(#20172,#20001)
 literals("c6","c6",#20172)
 #20173=*
 exprs(#20173,79,#20159,0,"y6")
 hasLocation(#20173,#20103)
-enclosingStmt(#20173,#20156)
+enclosing_stmt(#20173,#20156)
 exprContainers(#20173,#20001)
 literals("y6","y6",#20173)
 #20174=@"var;{y6};{#20000}"
@@ -553,7 +553,7 @@ isOptionalChaining(#20159)
 #20175=*
 exprs(#20175,0,#20157,1,"d6")
 hasLocation(#20175,#20109)
-enclosingStmt(#20175,#20156)
+enclosing_stmt(#20175,#20156)
 exprContainers(#20175,#20001)
 literals("d6","d6",#20175)
 #20176=*
@@ -563,19 +563,19 @@ stmt_containers(#20176,#20001)
 #20177=*
 exprs(#20177,22,#20176,0,"delete a?.b")
 hasLocation(#20177,#20027)
-enclosingStmt(#20177,#20176)
+enclosing_stmt(#20177,#20176)
 exprContainers(#20177,#20001)
 #20178=*
 exprs(#20178,14,#20177,0,"a?.b")
 #20179=@"loc,{#10000},13,8,13,11"
 locations_default(#20179,#10000,13,8,13,11)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20176)
+enclosing_stmt(#20178,#20176)
 exprContainers(#20178,#20001)
 #20180=*
 exprs(#20180,79,#20178,0,"a")
 hasLocation(#20180,#20115)
-enclosingStmt(#20180,#20176)
+enclosing_stmt(#20180,#20176)
 exprContainers(#20180,#20001)
 literals("a","a",#20180)
 #20181=@"var;{a};{#20000}"
@@ -584,7 +584,7 @@ bind(#20180,#20181)
 #20182=*
 exprs(#20182,0,#20178,1,"b")
 hasLocation(#20182,#20119)
-enclosingStmt(#20182,#20176)
+enclosing_stmt(#20182,#20176)
 exprContainers(#20182,#20001)
 literals("b","b",#20182)
 isOptionalChaining(#20178)
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
index b439aee5624..a4ac9299d6d 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
@@ -872,33 +872,33 @@ exprs(#20329,14,#20328,0,"a?.b.c(++x).d")
 #20330=@"loc,{#10000},1,1,1,13"
 locations_default(#20330,#10000,1,1,1,13)
 hasLocation(#20329,#20330)
-enclosingStmt(#20329,#20328)
+enclosing_stmt(#20329,#20328)
 exprContainers(#20329,#20001)
 #20331=*
 exprs(#20331,13,#20329,0,"a?.b.c(++x)")
 #20332=@"loc,{#10000},1,1,1,11"
 locations_default(#20332,#10000,1,1,1,11)
 hasLocation(#20331,#20332)
-enclosingStmt(#20331,#20328)
+enclosing_stmt(#20331,#20328)
 exprContainers(#20331,#20001)
 #20333=*
 exprs(#20333,14,#20331,-1,"a?.b.c")
 #20334=@"loc,{#10000},1,1,1,6"
 locations_default(#20334,#10000,1,1,1,6)
 hasLocation(#20333,#20334)
-enclosingStmt(#20333,#20328)
+enclosing_stmt(#20333,#20328)
 exprContainers(#20333,#20001)
 #20335=*
 exprs(#20335,14,#20333,0,"a?.b")
 #20336=@"loc,{#10000},1,1,1,4"
 locations_default(#20336,#10000,1,1,1,4)
 hasLocation(#20335,#20336)
-enclosingStmt(#20335,#20328)
+enclosing_stmt(#20335,#20328)
 exprContainers(#20335,#20001)
 #20337=*
 exprs(#20337,79,#20335,0,"a")
 hasLocation(#20337,#20061)
-enclosingStmt(#20337,#20328)
+enclosing_stmt(#20337,#20328)
 exprContainers(#20337,#20001)
 literals("a","a",#20337)
 #20338=@"var;{a};{#20000}"
@@ -907,14 +907,14 @@ bind(#20337,#20338)
 #20339=*
 exprs(#20339,0,#20335,1,"b")
 hasLocation(#20339,#20065)
-enclosingStmt(#20339,#20328)
+enclosing_stmt(#20339,#20328)
 exprContainers(#20339,#20001)
 literals("b","b",#20339)
 isOptionalChaining(#20335)
 #20340=*
 exprs(#20340,0,#20333,1,"c")
 hasLocation(#20340,#20069)
-enclosingStmt(#20340,#20328)
+enclosing_stmt(#20340,#20328)
 exprContainers(#20340,#20001)
 literals("c","c",#20340)
 #20341=*
@@ -922,12 +922,12 @@ exprs(#20341,59,#20331,0,"++x")
 #20342=@"loc,{#10000},1,8,1,10"
 locations_default(#20342,#10000,1,8,1,10)
 hasLocation(#20341,#20342)
-enclosingStmt(#20341,#20328)
+enclosing_stmt(#20341,#20328)
 exprContainers(#20341,#20001)
 #20343=*
 exprs(#20343,79,#20341,0,"x")
 hasLocation(#20343,#20075)
-enclosingStmt(#20343,#20328)
+enclosing_stmt(#20343,#20328)
 exprContainers(#20343,#20001)
 literals("x","x",#20343)
 #20344=@"var;{x};{#20000}"
@@ -936,7 +936,7 @@ bind(#20343,#20344)
 #20345=*
 exprs(#20345,0,#20329,1,"d")
 hasLocation(#20345,#20081)
-enclosingStmt(#20345,#20328)
+enclosing_stmt(#20345,#20328)
 exprContainers(#20345,#20001)
 literals("d","d",#20345)
 #20346=*
@@ -948,66 +948,66 @@ exprs(#20347,14,#20346,0,"a?.b[3].c?.(x).d")
 #20348=@"loc,{#10000},3,1,3,16"
 locations_default(#20348,#10000,3,1,3,16)
 hasLocation(#20347,#20348)
-enclosingStmt(#20347,#20346)
+enclosing_stmt(#20347,#20346)
 exprContainers(#20347,#20001)
 #20349=*
 exprs(#20349,13,#20347,0,"a?.b[3].c?.(x)")
 #20350=@"loc,{#10000},3,1,3,14"
 locations_default(#20350,#10000,3,1,3,14)
 hasLocation(#20349,#20350)
-enclosingStmt(#20349,#20346)
+enclosing_stmt(#20349,#20346)
 exprContainers(#20349,#20001)
 #20351=*
 exprs(#20351,14,#20349,-1,"a?.b[3].c")
 #20352=@"loc,{#10000},3,1,3,9"
 locations_default(#20352,#10000,3,1,3,9)
 hasLocation(#20351,#20352)
-enclosingStmt(#20351,#20346)
+enclosing_stmt(#20351,#20346)
 exprContainers(#20351,#20001)
 #20353=*
 exprs(#20353,15,#20351,0,"a?.b[3]")
 #20354=@"loc,{#10000},3,1,3,7"
 locations_default(#20354,#10000,3,1,3,7)
 hasLocation(#20353,#20354)
-enclosingStmt(#20353,#20346)
+enclosing_stmt(#20353,#20346)
 exprContainers(#20353,#20001)
 #20355=*
 exprs(#20355,14,#20353,0,"a?.b")
 #20356=@"loc,{#10000},3,1,3,4"
 locations_default(#20356,#10000,3,1,3,4)
 hasLocation(#20355,#20356)
-enclosingStmt(#20355,#20346)
+enclosing_stmt(#20355,#20346)
 exprContainers(#20355,#20001)
 #20357=*
 exprs(#20357,79,#20355,0,"a")
 hasLocation(#20357,#20085)
-enclosingStmt(#20357,#20346)
+enclosing_stmt(#20357,#20346)
 exprContainers(#20357,#20001)
 literals("a","a",#20357)
 bind(#20357,#20338)
 #20358=*
 exprs(#20358,0,#20355,1,"b")
 hasLocation(#20358,#20089)
-enclosingStmt(#20358,#20346)
+enclosing_stmt(#20358,#20346)
 exprContainers(#20358,#20001)
 literals("b","b",#20358)
 isOptionalChaining(#20355)
 #20359=*
 exprs(#20359,3,#20353,1,"3")
 hasLocation(#20359,#20093)
-enclosingStmt(#20359,#20346)
+enclosing_stmt(#20359,#20346)
 exprContainers(#20359,#20001)
 literals("3","3",#20359)
 #20360=*
 exprs(#20360,0,#20351,1,"c")
 hasLocation(#20360,#20099)
-enclosingStmt(#20360,#20346)
+enclosing_stmt(#20360,#20346)
 exprContainers(#20360,#20001)
 literals("c","c",#20360)
 #20361=*
 exprs(#20361,79,#20349,0,"x")
 hasLocation(#20361,#20105)
-enclosingStmt(#20361,#20346)
+enclosing_stmt(#20361,#20346)
 exprContainers(#20361,#20001)
 literals("x","x",#20361)
 bind(#20361,#20344)
@@ -1015,7 +1015,7 @@ isOptionalChaining(#20349)
 #20362=*
 exprs(#20362,0,#20347,1,"d")
 hasLocation(#20362,#20111)
-enclosingStmt(#20362,#20346)
+enclosing_stmt(#20362,#20346)
 exprContainers(#20362,#20001)
 literals("d","d",#20362)
 #20363=*
@@ -1027,40 +1027,40 @@ exprs(#20364,14,#20363,0,"(a?.b).c")
 #20365=@"loc,{#10000},5,1,5,8"
 locations_default(#20365,#10000,5,1,5,8)
 hasLocation(#20364,#20365)
-enclosingStmt(#20364,#20363)
+enclosing_stmt(#20364,#20363)
 exprContainers(#20364,#20001)
 #20366=*
 exprs(#20366,63,#20364,0,"(a?.b)")
 #20367=@"loc,{#10000},5,1,5,6"
 locations_default(#20367,#10000,5,1,5,6)
 hasLocation(#20366,#20367)
-enclosingStmt(#20366,#20363)
+enclosing_stmt(#20366,#20363)
 exprContainers(#20366,#20001)
 #20368=*
 exprs(#20368,14,#20366,0,"a?.b")
 #20369=@"loc,{#10000},5,2,5,5"
 locations_default(#20369,#10000,5,2,5,5)
 hasLocation(#20368,#20369)
-enclosingStmt(#20368,#20363)
+enclosing_stmt(#20368,#20363)
 exprContainers(#20368,#20001)
 #20370=*
 exprs(#20370,79,#20368,0,"a")
 hasLocation(#20370,#20117)
-enclosingStmt(#20370,#20363)
+enclosing_stmt(#20370,#20363)
 exprContainers(#20370,#20001)
 literals("a","a",#20370)
 bind(#20370,#20338)
 #20371=*
 exprs(#20371,0,#20368,1,"b")
 hasLocation(#20371,#20121)
-enclosingStmt(#20371,#20363)
+enclosing_stmt(#20371,#20363)
 exprContainers(#20371,#20001)
 literals("b","b",#20371)
 isOptionalChaining(#20368)
 #20372=*
 exprs(#20372,0,#20364,1,"c")
 hasLocation(#20372,#20127)
-enclosingStmt(#20372,#20363)
+enclosing_stmt(#20372,#20363)
 exprContainers(#20372,#20001)
 literals("c","c",#20372)
 #20373=*
@@ -1072,53 +1072,53 @@ exprs(#20374,14,#20373,0,"(a?.b.c).d")
 #20375=@"loc,{#10000},7,1,7,10"
 locations_default(#20375,#10000,7,1,7,10)
 hasLocation(#20374,#20375)
-enclosingStmt(#20374,#20373)
+enclosing_stmt(#20374,#20373)
 exprContainers(#20374,#20001)
 #20376=*
 exprs(#20376,63,#20374,0,"(a?.b.c)")
 #20377=@"loc,{#10000},7,1,7,8"
 locations_default(#20377,#10000,7,1,7,8)
 hasLocation(#20376,#20377)
-enclosingStmt(#20376,#20373)
+enclosing_stmt(#20376,#20373)
 exprContainers(#20376,#20001)
 #20378=*
 exprs(#20378,14,#20376,0,"a?.b.c")
 #20379=@"loc,{#10000},7,2,7,7"
 locations_default(#20379,#10000,7,2,7,7)
 hasLocation(#20378,#20379)
-enclosingStmt(#20378,#20373)
+enclosing_stmt(#20378,#20373)
 exprContainers(#20378,#20001)
 #20380=*
 exprs(#20380,14,#20378,0,"a?.b")
 #20381=@"loc,{#10000},7,2,7,5"
 locations_default(#20381,#10000,7,2,7,5)
 hasLocation(#20380,#20381)
-enclosingStmt(#20380,#20373)
+enclosing_stmt(#20380,#20373)
 exprContainers(#20380,#20001)
 #20382=*
 exprs(#20382,79,#20380,0,"a")
 hasLocation(#20382,#20133)
-enclosingStmt(#20382,#20373)
+enclosing_stmt(#20382,#20373)
 exprContainers(#20382,#20001)
 literals("a","a",#20382)
 bind(#20382,#20338)
 #20383=*
 exprs(#20383,0,#20380,1,"b")
 hasLocation(#20383,#20137)
-enclosingStmt(#20383,#20373)
+enclosing_stmt(#20383,#20373)
 exprContainers(#20383,#20001)
 literals("b","b",#20383)
 isOptionalChaining(#20380)
 #20384=*
 exprs(#20384,0,#20378,1,"c")
 hasLocation(#20384,#20141)
-enclosingStmt(#20384,#20373)
+enclosing_stmt(#20384,#20373)
 exprContainers(#20384,#20001)
 literals("c","c",#20384)
 #20385=*
 exprs(#20385,0,#20374,1,"d")
 hasLocation(#20385,#20147)
-enclosingStmt(#20385,#20373)
+enclosing_stmt(#20385,#20373)
 exprContainers(#20385,#20001)
 literals("d","d",#20385)
 #20386=*
@@ -1130,26 +1130,26 @@ exprs(#20387,14,#20386,0,"a?.[b?.c?.d].e?.f")
 #20388=@"loc,{#10000},9,1,9,17"
 locations_default(#20388,#10000,9,1,9,17)
 hasLocation(#20387,#20388)
-enclosingStmt(#20387,#20386)
+enclosing_stmt(#20387,#20386)
 exprContainers(#20387,#20001)
 #20389=*
 exprs(#20389,14,#20387,0,"a?.[b?.c?.d].e")
 #20390=@"loc,{#10000},9,1,9,14"
 locations_default(#20390,#10000,9,1,9,14)
 hasLocation(#20389,#20390)
-enclosingStmt(#20389,#20386)
+enclosing_stmt(#20389,#20386)
 exprContainers(#20389,#20001)
 #20391=*
 exprs(#20391,15,#20389,0,"a?.[b?.c?.d]")
 #20392=@"loc,{#10000},9,1,9,12"
 locations_default(#20392,#10000,9,1,9,12)
 hasLocation(#20391,#20392)
-enclosingStmt(#20391,#20386)
+enclosing_stmt(#20391,#20386)
 exprContainers(#20391,#20001)
 #20393=*
 exprs(#20393,79,#20391,0,"a")
 hasLocation(#20393,#20151)
-enclosingStmt(#20393,#20386)
+enclosing_stmt(#20393,#20386)
 exprContainers(#20393,#20001)
 literals("a","a",#20393)
 bind(#20393,#20338)
@@ -1158,19 +1158,19 @@ exprs(#20394,14,#20391,1,"b?.c?.d")
 #20395=@"loc,{#10000},9,5,9,11"
 locations_default(#20395,#10000,9,5,9,11)
 hasLocation(#20394,#20395)
-enclosingStmt(#20394,#20386)
+enclosing_stmt(#20394,#20386)
 exprContainers(#20394,#20001)
 #20396=*
 exprs(#20396,14,#20394,0,"b?.c")
 #20397=@"loc,{#10000},9,5,9,8"
 locations_default(#20397,#10000,9,5,9,8)
 hasLocation(#20396,#20397)
-enclosingStmt(#20396,#20386)
+enclosing_stmt(#20396,#20386)
 exprContainers(#20396,#20001)
 #20398=*
 exprs(#20398,79,#20396,0,"b")
 hasLocation(#20398,#20157)
-enclosingStmt(#20398,#20386)
+enclosing_stmt(#20398,#20386)
 exprContainers(#20398,#20001)
 literals("b","b",#20398)
 #20399=@"var;{b};{#20000}"
@@ -1179,14 +1179,14 @@ bind(#20398,#20399)
 #20400=*
 exprs(#20400,0,#20396,1,"c")
 hasLocation(#20400,#20161)
-enclosingStmt(#20400,#20386)
+enclosing_stmt(#20400,#20386)
 exprContainers(#20400,#20001)
 literals("c","c",#20400)
 isOptionalChaining(#20396)
 #20401=*
 exprs(#20401,0,#20394,1,"d")
 hasLocation(#20401,#20165)
-enclosingStmt(#20401,#20386)
+enclosing_stmt(#20401,#20386)
 exprContainers(#20401,#20001)
 literals("d","d",#20401)
 isOptionalChaining(#20394)
@@ -1194,13 +1194,13 @@ isOptionalChaining(#20391)
 #20402=*
 exprs(#20402,0,#20389,1,"e")
 hasLocation(#20402,#20171)
-enclosingStmt(#20402,#20386)
+enclosing_stmt(#20402,#20386)
 exprContainers(#20402,#20001)
 literals("e","e",#20402)
 #20403=*
 exprs(#20403,0,#20387,1,"f")
 hasLocation(#20403,#20175)
-enclosingStmt(#20403,#20386)
+enclosing_stmt(#20403,#20386)
 exprContainers(#20403,#20001)
 literals("f","f",#20403)
 isOptionalChaining(#20387)
@@ -1213,40 +1213,40 @@ exprs(#20405,14,#20404,0,"a?.()[b ... e?.().f")
 #20406=@"loc,{#10000},11,1,11,28"
 locations_default(#20406,#10000,11,1,11,28)
 hasLocation(#20405,#20406)
-enclosingStmt(#20405,#20404)
+enclosing_stmt(#20405,#20404)
 exprContainers(#20405,#20001)
 #20407=*
 exprs(#20407,13,#20405,0,"a?.()[b ... ].e?.()")
 #20408=@"loc,{#10000},11,1,11,26"
 locations_default(#20408,#10000,11,1,11,26)
 hasLocation(#20407,#20408)
-enclosingStmt(#20407,#20404)
+enclosing_stmt(#20407,#20404)
 exprContainers(#20407,#20001)
 #20409=*
 exprs(#20409,14,#20407,-1,"a?.()[b ... ().d].e")
 #20410=@"loc,{#10000},11,1,11,22"
 locations_default(#20410,#10000,11,1,11,22)
 hasLocation(#20409,#20410)
-enclosingStmt(#20409,#20404)
+enclosing_stmt(#20409,#20404)
 exprContainers(#20409,#20001)
 #20411=*
 exprs(#20411,15,#20409,0,"a?.()[b?.().c?.().d]")
 #20412=@"loc,{#10000},11,1,11,20"
 locations_default(#20412,#10000,11,1,11,20)
 hasLocation(#20411,#20412)
-enclosingStmt(#20411,#20404)
+enclosing_stmt(#20411,#20404)
 exprContainers(#20411,#20001)
 #20413=*
 exprs(#20413,13,#20411,0,"a?.()")
 #20414=@"loc,{#10000},11,1,11,5"
 locations_default(#20414,#10000,11,1,11,5)
 hasLocation(#20413,#20414)
-enclosingStmt(#20413,#20404)
+enclosing_stmt(#20413,#20404)
 exprContainers(#20413,#20001)
 #20415=*
 exprs(#20415,79,#20413,-1,"a")
 hasLocation(#20415,#20179)
-enclosingStmt(#20415,#20404)
+enclosing_stmt(#20415,#20404)
 exprContainers(#20415,#20001)
 literals("a","a",#20415)
 bind(#20415,#20338)
@@ -1256,33 +1256,33 @@ exprs(#20416,14,#20411,1,"b?.().c?.().d")
 #20417=@"loc,{#10000},11,7,11,19"
 locations_default(#20417,#10000,11,7,11,19)
 hasLocation(#20416,#20417)
-enclosingStmt(#20416,#20404)
+enclosing_stmt(#20416,#20404)
 exprContainers(#20416,#20001)
 #20418=*
 exprs(#20418,13,#20416,0,"b?.().c?.()")
 #20419=@"loc,{#10000},11,7,11,17"
 locations_default(#20419,#10000,11,7,11,17)
 hasLocation(#20418,#20419)
-enclosingStmt(#20418,#20404)
+enclosing_stmt(#20418,#20404)
 exprContainers(#20418,#20001)
 #20420=*
 exprs(#20420,14,#20418,-1,"b?.().c")
 #20421=@"loc,{#10000},11,7,11,13"
 locations_default(#20421,#10000,11,7,11,13)
 hasLocation(#20420,#20421)
-enclosingStmt(#20420,#20404)
+enclosing_stmt(#20420,#20404)
 exprContainers(#20420,#20001)
 #20422=*
 exprs(#20422,13,#20420,0,"b?.()")
 #20423=@"loc,{#10000},11,7,11,11"
 locations_default(#20423,#10000,11,7,11,11)
 hasLocation(#20422,#20423)
-enclosingStmt(#20422,#20404)
+enclosing_stmt(#20422,#20404)
 exprContainers(#20422,#20001)
 #20424=*
 exprs(#20424,79,#20422,-1,"b")
 hasLocation(#20424,#20189)
-enclosingStmt(#20424,#20404)
+enclosing_stmt(#20424,#20404)
 exprContainers(#20424,#20001)
 literals("b","b",#20424)
 bind(#20424,#20399)
@@ -1290,27 +1290,27 @@ isOptionalChaining(#20422)
 #20425=*
 exprs(#20425,0,#20420,1,"c")
 hasLocation(#20425,#20199)
-enclosingStmt(#20425,#20404)
+enclosing_stmt(#20425,#20404)
 exprContainers(#20425,#20001)
 literals("c","c",#20425)
 isOptionalChaining(#20418)
 #20426=*
 exprs(#20426,0,#20416,1,"d")
 hasLocation(#20426,#20209)
-enclosingStmt(#20426,#20404)
+enclosing_stmt(#20426,#20404)
 exprContainers(#20426,#20001)
 literals("d","d",#20426)
 #20427=*
 exprs(#20427,0,#20409,1,"e")
 hasLocation(#20427,#20215)
-enclosingStmt(#20427,#20404)
+enclosing_stmt(#20427,#20404)
 exprContainers(#20427,#20001)
 literals("e","e",#20427)
 isOptionalChaining(#20407)
 #20428=*
 exprs(#20428,0,#20405,1,"f")
 hasLocation(#20428,#20225)
-enclosingStmt(#20428,#20404)
+enclosing_stmt(#20428,#20404)
 exprContainers(#20428,#20001)
 literals("f","f",#20428)
 #20429=*
@@ -1324,19 +1324,19 @@ exprs(#20431,14,#20429,0,"a?.b")
 #20432=@"loc,{#10000},13,5,13,8"
 locations_default(#20432,#10000,13,5,13,8)
 hasLocation(#20431,#20432)
-enclosingStmt(#20431,#20429)
+enclosing_stmt(#20431,#20429)
 exprContainers(#20431,#20001)
 #20433=*
 exprs(#20433,79,#20431,0,"a")
 hasLocation(#20433,#20233)
-enclosingStmt(#20433,#20429)
+enclosing_stmt(#20433,#20429)
 exprContainers(#20433,#20001)
 literals("a","a",#20433)
 bind(#20433,#20338)
 #20434=*
 exprs(#20434,0,#20431,1,"b")
 hasLocation(#20434,#20237)
-enclosingStmt(#20434,#20429)
+enclosing_stmt(#20434,#20429)
 exprContainers(#20434,#20001)
 literals("b","b",#20434)
 isOptionalChaining(#20431)
@@ -1355,7 +1355,7 @@ stmt_containers(#20437,#20001)
 #20439=*
 exprs(#20439,2,#20437,0,"true")
 hasLocation(#20439,#20243)
-enclosingStmt(#20439,#20437)
+enclosing_stmt(#20439,#20437)
 exprContainers(#20439,#20001)
 literals("true","true",#20439)
 #20440=*
@@ -1373,7 +1373,7 @@ stmt_containers(#20442,#20001)
 #20444=*
 exprs(#20444,2,#20442,0,"false")
 hasLocation(#20444,#20253)
-enclosingStmt(#20444,#20442)
+enclosing_stmt(#20444,#20442)
 exprContainers(#20444,#20001)
 literals("false","false",#20444)
 #20445=*
@@ -1387,26 +1387,26 @@ exprs(#20447,18,#20445,0,"!a?.b")
 #20448=@"loc,{#10000},19,5,19,9"
 locations_default(#20448,#10000,19,5,19,9)
 hasLocation(#20447,#20448)
-enclosingStmt(#20447,#20445)
+enclosing_stmt(#20447,#20445)
 exprContainers(#20447,#20001)
 #20449=*
 exprs(#20449,14,#20447,0,"a?.b")
 #20450=@"loc,{#10000},19,6,19,9"
 locations_default(#20450,#10000,19,6,19,9)
 hasLocation(#20449,#20450)
-enclosingStmt(#20449,#20445)
+enclosing_stmt(#20449,#20445)
 exprContainers(#20449,#20001)
 #20451=*
 exprs(#20451,79,#20449,0,"a")
 hasLocation(#20451,#20264)
-enclosingStmt(#20451,#20445)
+enclosing_stmt(#20451,#20445)
 exprContainers(#20451,#20001)
 literals("a","a",#20451)
 bind(#20451,#20338)
 #20452=*
 exprs(#20452,0,#20449,1,"b")
 hasLocation(#20452,#20268)
-enclosingStmt(#20452,#20445)
+enclosing_stmt(#20452,#20445)
 exprContainers(#20452,#20001)
 literals("b","b",#20452)
 isOptionalChaining(#20449)
@@ -1425,7 +1425,7 @@ stmt_containers(#20455,#20001)
 #20457=*
 exprs(#20457,2,#20455,0,"true")
 hasLocation(#20457,#20274)
-enclosingStmt(#20457,#20455)
+enclosing_stmt(#20457,#20455)
 exprContainers(#20457,#20001)
 literals("true","true",#20457)
 #20458=*
@@ -1443,7 +1443,7 @@ stmt_containers(#20460,#20001)
 #20462=*
 exprs(#20462,2,#20460,0,"false")
 hasLocation(#20462,#20284)
-enclosingStmt(#20462,#20460)
+enclosing_stmt(#20462,#20460)
 exprContainers(#20462,#20001)
 literals("false","false",#20462)
 #20463=*
@@ -1457,26 +1457,26 @@ exprs(#20465,44,#20463,0,"a?.b && c?.d")
 #20466=@"loc,{#10000},25,5,25,16"
 locations_default(#20466,#10000,25,5,25,16)
 hasLocation(#20465,#20466)
-enclosingStmt(#20465,#20463)
+enclosing_stmt(#20465,#20463)
 exprContainers(#20465,#20001)
 #20467=*
 exprs(#20467,14,#20465,0,"a?.b")
 #20468=@"loc,{#10000},25,5,25,8"
 locations_default(#20468,#10000,25,5,25,8)
 hasLocation(#20467,#20468)
-enclosingStmt(#20467,#20463)
+enclosing_stmt(#20467,#20463)
 exprContainers(#20467,#20001)
 #20469=*
 exprs(#20469,79,#20467,0,"a")
 hasLocation(#20469,#20293)
-enclosingStmt(#20469,#20463)
+enclosing_stmt(#20469,#20463)
 exprContainers(#20469,#20001)
 literals("a","a",#20469)
 bind(#20469,#20338)
 #20470=*
 exprs(#20470,0,#20467,1,"b")
 hasLocation(#20470,#20297)
-enclosingStmt(#20470,#20463)
+enclosing_stmt(#20470,#20463)
 exprContainers(#20470,#20001)
 literals("b","b",#20470)
 isOptionalChaining(#20467)
@@ -1485,12 +1485,12 @@ exprs(#20471,14,#20465,1,"c?.d")
 #20472=@"loc,{#10000},25,13,25,16"
 locations_default(#20472,#10000,25,13,25,16)
 hasLocation(#20471,#20472)
-enclosingStmt(#20471,#20463)
+enclosing_stmt(#20471,#20463)
 exprContainers(#20471,#20001)
 #20473=*
 exprs(#20473,79,#20471,0,"c")
 hasLocation(#20473,#20301)
-enclosingStmt(#20473,#20463)
+enclosing_stmt(#20473,#20463)
 exprContainers(#20473,#20001)
 literals("c","c",#20473)
 #20474=@"var;{c};{#20000}"
@@ -1499,7 +1499,7 @@ bind(#20473,#20474)
 #20475=*
 exprs(#20475,0,#20471,1,"d")
 hasLocation(#20475,#20305)
-enclosingStmt(#20475,#20463)
+enclosing_stmt(#20475,#20463)
 exprContainers(#20475,#20001)
 literals("d","d",#20475)
 isOptionalChaining(#20471)
@@ -1518,7 +1518,7 @@ stmt_containers(#20478,#20001)
 #20480=*
 exprs(#20480,2,#20478,0,"true")
 hasLocation(#20480,#20311)
-enclosingStmt(#20480,#20478)
+enclosing_stmt(#20480,#20478)
 exprContainers(#20480,#20001)
 literals("true","true",#20480)
 #20481=*
@@ -1536,7 +1536,7 @@ stmt_containers(#20483,#20001)
 #20485=*
 exprs(#20485,2,#20483,0,"false")
 hasLocation(#20485,#20321)
-enclosingStmt(#20485,#20483)
+enclosing_stmt(#20485,#20483)
 exprContainers(#20485,#20001)
 literals("false","false",#20485)
 #20486=*
diff --git a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
index c9b2500b1b0..1546df0c065 100644
--- a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
@@ -165,7 +165,7 @@ stmt_containers(#20058,#20001)
 #20059=*
 exprs(#20059,4,#20058,-1,"'settings'")
 hasLocation(#20059,#20017)
-enclosingStmt(#20059,#20058)
+enclosing_stmt(#20059,#20058)
 exprContainers(#20059,#20001)
 literals("settings","'settings'",#20059)
 #20060=*
@@ -177,18 +177,18 @@ regexpConstValue(#20060,"settings")
 #20062=*
 exprs(#20062,83,#20058,0,"language")
 hasLocation(#20062,#20011)
-enclosingStmt(#20062,#20058)
+enclosing_stmt(#20062,#20058)
 exprContainers(#20062,#20001)
 #20063=*
 exprs(#20063,0,#20062,0,"language")
 hasLocation(#20063,#20011)
-enclosingStmt(#20063,#20058)
+enclosing_stmt(#20063,#20058)
 exprContainers(#20063,#20001)
 literals("language","language",#20063)
 #20064=*
 exprs(#20064,78,#20062,1,"language")
 hasLocation(#20064,#20011)
-enclosingStmt(#20064,#20058)
+enclosing_stmt(#20064,#20058)
 exprContainers(#20064,#20001)
 literals("language","language",#20064)
 decl(#20064,#20054)
@@ -203,12 +203,12 @@ exprs(#20066,64,#20065,0,"strings ... uage}`)")
 #20067=@"loc,{#10000},2,7,2,50"
 locations_default(#20067,#10000,2,7,2,50)
 hasLocation(#20066,#20067)
-enclosingStmt(#20066,#20065)
+enclosing_stmt(#20066,#20065)
 exprContainers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"strings")
 hasLocation(#20068,#20023)
-enclosingStmt(#20068,#20065)
+enclosing_stmt(#20068,#20065)
 exprContainers(#20068,#20001)
 literals("strings","strings",#20068)
 decl(#20068,#20057)
@@ -217,32 +217,32 @@ exprs(#20069,92,#20066,1,"await i ... uage}`)")
 #20070=@"loc,{#10000},2,17,2,50"
 locations_default(#20070,#10000,2,17,2,50)
 hasLocation(#20069,#20070)
-enclosingStmt(#20069,#20065)
+enclosing_stmt(#20069,#20065)
 exprContainers(#20069,#20001)
 #20071=*
 exprs(#20071,99,#20069,0,"import( ... uage}`)")
 #20072=@"loc,{#10000},2,23,2,50"
 locations_default(#20072,#10000,2,23,2,50)
 hasLocation(#20071,#20072)
-enclosingStmt(#20071,#20065)
+enclosing_stmt(#20071,#20065)
 exprContainers(#20071,#20001)
 #20073=*
 exprs(#20073,71,#20071,0,"`./i18n/${language}`")
 #20074=@"loc,{#10000},2,30,2,49"
 locations_default(#20074,#10000,2,30,2,49)
 hasLocation(#20073,#20074)
-enclosingStmt(#20073,#20065)
+enclosing_stmt(#20073,#20065)
 exprContainers(#20073,#20001)
 #20075=*
 exprs(#20075,72,#20073,0,"./i18n/")
 hasLocation(#20075,#20035)
-enclosingStmt(#20075,#20065)
+enclosing_stmt(#20075,#20065)
 exprContainers(#20075,#20001)
 literals("./i18n/","./i18n/",#20075)
 #20076=*
 exprs(#20076,79,#20073,1,"language")
 hasLocation(#20076,#20039)
-enclosingStmt(#20076,#20065)
+enclosing_stmt(#20076,#20065)
 exprContainers(#20076,#20001)
 literals("language","language",#20076)
 bind(#20076,#20054)
diff --git a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
index a4320dff1f6..feae9b7b842 100644
--- a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
@@ -133,19 +133,19 @@ stmt_containers(#20042,#20035)
 #20044=*
 exprs(#20044,69,#20042,0,"yield import(""foo"")")
 hasLocation(#20044,#20043)
-enclosingStmt(#20044,#20042)
+enclosing_stmt(#20044,#20042)
 exprContainers(#20044,#20035)
 #20045=*
 exprs(#20045,99,#20044,0,"import(""foo"")")
 #20046=@"loc,{#10000},2,9,2,21"
 locations_default(#20046,#10000,2,9,2,21)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20042)
+enclosing_stmt(#20045,#20042)
 exprContainers(#20045,#20035)
 #20047=*
 exprs(#20047,4,#20045,0,"""foo""")
 hasLocation(#20047,#20027)
-enclosingStmt(#20047,#20042)
+enclosing_stmt(#20047,#20042)
 exprContainers(#20047,#20035)
 literals("foo","""foo""",#20047)
 #20048=*
diff --git a/javascript/extractor/tests/excludes/output/trap/a.js.trap b/javascript/extractor/tests/excludes/output/trap/a.js.trap
index 878ff9bea6d..2f00ed48c1f 100644
--- a/javascript/extractor/tests/excludes/output/trap/a.js.trap
+++ b/javascript/extractor/tests/excludes/output/trap/a.js.trap
@@ -32,7 +32,7 @@ stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,3,#20007,0,"42")
 hasLocation(#20008,#20003)
-enclosingStmt(#20008,#20007)
+enclosing_stmt(#20008,#20007)
 exprContainers(#20008,#20001)
 literals("42","42",#20008)
 #20009=*
diff --git a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
index a92fb32819e..0eb5eff6f71 100644
--- a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
@@ -339,12 +339,12 @@ exprs(#20126,47,#20125,0,"a = 23")
 #20127=@"loc,{#10000},1,1,1,6"
 locations_default(#20127,#10000,1,1,1,6)
 hasLocation(#20126,#20127)
-enclosingStmt(#20126,#20125)
+enclosing_stmt(#20126,#20125)
 exprContainers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,0,"a")
 hasLocation(#20128,#20027)
-enclosingStmt(#20128,#20125)
+enclosing_stmt(#20128,#20125)
 exprContainers(#20128,#20001)
 literals("a","a",#20128)
 #20129=@"var;{a};{#20000}"
@@ -353,7 +353,7 @@ bind(#20128,#20129)
 #20130=*
 exprs(#20130,3,#20126,1,"23")
 hasLocation(#20130,#20031)
-enclosingStmt(#20130,#20125)
+enclosing_stmt(#20130,#20125)
 exprContainers(#20130,#20001)
 literals("23","23",#20130)
 #20131=*
@@ -365,19 +365,19 @@ exprs(#20132,48,#20131,0,"a += 19")
 #20133=@"loc,{#10000},2,1,2,7"
 locations_default(#20133,#10000,2,1,2,7)
 hasLocation(#20132,#20133)
-enclosingStmt(#20132,#20131)
+enclosing_stmt(#20132,#20131)
 exprContainers(#20132,#20001)
 #20134=*
 exprs(#20134,79,#20132,0,"a")
 hasLocation(#20134,#20035)
-enclosingStmt(#20134,#20131)
+enclosing_stmt(#20134,#20131)
 exprContainers(#20134,#20001)
 literals("a","a",#20134)
 bind(#20134,#20129)
 #20135=*
 exprs(#20135,3,#20132,1,"19")
 hasLocation(#20135,#20039)
-enclosingStmt(#20135,#20131)
+enclosing_stmt(#20135,#20131)
 exprContainers(#20135,#20001)
 literals("19","19",#20135)
 #20136=*
@@ -389,19 +389,19 @@ exprs(#20137,49,#20136,0,"a -= 9")
 #20138=@"loc,{#10000},3,1,3,6"
 locations_default(#20138,#10000,3,1,3,6)
 hasLocation(#20137,#20138)
-enclosingStmt(#20137,#20136)
+enclosing_stmt(#20137,#20136)
 exprContainers(#20137,#20001)
 #20139=*
 exprs(#20139,79,#20137,0,"a")
 hasLocation(#20139,#20043)
-enclosingStmt(#20139,#20136)
+enclosing_stmt(#20139,#20136)
 exprContainers(#20139,#20001)
 literals("a","a",#20139)
 bind(#20139,#20129)
 #20140=*
 exprs(#20140,3,#20137,1,"9")
 hasLocation(#20140,#20047)
-enclosingStmt(#20140,#20136)
+enclosing_stmt(#20140,#20136)
 exprContainers(#20140,#20001)
 literals("9","9",#20140)
 #20141=*
@@ -413,19 +413,19 @@ exprs(#20142,50,#20141,0,"a *= b")
 #20143=@"loc,{#10000},4,1,4,6"
 locations_default(#20143,#10000,4,1,4,6)
 hasLocation(#20142,#20143)
-enclosingStmt(#20142,#20141)
+enclosing_stmt(#20142,#20141)
 exprContainers(#20142,#20001)
 #20144=*
 exprs(#20144,79,#20142,0,"a")
 hasLocation(#20144,#20051)
-enclosingStmt(#20144,#20141)
+enclosing_stmt(#20144,#20141)
 exprContainers(#20144,#20001)
 literals("a","a",#20144)
 bind(#20144,#20129)
 #20145=*
 exprs(#20145,79,#20142,1,"b")
 hasLocation(#20145,#20055)
-enclosingStmt(#20145,#20141)
+enclosing_stmt(#20145,#20141)
 exprContainers(#20145,#20001)
 literals("b","b",#20145)
 #20146=@"var;{b};{#20000}"
@@ -440,19 +440,19 @@ exprs(#20148,51,#20147,0,"a /= 2")
 #20149=@"loc,{#10000},5,1,5,6"
 locations_default(#20149,#10000,5,1,5,6)
 hasLocation(#20148,#20149)
-enclosingStmt(#20148,#20147)
+enclosing_stmt(#20148,#20147)
 exprContainers(#20148,#20001)
 #20150=*
 exprs(#20150,79,#20148,0,"a")
 hasLocation(#20150,#20059)
-enclosingStmt(#20150,#20147)
+enclosing_stmt(#20150,#20147)
 exprContainers(#20150,#20001)
 literals("a","a",#20150)
 bind(#20150,#20129)
 #20151=*
 exprs(#20151,3,#20148,1,"2")
 hasLocation(#20151,#20063)
-enclosingStmt(#20151,#20147)
+enclosing_stmt(#20151,#20147)
 exprContainers(#20151,#20001)
 literals("2","2",#20151)
 #20152=*
@@ -464,19 +464,19 @@ exprs(#20153,52,#20152,0,"a %= 2")
 #20154=@"loc,{#10000},6,1,6,6"
 locations_default(#20154,#10000,6,1,6,6)
 hasLocation(#20153,#20154)
-enclosingStmt(#20153,#20152)
+enclosing_stmt(#20153,#20152)
 exprContainers(#20153,#20001)
 #20155=*
 exprs(#20155,79,#20153,0,"a")
 hasLocation(#20155,#20067)
-enclosingStmt(#20155,#20152)
+enclosing_stmt(#20155,#20152)
 exprContainers(#20155,#20001)
 literals("a","a",#20155)
 bind(#20155,#20129)
 #20156=*
 exprs(#20156,3,#20153,1,"2")
 hasLocation(#20156,#20071)
-enclosingStmt(#20156,#20152)
+enclosing_stmt(#20156,#20152)
 exprContainers(#20156,#20001)
 literals("2","2",#20156)
 #20157=*
@@ -488,19 +488,19 @@ exprs(#20158,53,#20157,0,"a <<= 8")
 #20159=@"loc,{#10000},7,1,7,7"
 locations_default(#20159,#10000,7,1,7,7)
 hasLocation(#20158,#20159)
-enclosingStmt(#20158,#20157)
+enclosing_stmt(#20158,#20157)
 exprContainers(#20158,#20001)
 #20160=*
 exprs(#20160,79,#20158,0,"a")
 hasLocation(#20160,#20075)
-enclosingStmt(#20160,#20157)
+enclosing_stmt(#20160,#20157)
 exprContainers(#20160,#20001)
 literals("a","a",#20160)
 bind(#20160,#20129)
 #20161=*
 exprs(#20161,3,#20158,1,"8")
 hasLocation(#20161,#20079)
-enclosingStmt(#20161,#20157)
+enclosing_stmt(#20161,#20157)
 exprContainers(#20161,#20001)
 literals("8","8",#20161)
 #20162=*
@@ -512,19 +512,19 @@ exprs(#20163,54,#20162,0,"a >>= 7")
 #20164=@"loc,{#10000},8,1,8,7"
 locations_default(#20164,#10000,8,1,8,7)
 hasLocation(#20163,#20164)
-enclosingStmt(#20163,#20162)
+enclosing_stmt(#20163,#20162)
 exprContainers(#20163,#20001)
 #20165=*
 exprs(#20165,79,#20163,0,"a")
 hasLocation(#20165,#20083)
-enclosingStmt(#20165,#20162)
+enclosing_stmt(#20165,#20162)
 exprContainers(#20165,#20001)
 literals("a","a",#20165)
 bind(#20165,#20129)
 #20166=*
 exprs(#20166,3,#20163,1,"7")
 hasLocation(#20166,#20087)
-enclosingStmt(#20166,#20162)
+enclosing_stmt(#20166,#20162)
 exprContainers(#20166,#20001)
 literals("7","7",#20166)
 #20167=*
@@ -536,19 +536,19 @@ exprs(#20168,55,#20167,0,"a >>>= 2")
 #20169=@"loc,{#10000},9,1,9,8"
 locations_default(#20169,#10000,9,1,9,8)
 hasLocation(#20168,#20169)
-enclosingStmt(#20168,#20167)
+enclosing_stmt(#20168,#20167)
 exprContainers(#20168,#20001)
 #20170=*
 exprs(#20170,79,#20168,0,"a")
 hasLocation(#20170,#20091)
-enclosingStmt(#20170,#20167)
+enclosing_stmt(#20170,#20167)
 exprContainers(#20170,#20001)
 literals("a","a",#20170)
 bind(#20170,#20129)
 #20171=*
 exprs(#20171,3,#20168,1,"2")
 hasLocation(#20171,#20095)
-enclosingStmt(#20171,#20167)
+enclosing_stmt(#20171,#20167)
 exprContainers(#20171,#20001)
 literals("2","2",#20171)
 #20172=*
@@ -560,19 +560,19 @@ exprs(#20173,56,#20172,0,"a |= 2")
 #20174=@"loc,{#10000},10,1,10,6"
 locations_default(#20174,#10000,10,1,10,6)
 hasLocation(#20173,#20174)
-enclosingStmt(#20173,#20172)
+enclosing_stmt(#20173,#20172)
 exprContainers(#20173,#20001)
 #20175=*
 exprs(#20175,79,#20173,0,"a")
 hasLocation(#20175,#20099)
-enclosingStmt(#20175,#20172)
+enclosing_stmt(#20175,#20172)
 exprContainers(#20175,#20001)
 literals("a","a",#20175)
 bind(#20175,#20129)
 #20176=*
 exprs(#20176,3,#20173,1,"2")
 hasLocation(#20176,#20103)
-enclosingStmt(#20176,#20172)
+enclosing_stmt(#20176,#20172)
 exprContainers(#20176,#20001)
 literals("2","2",#20176)
 #20177=*
@@ -584,19 +584,19 @@ exprs(#20178,57,#20177,0,"a ^= 1")
 #20179=@"loc,{#10000},11,1,11,6"
 locations_default(#20179,#10000,11,1,11,6)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20177)
+enclosing_stmt(#20178,#20177)
 exprContainers(#20178,#20001)
 #20180=*
 exprs(#20180,79,#20178,0,"a")
 hasLocation(#20180,#20107)
-enclosingStmt(#20180,#20177)
+enclosing_stmt(#20180,#20177)
 exprContainers(#20180,#20001)
 literals("a","a",#20180)
 bind(#20180,#20129)
 #20181=*
 exprs(#20181,3,#20178,1,"1")
 hasLocation(#20181,#20111)
-enclosingStmt(#20181,#20177)
+enclosing_stmt(#20181,#20177)
 exprContainers(#20181,#20001)
 literals("1","1",#20181)
 #20182=*
@@ -608,19 +608,19 @@ exprs(#20183,58,#20182,0,"a &= 3")
 #20184=@"loc,{#10000},12,1,12,6"
 locations_default(#20184,#10000,12,1,12,6)
 hasLocation(#20183,#20184)
-enclosingStmt(#20183,#20182)
+enclosing_stmt(#20183,#20182)
 exprContainers(#20183,#20001)
 #20185=*
 exprs(#20185,79,#20183,0,"a")
 hasLocation(#20185,#20115)
-enclosingStmt(#20185,#20182)
+enclosing_stmt(#20185,#20182)
 exprContainers(#20185,#20001)
 literals("a","a",#20185)
 bind(#20185,#20129)
 #20186=*
 exprs(#20186,3,#20183,1,"3")
 hasLocation(#20186,#20119)
-enclosingStmt(#20186,#20182)
+enclosing_stmt(#20186,#20182)
 exprContainers(#20186,#20001)
 literals("3","3",#20186)
 #20187=*
diff --git a/javascript/extractor/tests/exprs/output/trap/binary.js.trap b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
index 9d324cdc2ae..245ed52b0aa 100644
--- a/javascript/extractor/tests/exprs/output/trap/binary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
@@ -423,18 +423,18 @@ exprs(#20158,31,#20157,0,"1 << 2")
 #20159=@"loc,{#10000},1,1,1,6"
 locations_default(#20159,#10000,1,1,1,6)
 hasLocation(#20158,#20159)
-enclosingStmt(#20158,#20157)
+enclosing_stmt(#20158,#20157)
 exprContainers(#20158,#20001)
 #20160=*
 exprs(#20160,3,#20158,0,"1")
 hasLocation(#20160,#20033)
-enclosingStmt(#20160,#20157)
+enclosing_stmt(#20160,#20157)
 exprContainers(#20160,#20001)
 literals("1","1",#20160)
 #20161=*
 exprs(#20161,3,#20158,1,"2")
 hasLocation(#20161,#20037)
-enclosingStmt(#20161,#20157)
+enclosing_stmt(#20161,#20157)
 exprContainers(#20161,#20001)
 literals("2","2",#20161)
 #20162=*
@@ -446,18 +446,18 @@ exprs(#20163,32,#20162,0,"2 >> 1")
 #20164=@"loc,{#10000},2,1,2,6"
 locations_default(#20164,#10000,2,1,2,6)
 hasLocation(#20163,#20164)
-enclosingStmt(#20163,#20162)
+enclosing_stmt(#20163,#20162)
 exprContainers(#20163,#20001)
 #20165=*
 exprs(#20165,3,#20163,0,"2")
 hasLocation(#20165,#20041)
-enclosingStmt(#20165,#20162)
+enclosing_stmt(#20165,#20162)
 exprContainers(#20165,#20001)
 literals("2","2",#20165)
 #20166=*
 exprs(#20166,3,#20163,1,"1")
 hasLocation(#20166,#20045)
-enclosingStmt(#20166,#20162)
+enclosing_stmt(#20166,#20162)
 exprContainers(#20166,#20001)
 literals("1","1",#20166)
 #20167=*
@@ -469,18 +469,18 @@ exprs(#20168,33,#20167,0,"2 >>> 1")
 #20169=@"loc,{#10000},3,1,3,7"
 locations_default(#20169,#10000,3,1,3,7)
 hasLocation(#20168,#20169)
-enclosingStmt(#20168,#20167)
+enclosing_stmt(#20168,#20167)
 exprContainers(#20168,#20001)
 #20170=*
 exprs(#20170,3,#20168,0,"2")
 hasLocation(#20170,#20049)
-enclosingStmt(#20170,#20167)
+enclosing_stmt(#20170,#20167)
 exprContainers(#20170,#20001)
 literals("2","2",#20170)
 #20171=*
 exprs(#20171,3,#20168,1,"1")
 hasLocation(#20171,#20053)
-enclosingStmt(#20171,#20167)
+enclosing_stmt(#20171,#20167)
 exprContainers(#20171,#20001)
 literals("1","1",#20171)
 #20172=*
@@ -492,18 +492,18 @@ exprs(#20173,34,#20172,0,"23 + 19")
 #20174=@"loc,{#10000},4,1,4,7"
 locations_default(#20174,#10000,4,1,4,7)
 hasLocation(#20173,#20174)
-enclosingStmt(#20173,#20172)
+enclosing_stmt(#20173,#20172)
 exprContainers(#20173,#20001)
 #20175=*
 exprs(#20175,3,#20173,0,"23")
 hasLocation(#20175,#20057)
-enclosingStmt(#20175,#20172)
+enclosing_stmt(#20175,#20172)
 exprContainers(#20175,#20001)
 literals("23","23",#20175)
 #20176=*
 exprs(#20176,3,#20173,1,"19")
 hasLocation(#20176,#20061)
-enclosingStmt(#20176,#20172)
+enclosing_stmt(#20176,#20172)
 exprContainers(#20176,#20001)
 literals("19","19",#20176)
 #20177=*
@@ -515,18 +515,18 @@ exprs(#20178,35,#20177,0,"42 - 19")
 #20179=@"loc,{#10000},5,1,5,7"
 locations_default(#20179,#10000,5,1,5,7)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20177)
+enclosing_stmt(#20178,#20177)
 exprContainers(#20178,#20001)
 #20180=*
 exprs(#20180,3,#20178,0,"42")
 hasLocation(#20180,#20065)
-enclosingStmt(#20180,#20177)
+enclosing_stmt(#20180,#20177)
 exprContainers(#20180,#20001)
 literals("42","42",#20180)
 #20181=*
 exprs(#20181,3,#20178,1,"19")
 hasLocation(#20181,#20069)
-enclosingStmt(#20181,#20177)
+enclosing_stmt(#20181,#20177)
 exprContainers(#20181,#20001)
 literals("19","19",#20181)
 #20182=*
@@ -538,18 +538,18 @@ exprs(#20183,36,#20182,0,"2 * 3")
 #20184=@"loc,{#10000},6,1,6,5"
 locations_default(#20184,#10000,6,1,6,5)
 hasLocation(#20183,#20184)
-enclosingStmt(#20183,#20182)
+enclosing_stmt(#20183,#20182)
 exprContainers(#20183,#20001)
 #20185=*
 exprs(#20185,3,#20183,0,"2")
 hasLocation(#20185,#20073)
-enclosingStmt(#20185,#20182)
+enclosing_stmt(#20185,#20182)
 exprContainers(#20185,#20001)
 literals("2","2",#20185)
 #20186=*
 exprs(#20186,3,#20183,1,"3")
 hasLocation(#20186,#20077)
-enclosingStmt(#20186,#20182)
+enclosing_stmt(#20186,#20182)
 exprContainers(#20186,#20001)
 literals("3","3",#20186)
 #20187=*
@@ -561,18 +561,18 @@ exprs(#20188,37,#20187,0,"8 / 5")
 #20189=@"loc,{#10000},7,1,7,5"
 locations_default(#20189,#10000,7,1,7,5)
 hasLocation(#20188,#20189)
-enclosingStmt(#20188,#20187)
+enclosing_stmt(#20188,#20187)
 exprContainers(#20188,#20001)
 #20190=*
 exprs(#20190,3,#20188,0,"8")
 hasLocation(#20190,#20081)
-enclosingStmt(#20190,#20187)
+enclosing_stmt(#20190,#20187)
 exprContainers(#20190,#20001)
 literals("8","8",#20190)
 #20191=*
 exprs(#20191,3,#20188,1,"5")
 hasLocation(#20191,#20085)
-enclosingStmt(#20191,#20187)
+enclosing_stmt(#20191,#20187)
 exprContainers(#20191,#20001)
 literals("5","5",#20191)
 #20192=*
@@ -584,18 +584,18 @@ exprs(#20193,38,#20192,0,"2 % 1")
 #20194=@"loc,{#10000},8,1,8,5"
 locations_default(#20194,#10000,8,1,8,5)
 hasLocation(#20193,#20194)
-enclosingStmt(#20193,#20192)
+enclosing_stmt(#20193,#20192)
 exprContainers(#20193,#20001)
 #20195=*
 exprs(#20195,3,#20193,0,"2")
 hasLocation(#20195,#20089)
-enclosingStmt(#20195,#20192)
+enclosing_stmt(#20195,#20192)
 exprContainers(#20195,#20001)
 literals("2","2",#20195)
 #20196=*
 exprs(#20196,3,#20193,1,"1")
 hasLocation(#20196,#20093)
-enclosingStmt(#20196,#20192)
+enclosing_stmt(#20196,#20192)
 exprContainers(#20196,#20001)
 literals("1","1",#20196)
 #20197=*
@@ -607,18 +607,18 @@ exprs(#20198,39,#20197,0,"2 | 3")
 #20199=@"loc,{#10000},9,1,9,5"
 locations_default(#20199,#10000,9,1,9,5)
 hasLocation(#20198,#20199)
-enclosingStmt(#20198,#20197)
+enclosing_stmt(#20198,#20197)
 exprContainers(#20198,#20001)
 #20200=*
 exprs(#20200,3,#20198,0,"2")
 hasLocation(#20200,#20097)
-enclosingStmt(#20200,#20197)
+enclosing_stmt(#20200,#20197)
 exprContainers(#20200,#20001)
 literals("2","2",#20200)
 #20201=*
 exprs(#20201,3,#20198,1,"3")
 hasLocation(#20201,#20101)
-enclosingStmt(#20201,#20197)
+enclosing_stmt(#20201,#20197)
 exprContainers(#20201,#20001)
 literals("3","3",#20201)
 #20202=*
@@ -630,18 +630,18 @@ exprs(#20203,40,#20202,0,"2 ^ 3")
 #20204=@"loc,{#10000},10,1,10,5"
 locations_default(#20204,#10000,10,1,10,5)
 hasLocation(#20203,#20204)
-enclosingStmt(#20203,#20202)
+enclosing_stmt(#20203,#20202)
 exprContainers(#20203,#20001)
 #20205=*
 exprs(#20205,3,#20203,0,"2")
 hasLocation(#20205,#20105)
-enclosingStmt(#20205,#20202)
+enclosing_stmt(#20205,#20202)
 exprContainers(#20205,#20001)
 literals("2","2",#20205)
 #20206=*
 exprs(#20206,3,#20203,1,"3")
 hasLocation(#20206,#20109)
-enclosingStmt(#20206,#20202)
+enclosing_stmt(#20206,#20202)
 exprContainers(#20206,#20001)
 literals("3","3",#20206)
 #20207=*
@@ -653,18 +653,18 @@ exprs(#20208,41,#20207,0,"2 & 3")
 #20209=@"loc,{#10000},11,1,11,5"
 locations_default(#20209,#10000,11,1,11,5)
 hasLocation(#20208,#20209)
-enclosingStmt(#20208,#20207)
+enclosing_stmt(#20208,#20207)
 exprContainers(#20208,#20001)
 #20210=*
 exprs(#20210,3,#20208,0,"2")
 hasLocation(#20210,#20113)
-enclosingStmt(#20210,#20207)
+enclosing_stmt(#20210,#20207)
 exprContainers(#20210,#20001)
 literals("2","2",#20210)
 #20211=*
 exprs(#20211,3,#20208,1,"3")
 hasLocation(#20211,#20117)
-enclosingStmt(#20211,#20207)
+enclosing_stmt(#20211,#20207)
 exprContainers(#20211,#20001)
 literals("3","3",#20211)
 #20212=*
@@ -676,12 +676,12 @@ exprs(#20213,42,#20212,0,"'protot ...  Object")
 #20214=@"loc,{#10000},12,1,12,21"
 locations_default(#20214,#10000,12,1,12,21)
 hasLocation(#20213,#20214)
-enclosingStmt(#20213,#20212)
+enclosing_stmt(#20213,#20212)
 exprContainers(#20213,#20001)
 #20215=*
 exprs(#20215,4,#20213,0,"'prototype'")
 hasLocation(#20215,#20121)
-enclosingStmt(#20215,#20212)
+enclosing_stmt(#20215,#20212)
 exprContainers(#20215,#20001)
 literals("prototype","'prototype'",#20215)
 #20216=*
@@ -693,7 +693,7 @@ regexpConstValue(#20216,"prototype")
 #20218=*
 exprs(#20218,79,#20213,1,"Object")
 hasLocation(#20218,#20125)
-enclosingStmt(#20218,#20212)
+enclosing_stmt(#20218,#20212)
 exprContainers(#20218,#20001)
 literals("Object","Object",#20218)
 #20219=@"var;{Object};{#20000}"
@@ -708,20 +708,20 @@ exprs(#20221,43,#20220,0,"[] instanceof Array")
 #20222=@"loc,{#10000},13,1,13,19"
 locations_default(#20222,#10000,13,1,13,19)
 hasLocation(#20221,#20222)
-enclosingStmt(#20221,#20220)
+enclosing_stmt(#20221,#20220)
 exprContainers(#20221,#20001)
 #20223=*
 exprs(#20223,7,#20221,0,"[]")
 #20224=@"loc,{#10000},13,1,13,2"
 locations_default(#20224,#10000,13,1,13,2)
 hasLocation(#20223,#20224)
-enclosingStmt(#20223,#20220)
+enclosing_stmt(#20223,#20220)
 exprContainers(#20223,#20001)
 arraySize(#20223,0)
 #20225=*
 exprs(#20225,79,#20221,1,"Array")
 hasLocation(#20225,#20135)
-enclosingStmt(#20225,#20220)
+enclosing_stmt(#20225,#20220)
 exprContainers(#20225,#20001)
 literals("Array","Array",#20225)
 #20226=@"var;{Array};{#20000}"
@@ -736,18 +736,18 @@ exprs(#20228,44,#20227,0,"1 && 2")
 #20229=@"loc,{#10000},14,1,14,6"
 locations_default(#20229,#10000,14,1,14,6)
 hasLocation(#20228,#20229)
-enclosingStmt(#20228,#20227)
+enclosing_stmt(#20228,#20227)
 exprContainers(#20228,#20001)
 #20230=*
 exprs(#20230,3,#20228,0,"1")
 hasLocation(#20230,#20139)
-enclosingStmt(#20230,#20227)
+enclosing_stmt(#20230,#20227)
 exprContainers(#20230,#20001)
 literals("1","1",#20230)
 #20231=*
 exprs(#20231,3,#20228,1,"2")
 hasLocation(#20231,#20143)
-enclosingStmt(#20231,#20227)
+enclosing_stmt(#20231,#20227)
 exprContainers(#20231,#20001)
 literals("2","2",#20231)
 #20232=*
@@ -759,18 +759,18 @@ exprs(#20233,45,#20232,0,"1 || 2")
 #20234=@"loc,{#10000},15,1,15,6"
 locations_default(#20234,#10000,15,1,15,6)
 hasLocation(#20233,#20234)
-enclosingStmt(#20233,#20232)
+enclosing_stmt(#20233,#20232)
 exprContainers(#20233,#20001)
 #20235=*
 exprs(#20235,3,#20233,0,"1")
 hasLocation(#20235,#20147)
-enclosingStmt(#20235,#20232)
+enclosing_stmt(#20235,#20232)
 exprContainers(#20235,#20001)
 literals("1","1",#20235)
 #20236=*
 exprs(#20236,3,#20233,1,"2")
 hasLocation(#20236,#20151)
-enclosingStmt(#20236,#20232)
+enclosing_stmt(#20236,#20232)
 exprContainers(#20236,#20001)
 literals("2","2",#20236)
 #20237=*
diff --git a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
index 6747b99f606..e4c42625ef7 100644
--- a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
@@ -236,18 +236,18 @@ exprs(#20086,23,#20085,0,"1 == 1")
 #20087=@"loc,{#10000},1,1,1,6"
 locations_default(#20087,#10000,1,1,1,6)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20085)
+enclosing_stmt(#20086,#20085)
 exprContainers(#20086,#20001)
 #20088=*
 exprs(#20088,3,#20086,0,"1")
 hasLocation(#20088,#20019)
-enclosingStmt(#20088,#20085)
+enclosing_stmt(#20088,#20085)
 exprContainers(#20088,#20001)
 literals("1","1",#20088)
 #20089=*
 exprs(#20089,3,#20086,1,"1")
 hasLocation(#20089,#20023)
-enclosingStmt(#20089,#20085)
+enclosing_stmt(#20089,#20085)
 exprContainers(#20089,#20001)
 literals("1","1",#20089)
 #20090=*
@@ -259,18 +259,18 @@ exprs(#20091,24,#20090,0,"1 != 2")
 #20092=@"loc,{#10000},2,1,2,6"
 locations_default(#20092,#10000,2,1,2,6)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20001)
 #20093=*
 exprs(#20093,3,#20091,0,"1")
 hasLocation(#20093,#20027)
-enclosingStmt(#20093,#20090)
+enclosing_stmt(#20093,#20090)
 exprContainers(#20093,#20001)
 literals("1","1",#20093)
 #20094=*
 exprs(#20094,3,#20091,1,"2")
 hasLocation(#20094,#20031)
-enclosingStmt(#20094,#20090)
+enclosing_stmt(#20094,#20090)
 exprContainers(#20094,#20001)
 literals("2","2",#20094)
 #20095=*
@@ -282,18 +282,18 @@ exprs(#20096,25,#20095,0,"1 === 1")
 #20097=@"loc,{#10000},3,1,3,7"
 locations_default(#20097,#10000,3,1,3,7)
 hasLocation(#20096,#20097)
-enclosingStmt(#20096,#20095)
+enclosing_stmt(#20096,#20095)
 exprContainers(#20096,#20001)
 #20098=*
 exprs(#20098,3,#20096,0,"1")
 hasLocation(#20098,#20035)
-enclosingStmt(#20098,#20095)
+enclosing_stmt(#20098,#20095)
 exprContainers(#20098,#20001)
 literals("1","1",#20098)
 #20099=*
 exprs(#20099,3,#20096,1,"1")
 hasLocation(#20099,#20039)
-enclosingStmt(#20099,#20095)
+enclosing_stmt(#20099,#20095)
 exprContainers(#20099,#20001)
 literals("1","1",#20099)
 #20100=*
@@ -305,18 +305,18 @@ exprs(#20101,26,#20100,0,"1 !== 2")
 #20102=@"loc,{#10000},4,1,4,7"
 locations_default(#20102,#10000,4,1,4,7)
 hasLocation(#20101,#20102)
-enclosingStmt(#20101,#20100)
+enclosing_stmt(#20101,#20100)
 exprContainers(#20101,#20001)
 #20103=*
 exprs(#20103,3,#20101,0,"1")
 hasLocation(#20103,#20043)
-enclosingStmt(#20103,#20100)
+enclosing_stmt(#20103,#20100)
 exprContainers(#20103,#20001)
 literals("1","1",#20103)
 #20104=*
 exprs(#20104,3,#20101,1,"2")
 hasLocation(#20104,#20047)
-enclosingStmt(#20104,#20100)
+enclosing_stmt(#20104,#20100)
 exprContainers(#20104,#20001)
 literals("2","2",#20104)
 #20105=*
@@ -328,18 +328,18 @@ exprs(#20106,27,#20105,0,"1 < 2")
 #20107=@"loc,{#10000},5,1,5,5"
 locations_default(#20107,#10000,5,1,5,5)
 hasLocation(#20106,#20107)
-enclosingStmt(#20106,#20105)
+enclosing_stmt(#20106,#20105)
 exprContainers(#20106,#20001)
 #20108=*
 exprs(#20108,3,#20106,0,"1")
 hasLocation(#20108,#20051)
-enclosingStmt(#20108,#20105)
+enclosing_stmt(#20108,#20105)
 exprContainers(#20108,#20001)
 literals("1","1",#20108)
 #20109=*
 exprs(#20109,3,#20106,1,"2")
 hasLocation(#20109,#20055)
-enclosingStmt(#20109,#20105)
+enclosing_stmt(#20109,#20105)
 exprContainers(#20109,#20001)
 literals("2","2",#20109)
 #20110=*
@@ -351,18 +351,18 @@ exprs(#20111,28,#20110,0,"1 <= 2")
 #20112=@"loc,{#10000},6,1,6,6"
 locations_default(#20112,#10000,6,1,6,6)
 hasLocation(#20111,#20112)
-enclosingStmt(#20111,#20110)
+enclosing_stmt(#20111,#20110)
 exprContainers(#20111,#20001)
 #20113=*
 exprs(#20113,3,#20111,0,"1")
 hasLocation(#20113,#20059)
-enclosingStmt(#20113,#20110)
+enclosing_stmt(#20113,#20110)
 exprContainers(#20113,#20001)
 literals("1","1",#20113)
 #20114=*
 exprs(#20114,3,#20111,1,"2")
 hasLocation(#20114,#20063)
-enclosingStmt(#20114,#20110)
+enclosing_stmt(#20114,#20110)
 exprContainers(#20114,#20001)
 literals("2","2",#20114)
 #20115=*
@@ -374,18 +374,18 @@ exprs(#20116,29,#20115,0,"2 > 1")
 #20117=@"loc,{#10000},7,1,7,5"
 locations_default(#20117,#10000,7,1,7,5)
 hasLocation(#20116,#20117)
-enclosingStmt(#20116,#20115)
+enclosing_stmt(#20116,#20115)
 exprContainers(#20116,#20001)
 #20118=*
 exprs(#20118,3,#20116,0,"2")
 hasLocation(#20118,#20067)
-enclosingStmt(#20118,#20115)
+enclosing_stmt(#20118,#20115)
 exprContainers(#20118,#20001)
 literals("2","2",#20118)
 #20119=*
 exprs(#20119,3,#20116,1,"1")
 hasLocation(#20119,#20071)
-enclosingStmt(#20119,#20115)
+enclosing_stmt(#20119,#20115)
 exprContainers(#20119,#20001)
 literals("1","1",#20119)
 #20120=*
@@ -397,18 +397,18 @@ exprs(#20121,30,#20120,0,"2 >= 1")
 #20122=@"loc,{#10000},8,1,8,6"
 locations_default(#20122,#10000,8,1,8,6)
 hasLocation(#20121,#20122)
-enclosingStmt(#20121,#20120)
+enclosing_stmt(#20121,#20120)
 exprContainers(#20121,#20001)
 #20123=*
 exprs(#20123,3,#20121,0,"2")
 hasLocation(#20123,#20075)
-enclosingStmt(#20123,#20120)
+enclosing_stmt(#20123,#20120)
 exprContainers(#20123,#20001)
 literals("2","2",#20123)
 #20124=*
 exprs(#20124,3,#20121,1,"1")
 hasLocation(#20124,#20079)
-enclosingStmt(#20124,#20120)
+enclosing_stmt(#20124,#20120)
 exprContainers(#20124,#20001)
 literals("1","1",#20124)
 #20125=*
diff --git a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
index c4eef50115a..593ce40c1a9 100644
--- a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
@@ -86,12 +86,12 @@ exprs(#20029,13,#20028,0,"f(function(){}, 23)")
 #20030=@"loc,{#10000},1,1,1,19"
 locations_default(#20030,#10000,1,1,1,19)
 hasLocation(#20029,#20030)
-enclosingStmt(#20029,#20028)
+enclosing_stmt(#20029,#20028)
 exprContainers(#20029,#20001)
 #20031=*
 exprs(#20031,79,#20029,-1,"f")
 hasLocation(#20031,#20005)
-enclosingStmt(#20031,#20028)
+enclosing_stmt(#20031,#20028)
 exprContainers(#20031,#20001)
 literals("f","f",#20031)
 #20032=@"var;{f};{#20000}"
@@ -102,7 +102,7 @@ exprs(#20033,9,#20029,0,"function(){}")
 #20034=@"loc,{#10000},1,3,1,14"
 locations_default(#20034,#10000,1,3,1,14)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20028)
+enclosing_stmt(#20033,#20028)
 exprContainers(#20033,#20001)
 #20035=*
 scopes(#20035,1)
@@ -120,7 +120,7 @@ stmt_containers(#20037,#20033)
 #20039=*
 exprs(#20039,3,#20029,1,"23")
 hasLocation(#20039,#20021)
-enclosingStmt(#20039,#20028)
+enclosing_stmt(#20039,#20028)
 exprContainers(#20039,#20001)
 literals("23","23",#20039)
 #20040=*
diff --git a/javascript/extractor/tests/exprs/output/trap/others.js.trap b/javascript/extractor/tests/exprs/output/trap/others.js.trap
index 86206f33878..69bb5def1f3 100644
--- a/javascript/extractor/tests/exprs/output/trap/others.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/others.js.trap
@@ -126,18 +126,18 @@ exprs(#20044,10,#20043,0,"23, 42")
 #20045=@"loc,{#10000},1,1,1,6"
 locations_default(#20045,#10000,1,1,1,6)
 hasLocation(#20044,#20045)
-enclosingStmt(#20044,#20043)
+enclosing_stmt(#20044,#20043)
 exprContainers(#20044,#20001)
 #20046=*
 exprs(#20046,3,#20044,0,"23")
 hasLocation(#20046,#20009)
-enclosingStmt(#20046,#20043)
+enclosing_stmt(#20046,#20043)
 exprContainers(#20046,#20001)
 literals("23","23",#20046)
 #20047=*
 exprs(#20047,3,#20044,1,"42")
 hasLocation(#20047,#20013)
-enclosingStmt(#20047,#20043)
+enclosing_stmt(#20047,#20043)
 exprContainers(#20047,#20001)
 literals("42","42",#20047)
 #20048=*
@@ -149,24 +149,24 @@ exprs(#20049,10,#20048,0,"23, 42, 56")
 #20050=@"loc,{#10000},2,1,2,10"
 locations_default(#20050,#10000,2,1,2,10)
 hasLocation(#20049,#20050)
-enclosingStmt(#20049,#20048)
+enclosing_stmt(#20049,#20048)
 exprContainers(#20049,#20001)
 #20051=*
 exprs(#20051,3,#20049,0,"23")
 hasLocation(#20051,#20017)
-enclosingStmt(#20051,#20048)
+enclosing_stmt(#20051,#20048)
 exprContainers(#20051,#20001)
 literals("23","23",#20051)
 #20052=*
 exprs(#20052,3,#20049,1,"42")
 hasLocation(#20052,#20021)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20001)
 literals("42","42",#20052)
 #20053=*
 exprs(#20053,3,#20049,2,"56")
 hasLocation(#20053,#20025)
-enclosingStmt(#20053,#20048)
+enclosing_stmt(#20053,#20048)
 exprContainers(#20053,#20001)
 literals("56","56",#20053)
 #20054=*
@@ -178,24 +178,24 @@ exprs(#20055,11,#20054,0,"true ? 0 : 1")
 #20056=@"loc,{#10000},3,1,3,12"
 locations_default(#20056,#10000,3,1,3,12)
 hasLocation(#20055,#20056)
-enclosingStmt(#20055,#20054)
+enclosing_stmt(#20055,#20054)
 exprContainers(#20055,#20001)
 #20057=*
 exprs(#20057,2,#20055,0,"true")
 hasLocation(#20057,#20029)
-enclosingStmt(#20057,#20054)
+enclosing_stmt(#20057,#20054)
 exprContainers(#20057,#20001)
 literals("true","true",#20057)
 #20058=*
 exprs(#20058,3,#20055,1,"0")
 hasLocation(#20058,#20033)
-enclosingStmt(#20058,#20054)
+enclosing_stmt(#20058,#20054)
 exprContainers(#20058,#20001)
 literals("0","0",#20058)
 #20059=*
 exprs(#20059,3,#20055,2,"1")
 hasLocation(#20059,#20037)
-enclosingStmt(#20059,#20054)
+enclosing_stmt(#20059,#20054)
 exprContainers(#20059,#20001)
 literals("1","1",#20059)
 #20060=*
diff --git a/javascript/extractor/tests/exprs/output/trap/parens.js.trap b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
index f747a6fe59d..c89c6343531 100644
--- a/javascript/extractor/tests/exprs/output/trap/parens.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
@@ -56,19 +56,19 @@ exprs(#20017,61,#20016,0,"--(NaN)")
 #20018=@"loc,{#10000},1,1,1,7"
 locations_default(#20018,#10000,1,1,1,7)
 hasLocation(#20017,#20018)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 #20019=*
 exprs(#20019,63,#20017,0,"(NaN)")
 #20020=@"loc,{#10000},1,3,1,7"
 locations_default(#20020,#10000,1,3,1,7)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20016)
+enclosing_stmt(#20019,#20016)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,79,#20019,0,"NaN")
 hasLocation(#20021,#20009)
-enclosingStmt(#20021,#20016)
+enclosing_stmt(#20021,#20016)
 exprContainers(#20021,#20001)
 literals("NaN","NaN",#20021)
 #20022=@"var;{NaN};{#20000}"
diff --git a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
index 2a944216a77..9b13e14f9b1 100644
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@@ -859,7 +859,7 @@ stmt_containers(#20325,#20001)
 #20326=*
 exprs(#20326,1,#20325,0,"null")
 hasLocation(#20326,#20063)
-enclosingStmt(#20326,#20325)
+enclosing_stmt(#20326,#20325)
 exprContainers(#20326,#20001)
 literals("null","null",#20326)
 #20327=*
@@ -869,7 +869,7 @@ stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,2,#20327,0,"true")
 hasLocation(#20328,#20067)
-enclosingStmt(#20328,#20327)
+enclosing_stmt(#20328,#20327)
 exprContainers(#20328,#20001)
 literals("true","true",#20328)
 #20329=*
@@ -879,7 +879,7 @@ stmt_containers(#20329,#20001)
 #20330=*
 exprs(#20330,2,#20329,0,"false")
 hasLocation(#20330,#20071)
-enclosingStmt(#20330,#20329)
+enclosing_stmt(#20330,#20329)
 exprContainers(#20330,#20001)
 literals("false","false",#20330)
 #20331=*
@@ -889,7 +889,7 @@ stmt_containers(#20331,#20001)
 #20332=*
 exprs(#20332,3,#20331,0,"23")
 hasLocation(#20332,#20075)
-enclosingStmt(#20332,#20331)
+enclosing_stmt(#20332,#20331)
 exprContainers(#20332,#20001)
 literals("23","23",#20332)
 #20333=*
@@ -899,7 +899,7 @@ stmt_containers(#20333,#20001)
 #20334=*
 exprs(#20334,3,#20333,0,"2.3")
 hasLocation(#20334,#20079)
-enclosingStmt(#20334,#20333)
+enclosing_stmt(#20334,#20333)
 exprContainers(#20334,#20001)
 literals("2.3","2.3",#20334)
 #20335=*
@@ -909,7 +909,7 @@ stmt_containers(#20335,#20001)
 #20336=*
 exprs(#20336,3,#20335,0,".42")
 hasLocation(#20336,#20083)
-enclosingStmt(#20336,#20335)
+enclosing_stmt(#20336,#20335)
 exprContainers(#20336,#20001)
 literals("0.42",".42",#20336)
 #20337=*
@@ -919,7 +919,7 @@ stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,3,#20337,0,"7.6e23")
 hasLocation(#20338,#20087)
-enclosingStmt(#20338,#20337)
+enclosing_stmt(#20338,#20337)
 exprContainers(#20338,#20001)
 literals("7.6E23","7.6e23",#20338)
 #20339=*
@@ -929,7 +929,7 @@ stmt_containers(#20339,#20001)
 #20340=*
 exprs(#20340,3,#20339,0,"1E-42")
 hasLocation(#20340,#20091)
-enclosingStmt(#20340,#20339)
+enclosing_stmt(#20340,#20339)
 exprContainers(#20340,#20001)
 literals("1.0E-42","1E-42",#20340)
 #20341=*
@@ -939,7 +939,7 @@ stmt_containers(#20341,#20001)
 #20342=*
 exprs(#20342,3,#20341,0,"0xdeadbeef")
 hasLocation(#20342,#20095)
-enclosingStmt(#20342,#20341)
+enclosing_stmt(#20342,#20341)
 exprContainers(#20342,#20001)
 literals("3735928559","0xdeadbeef",#20342)
 #20343=*
@@ -949,7 +949,7 @@ stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,4,#20343,0,"""Hello""")
 hasLocation(#20344,#20099)
-enclosingStmt(#20344,#20343)
+enclosing_stmt(#20344,#20343)
 exprContainers(#20344,#20001)
 literals("Hello","""Hello""",#20344)
 #20345=*
@@ -965,7 +965,7 @@ stmt_containers(#20347,#20001)
 #20348=*
 exprs(#20348,4,#20347,0,"'world'")
 hasLocation(#20348,#20103)
-enclosingStmt(#20348,#20347)
+enclosing_stmt(#20348,#20347)
 exprContainers(#20348,#20001)
 literals("world","'world'",#20348)
 #20349=*
@@ -981,7 +981,7 @@ stmt_containers(#20351,#20001)
 #20352=*
 exprs(#20352,4,#20351,0,"""'what?'\x0a""")
 hasLocation(#20352,#20107)
-enclosingStmt(#20352,#20351)
+enclosing_stmt(#20352,#20351)
 exprContainers(#20352,#20001)
 literals("'what?'
 ","""'what?'\x0a""",#20352)
@@ -1024,7 +1024,7 @@ stmt_containers(#20363,#20001)
 #20364=*
 exprs(#20364,4,#20363,0,"'""why?""\n'")
 hasLocation(#20364,#20111)
-enclosingStmt(#20364,#20363)
+enclosing_stmt(#20364,#20363)
 exprContainers(#20364,#20001)
 literals("""why?""
 ","'""why?""\n'",#20364)
@@ -1067,7 +1067,7 @@ stmt_containers(#20375,#20001)
 #20376=*
 exprs(#20376,5,#20375,0,"/^(need?le)+/gi")
 hasLocation(#20376,#20115)
-enclosingStmt(#20376,#20375)
+enclosing_stmt(#20376,#20375)
 exprContainers(#20376,#20001)
 literals("/^(need?le)+/gi","/^(need?le)+/gi",#20376)
 #20377=*
@@ -1130,12 +1130,12 @@ exprs(#20396,63,#20395,0,"(23)")
 #20397=@"loc,{#10000},15,1,15,4"
 locations_default(#20397,#10000,15,1,15,4)
 hasLocation(#20396,#20397)
-enclosingStmt(#20396,#20395)
+enclosing_stmt(#20396,#20395)
 exprContainers(#20396,#20001)
 #20398=*
 exprs(#20398,3,#20396,0,"23")
 hasLocation(#20398,#20121)
-enclosingStmt(#20398,#20395)
+enclosing_stmt(#20398,#20395)
 exprContainers(#20398,#20001)
 literals("23","23",#20398)
 #20399=*
@@ -1147,24 +1147,24 @@ exprs(#20400,7,#20399,0,"[23, 42, , ""hi"" ]")
 #20401=@"loc,{#10000},16,1,16,17"
 locations_default(#20401,#10000,16,1,16,17)
 hasLocation(#20400,#20401)
-enclosingStmt(#20400,#20399)
+enclosing_stmt(#20400,#20399)
 exprContainers(#20400,#20001)
 #20402=*
 exprs(#20402,3,#20400,0,"23")
 hasLocation(#20402,#20129)
-enclosingStmt(#20402,#20399)
+enclosing_stmt(#20402,#20399)
 exprContainers(#20402,#20001)
 literals("23","23",#20402)
 #20403=*
 exprs(#20403,3,#20400,1,"42")
 hasLocation(#20403,#20133)
-enclosingStmt(#20403,#20399)
+enclosing_stmt(#20403,#20399)
 exprContainers(#20403,#20001)
 literals("42","42",#20403)
 #20404=*
 exprs(#20404,4,#20400,3,"""hi""")
 hasLocation(#20404,#20139)
-enclosingStmt(#20404,#20399)
+enclosing_stmt(#20404,#20399)
 exprContainers(#20404,#20001)
 literals("hi","""hi""",#20404)
 #20405=*
@@ -1185,14 +1185,14 @@ exprs(#20409,63,#20407,0,"({ x: 2 ... v) {}})")
 #20410=@"loc,{#10000},17,1,21,16"
 locations_default(#20410,#10000,17,1,21,16)
 hasLocation(#20409,#20410)
-enclosingStmt(#20409,#20407)
+enclosing_stmt(#20409,#20407)
 exprContainers(#20409,#20001)
 #20411=*
 exprs(#20411,8,#20409,0,"{ x: 23 ... (v) {}}")
 #20412=@"loc,{#10000},17,2,21,15"
 locations_default(#20412,#10000,17,2,21,15)
 hasLocation(#20411,#20412)
-enclosingStmt(#20411,#20407)
+enclosing_stmt(#20411,#20407)
 exprContainers(#20411,#20001)
 #20413=*
 properties(#20413,#20411,0,0,"x: 23")
@@ -1202,13 +1202,13 @@ hasLocation(#20413,#20414)
 #20415=*
 exprs(#20415,0,#20413,0,"x")
 hasLocation(#20415,#20149)
-enclosingStmt(#20415,#20407)
+enclosing_stmt(#20415,#20407)
 exprContainers(#20415,#20001)
 literals("x","x",#20415)
 #20416=*
 exprs(#20416,3,#20413,1,"23")
 hasLocation(#20416,#20153)
-enclosingStmt(#20416,#20407)
+enclosing_stmt(#20416,#20407)
 exprContainers(#20416,#20001)
 literals("23","23",#20416)
 #20417=*
@@ -1219,13 +1219,13 @@ hasLocation(#20417,#20418)
 #20419=*
 exprs(#20419,0,#20417,0,"y")
 hasLocation(#20419,#20157)
-enclosingStmt(#20419,#20407)
+enclosing_stmt(#20419,#20407)
 exprContainers(#20419,#20001)
 literals("y","y",#20419)
 #20420=*
 exprs(#20420,6,#20417,1,"this")
 hasLocation(#20420,#20161)
-enclosingStmt(#20420,#20407)
+enclosing_stmt(#20420,#20407)
 exprContainers(#20420,#20001)
 #20421=*
 properties(#20421,#20411,2,1,"get o() {}")
@@ -1235,7 +1235,7 @@ hasLocation(#20421,#20422)
 #20423=*
 exprs(#20423,0,#20421,0,"o")
 hasLocation(#20423,#20167)
-enclosingStmt(#20423,#20407)
+enclosing_stmt(#20423,#20407)
 exprContainers(#20423,#20001)
 literals("o","o",#20423)
 #20424=*
@@ -1243,7 +1243,7 @@ exprs(#20424,9,#20421,1,"() {}")
 #20425=@"loc,{#10000},19,9,19,13"
 locations_default(#20425,#10000,19,9,19,13)
 hasLocation(#20424,#20425)
-enclosingStmt(#20424,#20407)
+enclosing_stmt(#20424,#20407)
 exprContainers(#20424,#20001)
 #20426=*
 scopes(#20426,1)
@@ -1266,7 +1266,7 @@ hasLocation(#20430,#20431)
 #20432=*
 exprs(#20432,0,#20430,0,"p")
 hasLocation(#20432,#20181)
-enclosingStmt(#20432,#20407)
+enclosing_stmt(#20432,#20407)
 exprContainers(#20432,#20001)
 literals("p","p",#20432)
 #20433=*
@@ -1274,7 +1274,7 @@ exprs(#20433,9,#20430,1,"() {}")
 #20434=@"loc,{#10000},20,9,20,13"
 locations_default(#20434,#10000,20,9,20,13)
 hasLocation(#20433,#20434)
-enclosingStmt(#20433,#20407)
+enclosing_stmt(#20433,#20407)
 exprContainers(#20433,#20001)
 #20435=*
 scopes(#20435,1)
@@ -1297,7 +1297,7 @@ hasLocation(#20439,#20440)
 #20441=*
 exprs(#20441,0,#20439,0,"p")
 hasLocation(#20441,#20195)
-enclosingStmt(#20441,#20407)
+enclosing_stmt(#20441,#20407)
 exprContainers(#20441,#20001)
 literals("p","p",#20441)
 #20442=*
@@ -1305,7 +1305,7 @@ exprs(#20442,9,#20439,1,"(v) {}")
 #20443=@"loc,{#10000},21,9,21,14"
 locations_default(#20443,#10000,21,9,21,14)
 hasLocation(#20442,#20443)
-enclosingStmt(#20442,#20407)
+enclosing_stmt(#20442,#20407)
 exprContainers(#20442,#20001)
 #20444=*
 scopes(#20444,1)
@@ -1337,12 +1337,12 @@ exprs(#20451,12,#20450,0,"new Array")
 #20452=@"loc,{#10000},22,1,22,9"
 locations_default(#20452,#10000,22,1,22,9)
 hasLocation(#20451,#20452)
-enclosingStmt(#20451,#20450)
+enclosing_stmt(#20451,#20450)
 exprContainers(#20451,#20001)
 #20453=*
 exprs(#20453,79,#20451,-1,"Array")
 hasLocation(#20453,#20215)
-enclosingStmt(#20453,#20450)
+enclosing_stmt(#20453,#20450)
 exprContainers(#20453,#20001)
 literals("Array","Array",#20453)
 #20454=@"var;{Array};{#20000}"
@@ -1357,12 +1357,12 @@ exprs(#20456,12,#20455,0,"new Object()")
 #20457=@"loc,{#10000},23,1,23,12"
 locations_default(#20457,#10000,23,1,23,12)
 hasLocation(#20456,#20457)
-enclosingStmt(#20456,#20455)
+enclosing_stmt(#20456,#20455)
 exprContainers(#20456,#20001)
 #20458=*
 exprs(#20458,79,#20456,-1,"Object")
 hasLocation(#20458,#20221)
-enclosingStmt(#20458,#20455)
+enclosing_stmt(#20458,#20455)
 exprContainers(#20458,#20001)
 literals("Object","Object",#20458)
 #20459=@"var;{Object};{#20000}"
@@ -1377,12 +1377,12 @@ exprs(#20461,12,#20460,0,"new String(""hi"")")
 #20462=@"loc,{#10000},24,1,24,16"
 locations_default(#20462,#10000,24,1,24,16)
 hasLocation(#20461,#20462)
-enclosingStmt(#20461,#20460)
+enclosing_stmt(#20461,#20460)
 exprContainers(#20461,#20001)
 #20463=*
 exprs(#20463,79,#20461,-1,"String")
 hasLocation(#20463,#20231)
-enclosingStmt(#20463,#20460)
+enclosing_stmt(#20463,#20460)
 exprContainers(#20463,#20001)
 literals("String","String",#20463)
 #20464=@"var;{String};{#20000}"
@@ -1391,7 +1391,7 @@ bind(#20463,#20464)
 #20465=*
 exprs(#20465,4,#20461,0,"""hi""")
 hasLocation(#20465,#20235)
-enclosingStmt(#20465,#20460)
+enclosing_stmt(#20465,#20460)
 exprContainers(#20465,#20001)
 literals("hi","""hi""",#20465)
 #20466=*
@@ -1409,19 +1409,19 @@ exprs(#20469,13,#20468,0,"String("""")")
 #20470=@"loc,{#10000},25,1,25,10"
 locations_default(#20470,#10000,25,1,25,10)
 hasLocation(#20469,#20470)
-enclosingStmt(#20469,#20468)
+enclosing_stmt(#20469,#20468)
 exprContainers(#20469,#20001)
 #20471=*
 exprs(#20471,79,#20469,-1,"String")
 hasLocation(#20471,#20241)
-enclosingStmt(#20471,#20468)
+enclosing_stmt(#20471,#20468)
 exprContainers(#20471,#20001)
 literals("String","String",#20471)
 bind(#20471,#20464)
 #20472=*
 exprs(#20472,4,#20469,0,"""""")
 hasLocation(#20472,#20245)
-enclosingStmt(#20472,#20468)
+enclosing_stmt(#20472,#20468)
 exprContainers(#20472,#20001)
 literals("","""""",#20472)
 #20473=*
@@ -1438,26 +1438,26 @@ exprs(#20476,13,#20475,0,"Object.create({})")
 #20477=@"loc,{#10000},26,1,26,17"
 locations_default(#20477,#10000,26,1,26,17)
 hasLocation(#20476,#20477)
-enclosingStmt(#20476,#20475)
+enclosing_stmt(#20476,#20475)
 exprContainers(#20476,#20001)
 #20478=*
 exprs(#20478,14,#20476,-1,"Object.create")
 #20479=@"loc,{#10000},26,1,26,13"
 locations_default(#20479,#10000,26,1,26,13)
 hasLocation(#20478,#20479)
-enclosingStmt(#20478,#20475)
+enclosing_stmt(#20478,#20475)
 exprContainers(#20478,#20001)
 #20480=*
 exprs(#20480,79,#20478,0,"Object")
 hasLocation(#20480,#20251)
-enclosingStmt(#20480,#20475)
+enclosing_stmt(#20480,#20475)
 exprContainers(#20480,#20001)
 literals("Object","Object",#20480)
 bind(#20480,#20459)
 #20481=*
 exprs(#20481,0,#20478,1,"create")
 hasLocation(#20481,#20255)
-enclosingStmt(#20481,#20475)
+enclosing_stmt(#20481,#20475)
 exprContainers(#20481,#20001)
 literals("create","create",#20481)
 #20482=*
@@ -1465,7 +1465,7 @@ exprs(#20482,8,#20476,0,"{}")
 #20483=@"loc,{#10000},26,15,26,16"
 locations_default(#20483,#10000,26,15,26,16)
 hasLocation(#20482,#20483)
-enclosingStmt(#20482,#20475)
+enclosing_stmt(#20482,#20475)
 exprContainers(#20482,#20001)
 #20484=*
 stmts(#20484,2,#20001,22,"String[ ... rse()];")
@@ -1476,12 +1476,12 @@ exprs(#20485,15,#20484,0,"String[ ... erse()]")
 #20486=@"loc,{#10000},27,1,27,29"
 locations_default(#20486,#10000,27,1,27,29)
 hasLocation(#20485,#20486)
-enclosingStmt(#20485,#20484)
+enclosing_stmt(#20485,#20484)
 exprContainers(#20485,#20001)
 #20487=*
 exprs(#20487,79,#20485,0,"String")
 hasLocation(#20487,#20267)
-enclosingStmt(#20487,#20484)
+enclosing_stmt(#20487,#20484)
 exprContainers(#20487,#20001)
 literals("String","String",#20487)
 bind(#20487,#20464)
@@ -1490,19 +1490,19 @@ exprs(#20488,13,#20485,1,"'epytot ... verse()")
 #20489=@"loc,{#10000},27,8,27,28"
 locations_default(#20489,#10000,27,8,27,28)
 hasLocation(#20488,#20489)
-enclosingStmt(#20488,#20484)
+enclosing_stmt(#20488,#20484)
 exprContainers(#20488,#20001)
 #20490=*
 exprs(#20490,14,#20488,-1,"'epytotorp'.reverse")
 #20491=@"loc,{#10000},27,8,27,26"
 locations_default(#20491,#10000,27,8,27,26)
 hasLocation(#20490,#20491)
-enclosingStmt(#20490,#20484)
+enclosing_stmt(#20490,#20484)
 exprContainers(#20490,#20001)
 #20492=*
 exprs(#20492,4,#20490,0,"'epytotorp'")
 hasLocation(#20492,#20271)
-enclosingStmt(#20492,#20484)
+enclosing_stmt(#20492,#20484)
 exprContainers(#20492,#20001)
 literals("epytotorp","'epytotorp'",#20492)
 #20493=*
@@ -1514,7 +1514,7 @@ regexpConstValue(#20493,"epytotorp")
 #20495=*
 exprs(#20495,0,#20490,1,"reverse")
 hasLocation(#20495,#20275)
-enclosingStmt(#20495,#20484)
+enclosing_stmt(#20495,#20484)
 exprContainers(#20495,#20001)
 literals("reverse","reverse",#20495)
 #20496=*
@@ -1526,7 +1526,7 @@ exprs(#20497,7,#20496,0,"[,,]")
 #20498=@"loc,{#10000},28,1,28,4"
 locations_default(#20498,#10000,28,1,28,4)
 hasLocation(#20497,#20498)
-enclosingStmt(#20497,#20496)
+enclosing_stmt(#20497,#20496)
 exprContainers(#20497,#20001)
 arraySize(#20497,2)
 #20499=*
@@ -1538,12 +1538,12 @@ exprs(#20500,7,#20499,0,"[1,]")
 #20501=@"loc,{#10000},29,1,29,4"
 locations_default(#20501,#10000,29,1,29,4)
 hasLocation(#20500,#20501)
-enclosingStmt(#20500,#20499)
+enclosing_stmt(#20500,#20499)
 exprContainers(#20500,#20001)
 #20502=*
 exprs(#20502,3,#20500,0,"1")
 hasLocation(#20502,#20297)
-enclosingStmt(#20502,#20499)
+enclosing_stmt(#20502,#20499)
 exprContainers(#20502,#20001)
 literals("1","1",#20502)
 arraySize(#20500,1)
@@ -1556,14 +1556,14 @@ exprs(#20504,63,#20503,0,"({ z: 56, })")
 #20505=@"loc,{#10000},30,1,30,12"
 locations_default(#20505,#10000,30,1,30,12)
 hasLocation(#20504,#20505)
-enclosingStmt(#20504,#20503)
+enclosing_stmt(#20504,#20503)
 exprContainers(#20504,#20001)
 #20506=*
 exprs(#20506,8,#20504,0,"{ z: 56, }")
 #20507=@"loc,{#10000},30,2,30,11"
 locations_default(#20507,#10000,30,2,30,11)
 hasLocation(#20506,#20507)
-enclosingStmt(#20506,#20503)
+enclosing_stmt(#20506,#20503)
 exprContainers(#20506,#20001)
 #20508=*
 properties(#20508,#20506,0,0,"z: 56")
@@ -1573,13 +1573,13 @@ hasLocation(#20508,#20509)
 #20510=*
 exprs(#20510,0,#20508,0,"z")
 hasLocation(#20510,#20309)
-enclosingStmt(#20510,#20503)
+enclosing_stmt(#20510,#20503)
 exprContainers(#20510,#20001)
 literals("z","z",#20510)
 #20511=*
 exprs(#20511,3,#20508,1,"56")
 hasLocation(#20511,#20313)
-enclosingStmt(#20511,#20503)
+enclosing_stmt(#20511,#20503)
 exprContainers(#20511,#20001)
 literals("56","56",#20511)
 #20512=*
diff --git a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
index 77bc7ec0bfd..7f25c70a1b1 100644
--- a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -729,7 +729,7 @@ stmt_containers(#20269,#20001)
 #20270=*
 exprs(#20270,5,#20269,0,"/t/")
 hasLocation(#20270,#20091)
-enclosingStmt(#20270,#20269)
+enclosing_stmt(#20270,#20269)
 exprContainers(#20270,#20001)
 literals("/t/","/t/",#20270)
 #20271=*
@@ -745,7 +745,7 @@ stmt_containers(#20273,#20001)
 #20274=*
 exprs(#20274,5,#20273,0,"/foo|bar/")
 hasLocation(#20274,#20095)
-enclosingStmt(#20274,#20273)
+enclosing_stmt(#20274,#20273)
 exprContainers(#20274,#20001)
 literals("/foo|bar/","/foo|bar/",#20274)
 #20275=*
@@ -772,7 +772,7 @@ stmt_containers(#20281,#20001)
 #20282=*
 exprs(#20282,5,#20281,0,"/(?:)/")
 hasLocation(#20282,#20099)
-enclosingStmt(#20282,#20281)
+enclosing_stmt(#20282,#20281)
 exprContainers(#20282,#20001)
 literals("/(?:)/","/(?:)/",#20282)
 #20283=*
@@ -792,7 +792,7 @@ stmt_containers(#20287,#20001)
 #20288=*
 exprs(#20288,5,#20287,0,"/^abc$/")
 hasLocation(#20288,#20103)
-enclosingStmt(#20288,#20287)
+enclosing_stmt(#20288,#20287)
 exprContainers(#20288,#20001)
 literals("/^abc$/","/^abc$/",#20288)
 #20289=*
@@ -823,7 +823,7 @@ stmt_containers(#20297,#20001)
 #20298=*
 exprs(#20298,5,#20297,0,"/\bx\b/")
 hasLocation(#20298,#20107)
-enclosingStmt(#20298,#20297)
+enclosing_stmt(#20298,#20297)
 exprContainers(#20298,#20001)
 literals("/\bx\b/","/\bx\b/",#20298)
 #20299=*
@@ -854,7 +854,7 @@ stmt_containers(#20307,#20001)
 #20308=*
 exprs(#20308,5,#20307,0,"/\bx\B/")
 hasLocation(#20308,#20111)
-enclosingStmt(#20308,#20307)
+enclosing_stmt(#20308,#20307)
 exprContainers(#20308,#20001)
 literals("/\bx\B/","/\bx\B/",#20308)
 #20309=*
@@ -885,7 +885,7 @@ stmt_containers(#20317,#20001)
 #20318=*
 exprs(#20318,5,#20317,0,"/x(?=y)/")
 hasLocation(#20318,#20115)
-enclosingStmt(#20318,#20317)
+enclosing_stmt(#20318,#20317)
 exprContainers(#20318,#20001)
 literals("/x(?=y)/","/x(?=y)/",#20318)
 #20319=*
@@ -917,7 +917,7 @@ stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,5,#20327,0,"/x(?!z)/")
 hasLocation(#20328,#20119)
-enclosingStmt(#20328,#20327)
+enclosing_stmt(#20328,#20327)
 exprContainers(#20328,#20001)
 literals("/x(?!z)/","/x(?!z)/",#20328)
 #20329=*
@@ -949,7 +949,7 @@ stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,5,#20337,0,"/a*/")
 hasLocation(#20338,#20123)
-enclosingStmt(#20338,#20337)
+enclosing_stmt(#20338,#20337)
 exprContainers(#20338,#20001)
 literals("/a*/","/a*/",#20338)
 #20339=*
@@ -971,7 +971,7 @@ stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,5,#20343,0,"/a*?/")
 hasLocation(#20344,#20127)
-enclosingStmt(#20344,#20343)
+enclosing_stmt(#20344,#20343)
 exprContainers(#20344,#20001)
 literals("/a*?/","/a*?/",#20344)
 #20345=*
@@ -992,7 +992,7 @@ stmt_containers(#20349,#20001)
 #20350=*
 exprs(#20350,5,#20349,0,"/a+/")
 hasLocation(#20350,#20131)
-enclosingStmt(#20350,#20349)
+enclosing_stmt(#20350,#20349)
 exprContainers(#20350,#20001)
 literals("/a+/","/a+/",#20350)
 #20351=*
@@ -1014,7 +1014,7 @@ stmt_containers(#20355,#20001)
 #20356=*
 exprs(#20356,5,#20355,0,"/a+?/")
 hasLocation(#20356,#20135)
-enclosingStmt(#20356,#20355)
+enclosing_stmt(#20356,#20355)
 exprContainers(#20356,#20001)
 literals("/a+?/","/a+?/",#20356)
 #20357=*
@@ -1035,7 +1035,7 @@ stmt_containers(#20361,#20001)
 #20362=*
 exprs(#20362,5,#20361,0,"/a?/")
 hasLocation(#20362,#20139)
-enclosingStmt(#20362,#20361)
+enclosing_stmt(#20362,#20361)
 exprContainers(#20362,#20001)
 literals("/a?/","/a?/",#20362)
 #20363=*
@@ -1057,7 +1057,7 @@ stmt_containers(#20367,#20001)
 #20368=*
 exprs(#20368,5,#20367,0,"/a??/")
 hasLocation(#20368,#20143)
-enclosingStmt(#20368,#20367)
+enclosing_stmt(#20368,#20367)
 exprContainers(#20368,#20001)
 literals("/a??/","/a??/",#20368)
 #20369=*
@@ -1078,7 +1078,7 @@ stmt_containers(#20373,#20001)
 #20374=*
 exprs(#20374,5,#20373,0,"/a{1}/")
 hasLocation(#20374,#20147)
-enclosingStmt(#20374,#20373)
+enclosing_stmt(#20374,#20373)
 exprContainers(#20374,#20001)
 literals("/a{1}/","/a{1}/",#20374)
 #20375=*
@@ -1102,7 +1102,7 @@ stmt_containers(#20379,#20001)
 #20380=*
 exprs(#20380,5,#20379,0,"/a{1,}/")
 hasLocation(#20380,#20151)
-enclosingStmt(#20380,#20379)
+enclosing_stmt(#20380,#20379)
 exprContainers(#20380,#20001)
 literals("/a{1,}/","/a{1,}/",#20380)
 #20381=*
@@ -1125,7 +1125,7 @@ stmt_containers(#20385,#20001)
 #20386=*
 exprs(#20386,5,#20385,0,"/a{1,2}/")
 hasLocation(#20386,#20155)
-enclosingStmt(#20386,#20385)
+enclosing_stmt(#20386,#20385)
 exprContainers(#20386,#20001)
 literals("/a{1,2}/","/a{1,2}/",#20386)
 #20387=*
@@ -1149,7 +1149,7 @@ stmt_containers(#20391,#20001)
 #20392=*
 exprs(#20392,5,#20391,0,"/a{1}?/")
 hasLocation(#20392,#20159)
-enclosingStmt(#20392,#20391)
+enclosing_stmt(#20392,#20391)
 exprContainers(#20392,#20001)
 literals("/a{1}?/","/a{1}?/",#20392)
 #20393=*
@@ -1172,7 +1172,7 @@ stmt_containers(#20397,#20001)
 #20398=*
 exprs(#20398,5,#20397,0,"/a{1,}?/")
 hasLocation(#20398,#20163)
-enclosingStmt(#20398,#20397)
+enclosing_stmt(#20398,#20397)
 exprContainers(#20398,#20001)
 literals("/a{1,}?/","/a{1,}?/",#20398)
 #20399=*
@@ -1194,7 +1194,7 @@ stmt_containers(#20403,#20001)
 #20404=*
 exprs(#20404,5,#20403,0,"/a{1,2}?/")
 hasLocation(#20404,#20167)
-enclosingStmt(#20404,#20403)
+enclosing_stmt(#20404,#20403)
 exprContainers(#20404,#20001)
 literals("/a{1,2}?/","/a{1,2}?/",#20404)
 #20405=*
@@ -1217,7 +1217,7 @@ stmt_containers(#20409,#20001)
 #20410=*
 exprs(#20410,5,#20409,0,"/./")
 hasLocation(#20410,#20171)
-enclosingStmt(#20410,#20409)
+enclosing_stmt(#20410,#20409)
 exprContainers(#20410,#20001)
 literals("/./","/./",#20410)
 #20411=*
@@ -1232,7 +1232,7 @@ stmt_containers(#20413,#20001)
 #20414=*
 exprs(#20414,5,#20413,0,"/(abc)/")
 hasLocation(#20414,#20175)
-enclosingStmt(#20414,#20413)
+enclosing_stmt(#20414,#20413)
 exprContainers(#20414,#20001)
 literals("/(abc)/","/(abc)/",#20414)
 #20415=*
@@ -1254,7 +1254,7 @@ stmt_containers(#20419,#20001)
 #20420=*
 exprs(#20420,5,#20419,0,"/(?:abc)/")
 hasLocation(#20420,#20179)
-enclosingStmt(#20420,#20419)
+enclosing_stmt(#20420,#20419)
 exprContainers(#20420,#20001)
 literals("/(?:abc)/","/(?:abc)/",#20420)
 #20421=*
@@ -1275,7 +1275,7 @@ stmt_containers(#20425,#20001)
 #20426=*
 exprs(#20426,5,#20425,0,"/\x0a/")
 hasLocation(#20426,#20183)
-enclosingStmt(#20426,#20425)
+enclosing_stmt(#20426,#20425)
 exprContainers(#20426,#20001)
 literals("/\x0a/","/\x0a/",#20426)
 #20427=*
@@ -1292,7 +1292,7 @@ stmt_containers(#20429,#20001)
 #20430=*
 exprs(#20430,5,#20429,0,"/\u000a/")
 hasLocation(#20430,#20187)
-enclosingStmt(#20430,#20429)
+enclosing_stmt(#20430,#20429)
 exprContainers(#20430,#20001)
 literals("/\u000a/","/\u000a/",#20430)
 #20431=*
@@ -1309,7 +1309,7 @@ stmt_containers(#20433,#20001)
 #20434=*
 exprs(#20434,5,#20433,0,"/\10/")
 hasLocation(#20434,#20191)
-enclosingStmt(#20434,#20433)
+enclosing_stmt(#20434,#20433)
 exprContainers(#20434,#20001)
 literals("/\10/","/\10/",#20434)
 #20435=*
@@ -1328,7 +1328,7 @@ stmt_containers(#20438,#20001)
 #20439=*
 exprs(#20439,5,#20438,0,"/\t\n\r\f\v/")
 hasLocation(#20439,#20195)
-enclosingStmt(#20439,#20438)
+enclosing_stmt(#20439,#20438)
 exprContainers(#20439,#20001)
 literals("/\t\n\r\f\v/","/\t\n\r\f\v/",#20439)
 #20440=*
@@ -1374,7 +1374,7 @@ stmt_containers(#20452,#20001)
 #20453=*
 exprs(#20453,5,#20452,0,"/\ca\cN/")
 hasLocation(#20453,#20199)
-enclosingStmt(#20453,#20452)
+enclosing_stmt(#20453,#20452)
 exprContainers(#20453,#20001)
 literals("/\ca\cN/","/\ca\cN/",#20453)
 #20454=*
@@ -1401,7 +1401,7 @@ stmt_containers(#20460,#20001)
 #20461=*
 exprs(#20461,5,#20460,0,"/\w\S/")
 hasLocation(#20461,#20203)
-enclosingStmt(#20461,#20460)
+enclosing_stmt(#20461,#20460)
 exprContainers(#20461,#20001)
 literals("/\w\S/","/\w\S/",#20461)
 #20462=*
@@ -1428,7 +1428,7 @@ stmt_containers(#20468,#20001)
 #20469=*
 exprs(#20469,5,#20468,0,"/\\/")
 hasLocation(#20469,#20207)
-enclosingStmt(#20469,#20468)
+enclosing_stmt(#20469,#20468)
 exprContainers(#20469,#20001)
 literals("/\\/","/\\/",#20469)
 #20470=*
@@ -1444,7 +1444,7 @@ stmt_containers(#20472,#20001)
 #20473=*
 exprs(#20473,5,#20472,0,"/[abc]/")
 hasLocation(#20473,#20211)
-enclosingStmt(#20473,#20472)
+enclosing_stmt(#20473,#20472)
 exprContainers(#20473,#20001)
 literals("/[abc]/","/[abc]/",#20473)
 #20474=*
@@ -1477,7 +1477,7 @@ stmt_containers(#20482,#20001)
 #20483=*
 exprs(#20483,5,#20482,0,"/[a-z]/")
 hasLocation(#20483,#20215)
-enclosingStmt(#20483,#20482)
+enclosing_stmt(#20483,#20482)
 exprContainers(#20483,#20001)
 literals("/[a-z]/","/[a-z]/",#20483)
 #20484=*
@@ -1509,7 +1509,7 @@ stmt_containers(#20492,#20001)
 #20493=*
 exprs(#20493,5,#20492,0,"/[a-zA-Z]/")
 hasLocation(#20493,#20219)
-enclosingStmt(#20493,#20492)
+enclosing_stmt(#20493,#20492)
 exprContainers(#20493,#20001)
 literals("/[a-zA-Z]/","/[a-zA-Z]/",#20493)
 #20494=*
@@ -1558,7 +1558,7 @@ stmt_containers(#20508,#20001)
 #20509=*
 exprs(#20509,5,#20508,0,"/[-a-z]/")
 hasLocation(#20509,#20223)
-enclosingStmt(#20509,#20508)
+enclosing_stmt(#20509,#20508)
 exprContainers(#20509,#20001)
 literals("/[-a-z]/","/[-a-z]/",#20509)
 #20510=*
@@ -1596,7 +1596,7 @@ stmt_containers(#20520,#20001)
 #20521=*
 exprs(#20521,5,#20520,0,"/[^a-z]/")
 hasLocation(#20521,#20227)
-enclosingStmt(#20521,#20520)
+enclosing_stmt(#20521,#20520)
 exprContainers(#20521,#20001)
 literals("/[^a-z]/","/[^a-z]/",#20521)
 #20522=*
@@ -1629,7 +1629,7 @@ stmt_containers(#20530,#20001)
 #20531=*
 exprs(#20531,5,#20530,0,"/[a\b\x0c]/")
 hasLocation(#20531,#20231)
-enclosingStmt(#20531,#20530)
+enclosing_stmt(#20531,#20530)
 exprContainers(#20531,#20001)
 literals("/[a\b\x0c]/","/[a\b\x0c]/",#20531)
 #20532=*
@@ -1662,7 +1662,7 @@ stmt_containers(#20540,#20001)
 #20541=*
 exprs(#20541,5,#20540,0,"/a{/")
 hasLocation(#20541,#20235)
-enclosingStmt(#20541,#20540)
+enclosing_stmt(#20541,#20540)
 exprContainers(#20541,#20001)
 literals("/a{/","/a{/",#20541)
 #20542=*
@@ -1696,7 +1696,7 @@ stmt_containers(#20550,#20001)
 #20551=*
 exprs(#20551,5,#20550,0,"/a{b}/")
 hasLocation(#20551,#20239)
-enclosingStmt(#20551,#20550)
+enclosing_stmt(#20551,#20550)
 exprContainers(#20551,#20001)
 literals("/a{b}/","/a{b}/",#20551)
 #20552=*
@@ -1748,7 +1748,7 @@ stmt_containers(#20566,#20001)
 #20567=*
 exprs(#20567,5,#20566,0,"/a{2/")
 hasLocation(#20567,#20243)
-enclosingStmt(#20567,#20566)
+enclosing_stmt(#20567,#20566)
 exprContainers(#20567,#20001)
 literals("/a{2/","/a{2/",#20567)
 #20568=*
@@ -1777,7 +1777,7 @@ stmt_containers(#20574,#20001)
 #20575=*
 exprs(#20575,5,#20574,0,"/\xa/")
 hasLocation(#20575,#20247)
-enclosingStmt(#20575,#20574)
+enclosing_stmt(#20575,#20574)
 exprContainers(#20575,#20001)
 literals("/\xa/","/\xa/",#20575)
 #20576=*
@@ -1799,7 +1799,7 @@ stmt_containers(#20580,#20001)
 #20581=*
 exprs(#20581,5,#20580,0,"/\c0/")
 hasLocation(#20581,#20251)
-enclosingStmt(#20581,#20580)
+enclosing_stmt(#20581,#20580)
 exprContainers(#20581,#20001)
 literals("/\c0/","/\c0/",#20581)
 #20582=*
@@ -1820,7 +1820,7 @@ stmt_containers(#20586,#20001)
 #20587=*
 exprs(#20587,5,#20586,0,"/[]/")
 hasLocation(#20587,#20255)
-enclosingStmt(#20587,#20586)
+enclosing_stmt(#20587,#20586)
 exprContainers(#20587,#20001)
 literals("/[]/","/[]/",#20587)
 #20588=*
@@ -1835,7 +1835,7 @@ stmt_containers(#20590,#20001)
 #20591=*
 exprs(#20591,5,#20590,0,"/[^]/")
 hasLocation(#20591,#20259)
-enclosingStmt(#20591,#20590)
+enclosing_stmt(#20591,#20590)
 exprContainers(#20591,#20001)
 literals("/[^]/","/[^]/",#20591)
 #20592=*
@@ -1851,7 +1851,7 @@ stmt_containers(#20594,#20001)
 #20595=*
 exprs(#20595,5,#20594,0,"/<tpl\b ... \/tpl>/")
 hasLocation(#20595,#20263)
-enclosingStmt(#20595,#20594)
+enclosing_stmt(#20595,#20594)
 exprContainers(#20595,#20001)
 literals("/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/","/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/",#20595)
 #20596=*
diff --git a/javascript/extractor/tests/exprs/output/trap/unary.js.trap b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
index 0ff7d3d5285..40c25c9c9f9 100644
--- a/javascript/extractor/tests/exprs/output/trap/unary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
@@ -194,12 +194,12 @@ exprs(#20070,16,#20069,0,"-23")
 #20071=@"loc,{#10000},1,1,1,3"
 locations_default(#20071,#10000,1,1,1,3)
 hasLocation(#20070,#20071)
-enclosingStmt(#20070,#20069)
+enclosing_stmt(#20070,#20069)
 exprContainers(#20070,#20001)
 #20072=*
 exprs(#20072,3,#20070,0,"23")
 hasLocation(#20072,#20019)
-enclosingStmt(#20072,#20069)
+enclosing_stmt(#20072,#20069)
 exprContainers(#20072,#20001)
 literals("23","23",#20072)
 #20073=*
@@ -211,12 +211,12 @@ exprs(#20074,17,#20073,0,"+42")
 #20075=@"loc,{#10000},2,1,2,3"
 locations_default(#20075,#10000,2,1,2,3)
 hasLocation(#20074,#20075)
-enclosingStmt(#20074,#20073)
+enclosing_stmt(#20074,#20073)
 exprContainers(#20074,#20001)
 #20076=*
 exprs(#20076,3,#20074,0,"42")
 hasLocation(#20076,#20025)
-enclosingStmt(#20076,#20073)
+enclosing_stmt(#20076,#20073)
 exprContainers(#20076,#20001)
 literals("42","42",#20076)
 #20077=*
@@ -228,12 +228,12 @@ exprs(#20078,18,#20077,0,"!true")
 #20079=@"loc,{#10000},3,1,3,5"
 locations_default(#20079,#10000,3,1,3,5)
 hasLocation(#20078,#20079)
-enclosingStmt(#20078,#20077)
+enclosing_stmt(#20078,#20077)
 exprContainers(#20078,#20001)
 #20080=*
 exprs(#20080,2,#20078,0,"true")
 hasLocation(#20080,#20031)
-enclosingStmt(#20080,#20077)
+enclosing_stmt(#20080,#20077)
 exprContainers(#20080,#20001)
 literals("true","true",#20080)
 #20081=*
@@ -245,12 +245,12 @@ exprs(#20082,19,#20081,0,"~2")
 #20083=@"loc,{#10000},4,1,4,2"
 locations_default(#20083,#10000,4,1,4,2)
 hasLocation(#20082,#20083)
-enclosingStmt(#20082,#20081)
+enclosing_stmt(#20082,#20081)
 exprContainers(#20082,#20001)
 #20084=*
 exprs(#20084,3,#20082,0,"2")
 hasLocation(#20084,#20037)
-enclosingStmt(#20084,#20081)
+enclosing_stmt(#20084,#20081)
 exprContainers(#20084,#20001)
 literals("2","2",#20084)
 #20085=*
@@ -262,12 +262,12 @@ exprs(#20086,20,#20085,0,"typeof Object")
 #20087=@"loc,{#10000},5,1,5,13"
 locations_default(#20087,#10000,5,1,5,13)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20085)
+enclosing_stmt(#20086,#20085)
 exprContainers(#20086,#20001)
 #20088=*
 exprs(#20088,79,#20086,0,"Object")
 hasLocation(#20088,#20043)
-enclosingStmt(#20088,#20085)
+enclosing_stmt(#20088,#20085)
 exprContainers(#20088,#20001)
 literals("Object","Object",#20088)
 #20089=@"var;{Object};{#20000}"
@@ -282,19 +282,19 @@ exprs(#20091,21,#20090,0,"void(0)")
 #20092=@"loc,{#10000},6,1,6,7"
 locations_default(#20092,#10000,6,1,6,7)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20001)
 #20093=*
 exprs(#20093,63,#20091,0,"(0)")
 #20094=@"loc,{#10000},6,5,6,7"
 locations_default(#20094,#10000,6,5,6,7)
 hasLocation(#20093,#20094)
-enclosingStmt(#20093,#20090)
+enclosing_stmt(#20093,#20090)
 exprContainers(#20093,#20001)
 #20095=*
 exprs(#20095,3,#20093,0,"0")
 hasLocation(#20095,#20051)
-enclosingStmt(#20095,#20090)
+enclosing_stmt(#20095,#20090)
 exprContainers(#20095,#20001)
 literals("0","0",#20095)
 #20096=*
@@ -306,26 +306,26 @@ exprs(#20097,22,#20096,0,"delete  ... ototype")
 #20098=@"loc,{#10000},7,1,7,23"
 locations_default(#20098,#10000,7,1,7,23)
 hasLocation(#20097,#20098)
-enclosingStmt(#20097,#20096)
+enclosing_stmt(#20097,#20096)
 exprContainers(#20097,#20001)
 #20099=*
 exprs(#20099,14,#20097,0,"Object.prototype")
 #20100=@"loc,{#10000},7,8,7,23"
 locations_default(#20100,#10000,7,8,7,23)
 hasLocation(#20099,#20100)
-enclosingStmt(#20099,#20096)
+enclosing_stmt(#20099,#20096)
 exprContainers(#20099,#20001)
 #20101=*
 exprs(#20101,79,#20099,0,"Object")
 hasLocation(#20101,#20059)
-enclosingStmt(#20101,#20096)
+enclosing_stmt(#20101,#20096)
 exprContainers(#20101,#20001)
 literals("Object","Object",#20101)
 bind(#20101,#20089)
 #20102=*
 exprs(#20102,0,#20099,1,"prototype")
 hasLocation(#20102,#20063)
-enclosingStmt(#20102,#20096)
+enclosing_stmt(#20102,#20096)
 exprContainers(#20102,#20001)
 literals("prototype","prototype",#20102)
 #20103=*
diff --git a/javascript/extractor/tests/exprs/output/trap/update.js.trap b/javascript/extractor/tests/exprs/output/trap/update.js.trap
index 78c32ab11ca..4a7762fa10f 100644
--- a/javascript/extractor/tests/exprs/output/trap/update.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/update.js.trap
@@ -112,12 +112,12 @@ exprs(#20038,59,#20037,0,"++a")
 #20039=@"loc,{#10000},1,1,1,3"
 locations_default(#20039,#10000,1,1,1,3)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20037)
+enclosing_stmt(#20038,#20037)
 exprContainers(#20038,#20001)
 #20040=*
 exprs(#20040,79,#20038,0,"a")
 hasLocation(#20040,#20013)
-enclosingStmt(#20040,#20037)
+enclosing_stmt(#20040,#20037)
 exprContainers(#20040,#20001)
 literals("a","a",#20040)
 #20041=@"var;{a};{#20000}"
@@ -132,12 +132,12 @@ exprs(#20043,60,#20042,0,"a++")
 #20044=@"loc,{#10000},2,1,2,3"
 locations_default(#20044,#10000,2,1,2,3)
 hasLocation(#20043,#20044)
-enclosingStmt(#20043,#20042)
+enclosing_stmt(#20043,#20042)
 exprContainers(#20043,#20001)
 #20045=*
 exprs(#20045,79,#20043,0,"a")
 hasLocation(#20045,#20017)
-enclosingStmt(#20045,#20042)
+enclosing_stmt(#20045,#20042)
 exprContainers(#20045,#20001)
 literals("a","a",#20045)
 bind(#20045,#20041)
@@ -150,12 +150,12 @@ exprs(#20047,61,#20046,0,"--b")
 #20048=@"loc,{#10000},3,1,3,3"
 locations_default(#20048,#10000,3,1,3,3)
 hasLocation(#20047,#20048)
-enclosingStmt(#20047,#20046)
+enclosing_stmt(#20047,#20046)
 exprContainers(#20047,#20001)
 #20049=*
 exprs(#20049,79,#20047,0,"b")
 hasLocation(#20049,#20025)
-enclosingStmt(#20049,#20046)
+enclosing_stmt(#20049,#20046)
 exprContainers(#20049,#20001)
 literals("b","b",#20049)
 #20050=@"var;{b};{#20000}"
@@ -170,12 +170,12 @@ exprs(#20052,62,#20051,0,"b--")
 #20053=@"loc,{#10000},4,1,4,3"
 locations_default(#20053,#10000,4,1,4,3)
 hasLocation(#20052,#20053)
-enclosingStmt(#20052,#20051)
+enclosing_stmt(#20052,#20051)
 exprContainers(#20052,#20001)
 #20054=*
 exprs(#20054,79,#20052,0,"b")
 hasLocation(#20054,#20029)
-enclosingStmt(#20054,#20051)
+enclosing_stmt(#20054,#20051)
 exprContainers(#20054,#20001)
 literals("b","b",#20054)
 bind(#20054,#20050)
diff --git a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
index 94adb82cb57..1116bf3d6ca 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
@@ -75,19 +75,19 @@ exprs(#20023,13,#20022,0,"console ... o ES6"")")
 #20024=@"loc,{#10000},1,1,1,24"
 locations_default(#20024,#10000,1,1,1,24)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,14,#20023,-1,"console.log")
 #20026=@"loc,{#10000},1,1,1,11"
 locations_default(#20026,#10000,1,1,1,11)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,79,#20025,0,"console")
 hasLocation(#20027,#20005)
-enclosingStmt(#20027,#20022)
+enclosing_stmt(#20027,#20022)
 exprContainers(#20027,#20001)
 literals("console","console",#20027)
 #20028=@"var;{console};{#20000}"
@@ -96,13 +96,13 @@ bind(#20027,#20028)
 #20029=*
 exprs(#20029,0,#20025,1,"log")
 hasLocation(#20029,#20009)
-enclosingStmt(#20029,#20022)
+enclosing_stmt(#20029,#20022)
 exprContainers(#20029,#20001)
 literals("log","log",#20029)
 #20030=*
 exprs(#20030,4,#20023,0,"""Hello ES6""")
 hasLocation(#20030,#20013)
-enclosingStmt(#20030,#20022)
+enclosing_stmt(#20030,#20022)
 exprContainers(#20030,#20001)
 literals("Hello ES6","""Hello ES6""",#20030)
 #20031=*
diff --git a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
index 26166090e1a..b748b22bd81 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
@@ -75,19 +75,19 @@ exprs(#20023,13,#20022,0,"console ... lo ES"")")
 #20024=@"loc,{#10000},1,1,1,23"
 locations_default(#20024,#10000,1,1,1,23)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,14,#20023,-1,"console.log")
 #20026=@"loc,{#10000},1,1,1,11"
 locations_default(#20026,#10000,1,1,1,11)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,79,#20025,0,"console")
 hasLocation(#20027,#20005)
-enclosingStmt(#20027,#20022)
+enclosing_stmt(#20027,#20022)
 exprContainers(#20027,#20001)
 literals("console","console",#20027)
 #20028=@"var;{console};{#20000}"
@@ -96,13 +96,13 @@ bind(#20027,#20028)
 #20029=*
 exprs(#20029,0,#20025,1,"log")
 hasLocation(#20029,#20009)
-enclosingStmt(#20029,#20022)
+enclosing_stmt(#20029,#20022)
 exprContainers(#20029,#20001)
 literals("log","log",#20029)
 #20030=*
 exprs(#20030,4,#20023,0,"""Hello ES""")
 hasLocation(#20030,#20013)
-enclosingStmt(#20030,#20022)
+enclosing_stmt(#20030,#20022)
 exprContainers(#20030,#20001)
 literals("Hello ES","""Hello ES""",#20030)
 #20031=*
diff --git a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
index 75a03a27a03..8cdd7e28c57 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
@@ -94,32 +94,32 @@ exprs(#20033,13,#20032,0,"console ... monJS"")")
 #20034=@"loc,{#10000},1,1,1,29"
 locations_default(#20034,#10000,1,1,1,29)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20032)
+enclosing_stmt(#20033,#20032)
 exprContainers(#20033,#20001)
 #20035=*
 exprs(#20035,14,#20033,-1,"console.log")
 #20036=@"loc,{#10000},1,1,1,11"
 locations_default(#20036,#10000,1,1,1,11)
 hasLocation(#20035,#20036)
-enclosingStmt(#20035,#20032)
+enclosing_stmt(#20035,#20032)
 exprContainers(#20035,#20001)
 #20037=*
 exprs(#20037,79,#20035,0,"console")
 hasLocation(#20037,#20005)
-enclosingStmt(#20037,#20032)
+enclosing_stmt(#20037,#20032)
 exprContainers(#20037,#20001)
 literals("console","console",#20037)
 bind(#20037,#20023)
 #20038=*
 exprs(#20038,0,#20035,1,"log")
 hasLocation(#20038,#20009)
-enclosingStmt(#20038,#20032)
+enclosing_stmt(#20038,#20032)
 exprContainers(#20038,#20001)
 literals("log","log",#20038)
 #20039=*
 exprs(#20039,4,#20033,0,"""Hello CommonJS""")
 hasLocation(#20039,#20013)
-enclosingStmt(#20039,#20032)
+enclosing_stmt(#20039,#20032)
 exprContainers(#20039,#20001)
 literals("Hello CommonJS","""Hello CommonJS""",#20039)
 #20040=*
diff --git a/javascript/extractor/tests/externs/output/trap/Point.js.trap b/javascript/extractor/tests/externs/output/trap/Point.js.trap
index 97888b032a4..d899159debd 100644
--- a/javascript/extractor/tests/externs/output/trap/Point.js.trap
+++ b/javascript/extractor/tests/externs/output/trap/Point.js.trap
@@ -531,39 +531,39 @@ exprs(#20195,47,#20194,0,"Point.p ...  dy) {}")
 #20196=@"loc,{#10000},3,1,3,42"
 locations_default(#20196,#10000,3,1,3,42)
 hasLocation(#20195,#20196)
-enclosingStmt(#20195,#20194)
+enclosing_stmt(#20195,#20194)
 exprContainers(#20195,#20001)
 #20197=*
 exprs(#20197,14,#20195,0,"Point.prototype.move")
 #20198=@"loc,{#10000},3,1,3,20"
 locations_default(#20198,#10000,3,1,3,20)
 hasLocation(#20197,#20198)
-enclosingStmt(#20197,#20194)
+enclosing_stmt(#20197,#20194)
 exprContainers(#20197,#20001)
 #20199=*
 exprs(#20199,14,#20197,0,"Point.prototype")
 #20200=@"loc,{#10000},3,1,3,15"
 locations_default(#20200,#10000,3,1,3,15)
 hasLocation(#20199,#20200)
-enclosingStmt(#20199,#20194)
+enclosing_stmt(#20199,#20194)
 exprContainers(#20199,#20001)
 #20201=*
 exprs(#20201,79,#20199,0,"Point")
 hasLocation(#20201,#20056)
-enclosingStmt(#20201,#20194)
+enclosing_stmt(#20201,#20194)
 exprContainers(#20201,#20001)
 literals("Point","Point",#20201)
 bind(#20201,#20181)
 #20202=*
 exprs(#20202,0,#20199,1,"prototype")
 hasLocation(#20202,#20060)
-enclosingStmt(#20202,#20194)
+enclosing_stmt(#20202,#20194)
 exprContainers(#20202,#20001)
 literals("prototype","prototype",#20202)
 #20203=*
 exprs(#20203,0,#20197,1,"move")
 hasLocation(#20203,#20064)
-enclosingStmt(#20203,#20194)
+enclosing_stmt(#20203,#20194)
 exprContainers(#20203,#20001)
 literals("move","move",#20203)
 #20204=*
@@ -571,7 +571,7 @@ exprs(#20204,9,#20195,1,"function(dx, dy) {}")
 #20205=@"loc,{#10000},3,24,3,42"
 locations_default(#20205,#10000,3,24,3,42)
 hasLocation(#20204,#20205)
-enclosingStmt(#20204,#20194)
+enclosing_stmt(#20204,#20194)
 exprContainers(#20204,#20001)
 #20206=*
 scopes(#20206,1)
@@ -611,39 +611,39 @@ exprs(#20215,47,#20214,0,"Point.p ... bj = {}")
 #20216=@"loc,{#10000},4,1,4,24"
 locations_default(#20216,#10000,4,1,4,24)
 hasLocation(#20215,#20216)
-enclosingStmt(#20215,#20214)
+enclosing_stmt(#20215,#20214)
 exprContainers(#20215,#20001)
 #20217=*
 exprs(#20217,14,#20215,0,"Point.prototype.obj")
 #20218=@"loc,{#10000},4,1,4,19"
 locations_default(#20218,#10000,4,1,4,19)
 hasLocation(#20217,#20218)
-enclosingStmt(#20217,#20214)
+enclosing_stmt(#20217,#20214)
 exprContainers(#20217,#20001)
 #20219=*
 exprs(#20219,14,#20217,0,"Point.prototype")
 #20220=@"loc,{#10000},4,1,4,15"
 locations_default(#20220,#10000,4,1,4,15)
 hasLocation(#20219,#20220)
-enclosingStmt(#20219,#20214)
+enclosing_stmt(#20219,#20214)
 exprContainers(#20219,#20001)
 #20221=*
 exprs(#20221,79,#20219,0,"Point")
 hasLocation(#20221,#20086)
-enclosingStmt(#20221,#20214)
+enclosing_stmt(#20221,#20214)
 exprContainers(#20221,#20001)
 literals("Point","Point",#20221)
 bind(#20221,#20181)
 #20222=*
 exprs(#20222,0,#20219,1,"prototype")
 hasLocation(#20222,#20090)
-enclosingStmt(#20222,#20214)
+enclosing_stmt(#20222,#20214)
 exprContainers(#20222,#20001)
 literals("prototype","prototype",#20222)
 #20223=*
 exprs(#20223,0,#20217,1,"obj")
 hasLocation(#20223,#20094)
-enclosingStmt(#20223,#20214)
+enclosing_stmt(#20223,#20214)
 exprContainers(#20223,#20001)
 literals("obj","obj",#20223)
 #20224=*
@@ -651,7 +651,7 @@ exprs(#20224,8,#20215,1,"{}")
 #20225=@"loc,{#10000},4,23,4,24"
 locations_default(#20225,#10000,4,23,4,24)
 hasLocation(#20224,#20225)
-enclosingStmt(#20224,#20214)
+enclosing_stmt(#20224,#20214)
 exprContainers(#20224,#20001)
 #20226=*
 stmts(#20226,2,#20001,3,"Point.p ... secret;")
@@ -662,32 +662,32 @@ exprs(#20227,14,#20226,0,"Point.p ... .secret")
 #20228=@"loc,{#10000},5,1,5,22"
 locations_default(#20228,#10000,5,1,5,22)
 hasLocation(#20227,#20228)
-enclosingStmt(#20227,#20226)
+enclosing_stmt(#20227,#20226)
 exprContainers(#20227,#20001)
 #20229=*
 exprs(#20229,14,#20227,0,"Point.prototype")
 #20230=@"loc,{#10000},5,1,5,15"
 locations_default(#20230,#10000,5,1,5,15)
 hasLocation(#20229,#20230)
-enclosingStmt(#20229,#20226)
+enclosing_stmt(#20229,#20226)
 exprContainers(#20229,#20001)
 #20231=*
 exprs(#20231,79,#20229,0,"Point")
 hasLocation(#20231,#20104)
-enclosingStmt(#20231,#20226)
+enclosing_stmt(#20231,#20226)
 exprContainers(#20231,#20001)
 literals("Point","Point",#20231)
 bind(#20231,#20181)
 #20232=*
 exprs(#20232,0,#20229,1,"prototype")
 hasLocation(#20232,#20108)
-enclosingStmt(#20232,#20226)
+enclosing_stmt(#20232,#20226)
 exprContainers(#20232,#20001)
 literals("prototype","prototype",#20232)
 #20233=*
 exprs(#20233,0,#20227,1,"secret")
 hasLocation(#20233,#20112)
-enclosingStmt(#20233,#20226)
+enclosing_stmt(#20233,#20226)
 exprContainers(#20233,#20001)
 literals("secret","secret",#20233)
 #20234=*
@@ -699,19 +699,19 @@ exprs(#20235,14,#20234,0,"Point.ORIGIN")
 #20236=@"loc,{#10000},7,1,7,12"
 locations_default(#20236,#10000,7,1,7,12)
 hasLocation(#20235,#20236)
-enclosingStmt(#20235,#20234)
+enclosing_stmt(#20235,#20234)
 exprContainers(#20235,#20001)
 #20237=*
 exprs(#20237,79,#20235,0,"Point")
 hasLocation(#20237,#20116)
-enclosingStmt(#20237,#20234)
+enclosing_stmt(#20237,#20234)
 exprContainers(#20237,#20001)
 literals("Point","Point",#20237)
 bind(#20237,#20181)
 #20238=*
 exprs(#20238,0,#20235,1,"ORIGIN")
 hasLocation(#20238,#20120)
-enclosingStmt(#20238,#20234)
+enclosing_stmt(#20238,#20234)
 exprContainers(#20238,#20001)
 literals("ORIGIN","ORIGIN",#20238)
 #20239=*
@@ -723,26 +723,26 @@ exprs(#20240,47,#20239,0,"Point.f ... on() {}")
 #20241=@"loc,{#10000},8,1,8,25"
 locations_default(#20241,#10000,8,1,8,25)
 hasLocation(#20240,#20241)
-enclosingStmt(#20240,#20239)
+enclosing_stmt(#20240,#20239)
 exprContainers(#20240,#20001)
 #20242=*
 exprs(#20242,14,#20240,0,"Point.foo")
 #20243=@"loc,{#10000},8,1,8,9"
 locations_default(#20243,#10000,8,1,8,9)
 hasLocation(#20242,#20243)
-enclosingStmt(#20242,#20239)
+enclosing_stmt(#20242,#20239)
 exprContainers(#20242,#20001)
 #20244=*
 exprs(#20244,79,#20242,0,"Point")
 hasLocation(#20244,#20124)
-enclosingStmt(#20244,#20239)
+enclosing_stmt(#20244,#20239)
 exprContainers(#20244,#20001)
 literals("Point","Point",#20244)
 bind(#20244,#20181)
 #20245=*
 exprs(#20245,0,#20242,1,"foo")
 hasLocation(#20245,#20128)
-enclosingStmt(#20245,#20239)
+enclosing_stmt(#20245,#20239)
 exprContainers(#20245,#20001)
 literals("foo","foo",#20245)
 #20246=*
@@ -750,7 +750,7 @@ exprs(#20246,9,#20240,1,"function() {}")
 #20247=@"loc,{#10000},8,13,8,25"
 locations_default(#20247,#10000,8,13,8,25)
 hasLocation(#20246,#20247)
-enclosingStmt(#20246,#20239)
+enclosing_stmt(#20246,#20239)
 exprContainers(#20246,#20001)
 #20248=*
 scopes(#20248,1)
@@ -772,12 +772,12 @@ stmt_containers(#20252,#20001)
 #20253=*
 exprs(#20253,64,#20252,0,"someGlobal")
 hasLocation(#20253,#20146)
-enclosingStmt(#20253,#20252)
+enclosing_stmt(#20253,#20252)
 exprContainers(#20253,#20001)
 #20254=*
 exprs(#20254,78,#20253,0,"someGlobal")
 hasLocation(#20254,#20146)
-enclosingStmt(#20254,#20252)
+enclosing_stmt(#20254,#20252)
 exprContainers(#20254,#20001)
 literals("someGlobal","someGlobal",#20254)
 decl(#20254,#20182)
@@ -788,12 +788,12 @@ stmt_containers(#20255,#20001)
 #20256=*
 exprs(#20256,64,#20255,0,"MyString")
 hasLocation(#20256,#20152)
-enclosingStmt(#20256,#20255)
+enclosing_stmt(#20256,#20255)
 exprContainers(#20256,#20001)
 #20257=*
 exprs(#20257,78,#20256,0,"MyString")
 hasLocation(#20257,#20152)
-enclosingStmt(#20257,#20255)
+enclosing_stmt(#20257,#20255)
 exprContainers(#20257,#20001)
 literals("MyString","MyString",#20257)
 decl(#20257,#20183)
@@ -806,32 +806,32 @@ exprs(#20259,15,#20258,0,"Point.p ... final']")
 #20260=@"loc,{#10000},15,1,15,24"
 locations_default(#20260,#10000,15,1,15,24)
 hasLocation(#20259,#20260)
-enclosingStmt(#20259,#20258)
+enclosing_stmt(#20259,#20258)
 exprContainers(#20259,#20001)
 #20261=*
 exprs(#20261,14,#20259,0,"Point.prototype")
 #20262=@"loc,{#10000},15,1,15,15"
 locations_default(#20262,#10000,15,1,15,15)
 hasLocation(#20261,#20262)
-enclosingStmt(#20261,#20258)
+enclosing_stmt(#20261,#20258)
 exprContainers(#20261,#20001)
 #20263=*
 exprs(#20263,79,#20261,0,"Point")
 hasLocation(#20263,#20156)
-enclosingStmt(#20263,#20258)
+enclosing_stmt(#20263,#20258)
 exprContainers(#20263,#20001)
 literals("Point","Point",#20263)
 bind(#20263,#20181)
 #20264=*
 exprs(#20264,0,#20261,1,"prototype")
 hasLocation(#20264,#20160)
-enclosingStmt(#20264,#20258)
+enclosing_stmt(#20264,#20258)
 exprContainers(#20264,#20001)
 literals("prototype","prototype",#20264)
 #20265=*
 exprs(#20265,4,#20259,1,"'final'")
 hasLocation(#20265,#20164)
-enclosingStmt(#20265,#20258)
+enclosing_stmt(#20265,#20258)
 exprContainers(#20265,#20001)
 literals("final","'final'",#20265)
 #20266=*
@@ -847,7 +847,7 @@ stmt_containers(#20268,#20001)
 #20269=*
 exprs(#20269,4,#20268,0,"'use strict'")
 hasLocation(#20269,#20170)
-enclosingStmt(#20269,#20268)
+enclosing_stmt(#20269,#20268)
 exprContainers(#20269,#20001)
 literals("use strict","'use strict'",#20269)
 #20270=*
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
index 6121b478f8a..d9bcfe45bf2 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
@@ -101,12 +101,12 @@ exprs(#20035,64,#20034,0,"f = (x?:int) => {}")
 #20036=@"loc,{#10000},1,5,1,22"
 locations_default(#20036,#10000,1,5,1,22)
 hasLocation(#20035,#20036)
-enclosingStmt(#20035,#20034)
+enclosing_stmt(#20035,#20034)
 exprContainers(#20035,#20001)
 #20037=*
 exprs(#20037,78,#20035,0,"f")
 hasLocation(#20037,#20007)
-enclosingStmt(#20037,#20034)
+enclosing_stmt(#20037,#20034)
 exprContainers(#20037,#20001)
 literals("f","f",#20037)
 decl(#20037,#20033)
@@ -115,7 +115,7 @@ exprs(#20038,65,#20035,1,"(x?:int) => {}")
 #20039=@"loc,{#10000},1,9,1,22"
 locations_default(#20039,#10000,1,9,1,22)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20034)
+enclosing_stmt(#20038,#20034)
 exprContainers(#20038,#20001)
 #20040=*
 scopes(#20040,1)
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
index ae5fd98335c..4cc86390b5b 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
@@ -108,12 +108,12 @@ exprs(#20038,64,#20037,0,"f = (vi ... n => {}")
 #20039=@"loc,{#10000},1,5,1,47"
 locations_default(#20039,#10000,1,5,1,47)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20037)
+enclosing_stmt(#20038,#20037)
 exprContainers(#20038,#20001)
 #20040=*
 exprs(#20040,78,#20038,0,"f")
 hasLocation(#20040,#20007)
-enclosingStmt(#20040,#20037)
+enclosing_stmt(#20040,#20037)
 exprContainers(#20040,#20001)
 literals("f","f",#20040)
 decl(#20040,#20036)
@@ -122,7 +122,7 @@ exprs(#20041,65,#20038,1,"(viewab ... n => {}")
 #20042=@"loc,{#10000},1,9,1,47"
 locations_default(#20042,#10000,1,9,1,47)
 hasLocation(#20041,#20042)
-enclosingStmt(#20041,#20037)
+enclosing_stmt(#20041,#20037)
 exprContainers(#20041,#20001)
 #20043=*
 scopes(#20043,1)
diff --git a/javascript/extractor/tests/flow/output/trap/async.js.trap b/javascript/extractor/tests/flow/output/trap/async.js.trap
index bdf25e5fbd8..febff80d156 100644
--- a/javascript/extractor/tests/flow/output/trap/async.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/async.js.trap
@@ -121,12 +121,12 @@ exprs(#20043,64,#20042,0,"f = asy ... t foo()")
 #20044=@"loc,{#10000},1,5,1,48"
 locations_default(#20044,#10000,1,5,1,48)
 hasLocation(#20043,#20044)
-enclosingStmt(#20043,#20042)
+enclosing_stmt(#20043,#20042)
 exprContainers(#20043,#20001)
 #20045=*
 exprs(#20045,78,#20043,0,"f")
 hasLocation(#20045,#20007)
-enclosingStmt(#20045,#20042)
+enclosing_stmt(#20045,#20042)
 exprContainers(#20045,#20001)
 literals("f","f",#20045)
 decl(#20045,#20041)
@@ -135,7 +135,7 @@ exprs(#20046,65,#20043,1,"async() ... t foo()")
 #20047=@"loc,{#10000},1,9,1,48"
 locations_default(#20047,#10000,1,9,1,48)
 hasLocation(#20046,#20047)
-enclosingStmt(#20046,#20042)
+enclosing_stmt(#20046,#20042)
 exprContainers(#20046,#20001)
 #20048=*
 scopes(#20048,1)
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
index 7b6145bdf21..00fca966a90 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
@@ -454,12 +454,12 @@ exprs(#20170,12,#20169,0,"new K1<T1>()")
 #20171=@"loc,{#10000},1,1,1,12"
 locations_default(#20171,#10000,1,1,1,12)
 hasLocation(#20170,#20171)
-enclosingStmt(#20170,#20169)
+enclosing_stmt(#20170,#20169)
 exprContainers(#20170,#20001)
 #20172=*
 exprs(#20172,79,#20170,-1,"K1")
 hasLocation(#20172,#20029)
-enclosingStmt(#20172,#20169)
+enclosing_stmt(#20172,#20169)
 exprContainers(#20172,#20001)
 literals("K1","K1",#20172)
 #20173=@"var;{K1};{#20000}"
@@ -474,12 +474,12 @@ exprs(#20175,13,#20174,0,"f1<T2>()")
 #20176=@"loc,{#10000},2,1,2,8"
 locations_default(#20176,#10000,2,1,2,8)
 hasLocation(#20175,#20176)
-enclosingStmt(#20175,#20174)
+enclosing_stmt(#20175,#20174)
 exprContainers(#20175,#20001)
 #20177=*
 exprs(#20177,79,#20175,-1,"f1")
 hasLocation(#20177,#20043)
-enclosingStmt(#20177,#20174)
+enclosing_stmt(#20177,#20174)
 exprContainers(#20177,#20001)
 literals("f1","f1",#20177)
 #20178=@"var;{f1};{#20000}"
@@ -496,12 +496,12 @@ exprs(#20181,64,#20179,0,"f2 = fu ... >(x);\n}")
 #20182=@"loc,{#10000},3,7,5,1"
 locations_default(#20182,#10000,3,7,5,1)
 hasLocation(#20181,#20182)
-enclosingStmt(#20181,#20179)
+enclosing_stmt(#20181,#20179)
 exprContainers(#20181,#20001)
 #20183=*
 exprs(#20183,78,#20181,0,"f2")
 hasLocation(#20183,#20059)
-enclosingStmt(#20183,#20179)
+enclosing_stmt(#20183,#20179)
 exprContainers(#20183,#20001)
 literals("f2","f2",#20183)
 decl(#20183,#20168)
@@ -510,7 +510,7 @@ exprs(#20184,9,#20181,1,"functio ... >(x);\n}")
 #20185=@"loc,{#10000},3,12,5,1"
 locations_default(#20185,#10000,3,12,5,1)
 hasLocation(#20184,#20185)
-enclosingStmt(#20184,#20179)
+enclosing_stmt(#20184,#20179)
 exprContainers(#20184,#20001)
 #20186=*
 scopes(#20186,1)
@@ -537,19 +537,19 @@ exprs(#20192,69,#20190,0,"yield* f3<T5>(x)")
 #20193=@"loc,{#10000},4,3,4,18"
 locations_default(#20193,#10000,4,3,4,18)
 hasLocation(#20192,#20193)
-enclosingStmt(#20192,#20190)
+enclosing_stmt(#20192,#20190)
 exprContainers(#20192,#20184)
 #20194=*
 exprs(#20194,13,#20192,0,"f3<T5>(x)")
 #20195=@"loc,{#10000},4,10,4,18"
 locations_default(#20195,#10000,4,10,4,18)
 hasLocation(#20194,#20195)
-enclosingStmt(#20194,#20190)
+enclosing_stmt(#20194,#20190)
 exprContainers(#20194,#20184)
 #20196=*
 exprs(#20196,79,#20194,-1,"f3")
 hasLocation(#20196,#20087)
-enclosingStmt(#20196,#20190)
+enclosing_stmt(#20196,#20190)
 exprContainers(#20196,#20184)
 literals("f3","f3",#20196)
 #20197=@"var;{f3};{#20000}"
@@ -558,7 +558,7 @@ bind(#20196,#20197)
 #20198=*
 exprs(#20198,79,#20194,0,"x")
 hasLocation(#20198,#20097)
-enclosingStmt(#20198,#20190)
+enclosing_stmt(#20198,#20190)
 exprContainers(#20198,#20184)
 literals("x","x",#20198)
 #20199=@"var;{x};{#20000}"
@@ -574,12 +574,12 @@ exprs(#20201,13,#20200,0,"f4<T6>(v1)")
 #20202=@"loc,{#10000},6,1,6,10"
 locations_default(#20202,#10000,6,1,6,10)
 hasLocation(#20201,#20202)
-enclosingStmt(#20201,#20200)
+enclosing_stmt(#20201,#20200)
 exprContainers(#20201,#20001)
 #20203=*
 exprs(#20203,79,#20201,-1,"f4")
 hasLocation(#20203,#20104)
-enclosingStmt(#20203,#20200)
+enclosing_stmt(#20203,#20200)
 exprContainers(#20203,#20001)
 literals("f4","f4",#20203)
 #20204=@"var;{f4};{#20000}"
@@ -588,7 +588,7 @@ bind(#20203,#20204)
 #20205=*
 exprs(#20205,79,#20201,0,"v1")
 hasLocation(#20205,#20114)
-enclosingStmt(#20205,#20200)
+enclosing_stmt(#20205,#20200)
 exprContainers(#20205,#20001)
 literals("v1","v1",#20205)
 #20206=@"var;{v1};{#20000}"
@@ -603,12 +603,12 @@ exprs(#20208,13,#20207,0,"f5<_,_,_>()")
 #20209=@"loc,{#10000},7,1,7,11"
 locations_default(#20209,#10000,7,1,7,11)
 hasLocation(#20208,#20209)
-enclosingStmt(#20208,#20207)
+enclosing_stmt(#20208,#20207)
 exprContainers(#20208,#20001)
 #20210=*
 exprs(#20210,79,#20208,-1,"f5")
 hasLocation(#20210,#20120)
-enclosingStmt(#20210,#20207)
+enclosing_stmt(#20210,#20207)
 exprContainers(#20210,#20001)
 literals("f5","f5",#20210)
 #20211=@"var;{f5};{#20000}"
@@ -625,12 +625,12 @@ exprs(#20214,13,#20212,0,"f6<\n\t|T ... T9\n\t>()")
 #20215=@"loc,{#10000},8,1,12,4"
 locations_default(#20215,#10000,8,1,12,4)
 hasLocation(#20214,#20215)
-enclosingStmt(#20214,#20212)
+enclosing_stmt(#20214,#20212)
 exprContainers(#20214,#20001)
 #20216=*
 exprs(#20216,79,#20214,-1,"f6")
 hasLocation(#20216,#20142)
-enclosingStmt(#20216,#20212)
+enclosing_stmt(#20216,#20212)
 exprContainers(#20216,#20001)
 literals("f6","f6",#20216)
 #20217=@"var;{f6};{#20000}"
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
index b0562bc5c0d..b5ad79e681b 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
@@ -61,12 +61,12 @@ exprs(#20019,12,#20018,0,"new K1<T1>")
 #20020=@"loc,{#10000},1,1,1,10"
 locations_default(#20020,#10000,1,1,1,10)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,79,#20019,-1,"K1")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 literals("K1","K1",#20021)
 #20022=@"var;{K1};{#20000}"
diff --git a/javascript/extractor/tests/flow/output/trap/export.js.trap b/javascript/extractor/tests/flow/output/trap/export.js.trap
index 9ff4e4cfd5f..22dec6649ca 100644
--- a/javascript/extractor/tests/flow/output/trap/export.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/export.js.trap
@@ -231,7 +231,7 @@ stmt_containers(#20084,#20001)
 #20085=*
 exprs(#20085,4,#20084,-2,"""m""")
 hasLocation(#20085,#20023)
-enclosingStmt(#20085,#20084)
+enclosing_stmt(#20085,#20084)
 exprContainers(#20085,#20001)
 literals("m","""m""",#20085)
 #20086=*
@@ -243,18 +243,18 @@ regexpConstValue(#20086,"m")
 #20088=*
 exprs(#20088,86,#20084,0,"a")
 hasLocation(#20088,#20017)
-enclosingStmt(#20088,#20084)
+enclosing_stmt(#20088,#20084)
 exprContainers(#20088,#20001)
 #20089=*
 exprs(#20089,0,#20088,0,"a")
 hasLocation(#20089,#20017)
-enclosingStmt(#20089,#20084)
+enclosing_stmt(#20089,#20084)
 exprContainers(#20089,#20001)
 literals("a","a",#20089)
 #20090=*
 exprs(#20090,0,#20088,1,"a")
 hasLocation(#20090,#20017)
-enclosingStmt(#20090,#20084)
+enclosing_stmt(#20090,#20084)
 exprContainers(#20090,#20001)
 literals("a","a",#20090)
 #20091=*
@@ -264,7 +264,7 @@ stmt_containers(#20091,#20001)
 #20092=*
 exprs(#20092,4,#20091,0,"""m""")
 hasLocation(#20092,#20033)
-enclosingStmt(#20092,#20091)
+enclosing_stmt(#20092,#20091)
 exprContainers(#20092,#20001)
 literals("m","""m""",#20092)
 #20093=*
diff --git a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
index dc8dee42d8e..ea25b28bf61 100644
--- a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
@@ -186,7 +186,7 @@ stmt_containers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"C")
 hasLocation(#20068,#20013)
-enclosingStmt(#20068,#20066)
+enclosing_stmt(#20068,#20066)
 exprContainers(#20068,#20001)
 literals("C","C",#20068)
 decl(#20068,#20064)
@@ -203,7 +203,7 @@ hasLocation(#20070,#20071)
 #20072=*
 exprs(#20072,0,#20070,0,"get")
 hasLocation(#20072,#20017)
-enclosingStmt(#20072,#20066)
+enclosing_stmt(#20072,#20066)
 exprContainers(#20072,#20001)
 literals("get","get",#20072)
 #20073=*
@@ -211,7 +211,7 @@ exprs(#20073,9,#20070,1,"(v: T) { }")
 #20074=@"loc,{#10000},2,11,2,20"
 locations_default(#20074,#10000,2,11,2,20)
 hasLocation(#20073,#20074)
-enclosingStmt(#20073,#20066)
+enclosing_stmt(#20073,#20066)
 exprContainers(#20073,#20001)
 #20075=*
 scopes(#20075,1)
@@ -245,7 +245,7 @@ hasLocation(#20082,#20083)
 #20084=*
 exprs(#20084,0,#20082,0,"set")
 hasLocation(#20084,#20039)
-enclosingStmt(#20084,#20066)
+enclosing_stmt(#20084,#20066)
 exprContainers(#20084,#20001)
 literals("set","set",#20084)
 #20085=*
@@ -253,7 +253,7 @@ exprs(#20085,9,#20082,1,"(v: T) { }")
 #20086=@"loc,{#10000},3,11,3,20"
 locations_default(#20086,#10000,3,11,3,20)
 hasLocation(#20085,#20086)
-enclosingStmt(#20085,#20066)
+enclosing_stmt(#20085,#20066)
 exprContainers(#20085,#20001)
 #20087=*
 scopes(#20087,1)
@@ -287,13 +287,13 @@ hasLocation(#20094,#20095)
 #20096=*
 exprs(#20096,0,#20094,0,"constructor")
 hasLocation(#20096,#20095)
-enclosingStmt(#20096,#20066)
+enclosing_stmt(#20096,#20066)
 exprContainers(#20096,#20001)
 literals("constructor","constructor",#20096)
 #20097=*
 exprs(#20097,9,#20094,1,"() {}")
 hasLocation(#20097,#20095)
-enclosingStmt(#20097,#20066)
+enclosing_stmt(#20097,#20066)
 exprContainers(#20097,#20001)
 #20098=*
 scopes(#20098,1)
diff --git a/javascript/extractor/tests/flow/output/trap/importType.js.trap b/javascript/extractor/tests/flow/output/trap/importType.js.trap
index 2c29d624abc..509edfe7eab 100644
--- a/javascript/extractor/tests/flow/output/trap/importType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/importType.js.trap
@@ -203,7 +203,7 @@ stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,4,#20073,-1,"'m'")
 hasLocation(#20074,#20031)
-enclosingStmt(#20074,#20073)
+enclosing_stmt(#20074,#20073)
 exprContainers(#20074,#20001)
 literals("m","'m'",#20074)
 #20075=*
@@ -215,18 +215,18 @@ regexpConstValue(#20075,"m")
 #20077=*
 exprs(#20077,83,#20073,0,"type")
 hasLocation(#20077,#20013)
-enclosingStmt(#20077,#20073)
+enclosing_stmt(#20077,#20073)
 exprContainers(#20077,#20001)
 #20078=*
 exprs(#20078,0,#20077,0,"type")
 hasLocation(#20078,#20013)
-enclosingStmt(#20078,#20073)
+enclosing_stmt(#20078,#20073)
 exprContainers(#20078,#20001)
 literals("type","type",#20078)
 #20079=*
 exprs(#20079,78,#20077,1,"type")
 hasLocation(#20079,#20013)
-enclosingStmt(#20079,#20073)
+enclosing_stmt(#20079,#20073)
 exprContainers(#20079,#20001)
 literals("type","type",#20079)
 decl(#20079,#20070)
diff --git a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
index 8c553bac9f4..430a413685f 100644
--- a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
@@ -155,12 +155,12 @@ exprs(#20054,64,#20053,0,"o = {\n  ... ;\n  }\n}")
 #20055=@"loc,{#10000},1,5,5,1"
 locations_default(#20055,#10000,1,5,5,1)
 hasLocation(#20054,#20055)
-enclosingStmt(#20054,#20053)
+enclosing_stmt(#20054,#20053)
 exprContainers(#20054,#20001)
 #20056=*
 exprs(#20056,78,#20054,0,"o")
 hasLocation(#20056,#20015)
-enclosingStmt(#20056,#20053)
+enclosing_stmt(#20056,#20053)
 exprContainers(#20056,#20001)
 literals("o","o",#20056)
 decl(#20056,#20052)
@@ -169,7 +169,7 @@ exprs(#20057,8,#20054,1,"{\n  id< ... ;\n  }\n}")
 #20058=@"loc,{#10000},1,9,5,1"
 locations_default(#20058,#10000,1,9,5,1)
 hasLocation(#20057,#20058)
-enclosingStmt(#20057,#20053)
+enclosing_stmt(#20057,#20053)
 exprContainers(#20057,#20001)
 #20059=*
 properties(#20059,#20057,0,0,"id<A>(a ...  a;\n  }")
@@ -179,7 +179,7 @@ hasLocation(#20059,#20060)
 #20061=*
 exprs(#20061,0,#20059,0,"id")
 hasLocation(#20061,#20021)
-enclosingStmt(#20061,#20053)
+enclosing_stmt(#20061,#20053)
 exprContainers(#20061,#20001)
 literals("id","id",#20061)
 #20062=*
@@ -187,7 +187,7 @@ exprs(#20062,9,#20059,1,"(a : A) ...  a;\n  }")
 #20063=@"loc,{#10000},2,8,4,3"
 locations_default(#20063,#10000,2,8,4,3)
 hasLocation(#20062,#20063)
-enclosingStmt(#20062,#20053)
+enclosing_stmt(#20062,#20053)
 exprContainers(#20062,#20001)
 #20064=*
 scopes(#20064,1)
@@ -221,7 +221,7 @@ stmt_containers(#20071,#20062)
 #20073=*
 exprs(#20073,79,#20071,0,"a")
 hasLocation(#20073,#20043)
-enclosingStmt(#20073,#20071)
+enclosing_stmt(#20073,#20071)
 exprContainers(#20073,#20062)
 literals("a","a",#20073)
 bind(#20073,#20065)
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
index 7f7bfeb538e..aac6a93cf26 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
@@ -71,25 +71,25 @@ exprs(#20023,29,#20022,0,"1<2>(3)")
 #20024=@"loc,{#10000},1,1,1,7"
 locations_default(#20024,#10000,1,1,1,7)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,27,#20023,0,"1<2")
 #20026=@"loc,{#10000},1,1,1,3"
 locations_default(#20026,#10000,1,1,1,3)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,3,#20025,0,"1")
 hasLocation(#20027,#20005)
-enclosingStmt(#20027,#20022)
+enclosing_stmt(#20027,#20022)
 exprContainers(#20027,#20001)
 literals("1","1",#20027)
 #20028=*
 exprs(#20028,3,#20025,1,"2")
 hasLocation(#20028,#20009)
-enclosingStmt(#20028,#20022)
+enclosing_stmt(#20028,#20022)
 exprContainers(#20028,#20001)
 literals("2","2",#20028)
 #20029=*
@@ -97,12 +97,12 @@ exprs(#20029,63,#20023,1,"(3)")
 #20030=@"loc,{#10000},1,5,1,7"
 locations_default(#20030,#10000,1,5,1,7)
 hasLocation(#20029,#20030)
-enclosingStmt(#20029,#20022)
+enclosing_stmt(#20029,#20022)
 exprContainers(#20029,#20001)
 #20031=*
 exprs(#20031,3,#20029,0,"3")
 hasLocation(#20031,#20015)
-enclosingStmt(#20031,#20022)
+enclosing_stmt(#20031,#20022)
 exprContainers(#20031,#20001)
 literals("3","3",#20031)
 #20032=*
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
index c6c002ff118..552664beeb2 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
@@ -91,19 +91,19 @@ exprs(#20031,29,#20030,0,"f<g()>(h())")
 #20032=@"loc,{#10000},1,1,1,11"
 locations_default(#20032,#10000,1,1,1,11)
 hasLocation(#20031,#20032)
-enclosingStmt(#20031,#20030)
+enclosing_stmt(#20031,#20030)
 exprContainers(#20031,#20001)
 #20033=*
 exprs(#20033,27,#20031,0,"f<g()")
 #20034=@"loc,{#10000},1,1,1,5"
 locations_default(#20034,#10000,1,1,1,5)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20030)
+enclosing_stmt(#20033,#20030)
 exprContainers(#20033,#20001)
 #20035=*
 exprs(#20035,79,#20033,0,"f")
 hasLocation(#20035,#20005)
-enclosingStmt(#20035,#20030)
+enclosing_stmt(#20035,#20030)
 exprContainers(#20035,#20001)
 literals("f","f",#20035)
 #20036=@"var;{f};{#20000}"
@@ -114,12 +114,12 @@ exprs(#20037,13,#20033,1,"g()")
 #20038=@"loc,{#10000},1,3,1,5"
 locations_default(#20038,#10000,1,3,1,5)
 hasLocation(#20037,#20038)
-enclosingStmt(#20037,#20030)
+enclosing_stmt(#20037,#20030)
 exprContainers(#20037,#20001)
 #20039=*
 exprs(#20039,79,#20037,-1,"g")
 hasLocation(#20039,#20009)
-enclosingStmt(#20039,#20030)
+enclosing_stmt(#20039,#20030)
 exprContainers(#20039,#20001)
 literals("g","g",#20039)
 #20040=@"var;{g};{#20000}"
@@ -130,19 +130,19 @@ exprs(#20041,63,#20031,1,"(h())")
 #20042=@"loc,{#10000},1,7,1,11"
 locations_default(#20042,#10000,1,7,1,11)
 hasLocation(#20041,#20042)
-enclosingStmt(#20041,#20030)
+enclosing_stmt(#20041,#20030)
 exprContainers(#20041,#20001)
 #20043=*
 exprs(#20043,13,#20041,0,"h()")
 #20044=@"loc,{#10000},1,8,1,10"
 locations_default(#20044,#10000,1,8,1,10)
 hasLocation(#20043,#20044)
-enclosingStmt(#20043,#20030)
+enclosing_stmt(#20043,#20030)
 exprContainers(#20043,#20001)
 #20045=*
 exprs(#20045,79,#20043,-1,"h")
 hasLocation(#20045,#20019)
-enclosingStmt(#20045,#20030)
+enclosing_stmt(#20045,#20030)
 exprContainers(#20045,#20001)
 literals("h","h",#20045)
 #20046=@"var;{h};{#20000}"
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
index 774aa5e4184..da69066ebb6 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
@@ -71,19 +71,19 @@ exprs(#20023,29,#20022,0,"/x/<2>(3)")
 #20024=@"loc,{#10000},1,1,1,9"
 locations_default(#20024,#10000,1,1,1,9)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,27,#20023,0,"/x/<2")
 #20026=@"loc,{#10000},1,1,1,5"
 locations_default(#20026,#10000,1,1,1,5)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,5,#20025,0,"/x/")
 hasLocation(#20027,#20005)
-enclosingStmt(#20027,#20022)
+enclosing_stmt(#20027,#20022)
 exprContainers(#20027,#20001)
 literals("/x/","/x/",#20027)
 #20028=*
@@ -95,7 +95,7 @@ regexpConstValue(#20028,"x")
 #20030=*
 exprs(#20030,3,#20025,1,"2")
 hasLocation(#20030,#20009)
-enclosingStmt(#20030,#20022)
+enclosing_stmt(#20030,#20022)
 exprContainers(#20030,#20001)
 literals("2","2",#20030)
 #20031=*
@@ -103,12 +103,12 @@ exprs(#20031,63,#20023,1,"(3)")
 #20032=@"loc,{#10000},1,7,1,9"
 locations_default(#20032,#10000,1,7,1,9)
 hasLocation(#20031,#20032)
-enclosingStmt(#20031,#20022)
+enclosing_stmt(#20031,#20022)
 exprContainers(#20031,#20001)
 #20033=*
 exprs(#20033,3,#20031,0,"3")
 hasLocation(#20033,#20015)
-enclosingStmt(#20033,#20022)
+enclosing_stmt(#20033,#20022)
 exprContainers(#20033,#20001)
 literals("3","3",#20033)
 #20034=*
diff --git a/javascript/extractor/tests/flow/output/trap/optParms.js.trap b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
index 186d5bd40a4..3cd64bb5d1d 100644
--- a/javascript/extractor/tests/flow/output/trap/optParms.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
@@ -164,12 +164,12 @@ exprs(#20060,64,#20059,0,"f = (x?) => {}")
 #20061=@"loc,{#10000},1,5,1,18"
 locations_default(#20061,#10000,1,5,1,18)
 hasLocation(#20060,#20061)
-enclosingStmt(#20060,#20059)
+enclosing_stmt(#20060,#20059)
 exprContainers(#20060,#20001)
 #20062=*
 exprs(#20062,78,#20060,0,"f")
 hasLocation(#20062,#20009)
-enclosingStmt(#20062,#20059)
+enclosing_stmt(#20062,#20059)
 exprContainers(#20062,#20001)
 literals("f","f",#20062)
 decl(#20062,#20057)
@@ -178,7 +178,7 @@ exprs(#20063,65,#20060,1,"(x?) => {}")
 #20064=@"loc,{#10000},1,9,1,18"
 locations_default(#20064,#10000,1,9,1,18)
 hasLocation(#20063,#20064)
-enclosingStmt(#20063,#20059)
+enclosing_stmt(#20063,#20059)
 exprContainers(#20063,#20001)
 #20065=*
 scopes(#20065,1)
@@ -207,12 +207,12 @@ exprs(#20071,64,#20070,0,"g = (x?, y) => {}")
 #20072=@"loc,{#10000},2,5,2,21"
 locations_default(#20072,#10000,2,5,2,21)
 hasLocation(#20071,#20072)
-enclosingStmt(#20071,#20070)
+enclosing_stmt(#20071,#20070)
 exprContainers(#20071,#20001)
 #20073=*
 exprs(#20073,78,#20071,0,"g")
 hasLocation(#20073,#20031)
-enclosingStmt(#20073,#20070)
+enclosing_stmt(#20073,#20070)
 exprContainers(#20073,#20001)
 literals("g","g",#20073)
 decl(#20073,#20058)
@@ -221,7 +221,7 @@ exprs(#20074,65,#20071,1,"(x?, y) => {}")
 #20075=@"loc,{#10000},2,9,2,21"
 locations_default(#20075,#10000,2,9,2,21)
 hasLocation(#20074,#20075)
-enclosingStmt(#20074,#20070)
+enclosing_stmt(#20074,#20070)
 exprContainers(#20074,#20001)
 #20076=*
 scopes(#20076,1)
diff --git a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
index 9a2b5cf69fb..607bb6e06b3 100644
--- a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
@@ -194,19 +194,19 @@ exprs(#20067,13,#20065,0,"g(42)")
 #20068=@"loc,{#10000},2,3,2,7"
 locations_default(#20068,#10000,2,3,2,7)
 hasLocation(#20067,#20068)
-enclosingStmt(#20067,#20065)
+enclosing_stmt(#20067,#20065)
 exprContainers(#20067,#20055)
 #20069=*
 exprs(#20069,79,#20067,-1,"g")
 hasLocation(#20069,#20041)
-enclosingStmt(#20069,#20065)
+enclosing_stmt(#20069,#20065)
 exprContainers(#20069,#20055)
 literals("g","g",#20069)
 bind(#20069,#20059)
 #20070=*
 exprs(#20070,3,#20067,0,"42")
 hasLocation(#20070,#20045)
-enclosingStmt(#20070,#20065)
+enclosing_stmt(#20070,#20065)
 exprContainers(#20070,#20055)
 literals("42","42",#20070)
 #20071=*
diff --git a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
index 64290b00293..508c340bf7c 100644
--- a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
@@ -570,33 +570,33 @@ exprs(#20222,18,#20221,0,"!(0<(jd|0)&0>(Wc|0))")
 #20223=@"loc,{#10000},1,4,1,23"
 locations_default(#20223,#10000,1,4,1,23)
 hasLocation(#20222,#20223)
-enclosingStmt(#20222,#20221)
+enclosing_stmt(#20222,#20221)
 exprContainers(#20222,#20001)
 #20224=*
 exprs(#20224,63,#20222,0,"(0<(jd|0)&0>(Wc|0))")
 #20225=@"loc,{#10000},1,5,1,23"
 locations_default(#20225,#10000,1,5,1,23)
 hasLocation(#20224,#20225)
-enclosingStmt(#20224,#20221)
+enclosing_stmt(#20224,#20221)
 exprContainers(#20224,#20001)
 #20226=*
 exprs(#20226,41,#20224,0,"0<(jd|0)&0>(Wc|0)")
 #20227=@"loc,{#10000},1,6,1,22"
 locations_default(#20227,#10000,1,6,1,22)
 hasLocation(#20226,#20227)
-enclosingStmt(#20226,#20221)
+enclosing_stmt(#20226,#20221)
 exprContainers(#20226,#20001)
 #20228=*
 exprs(#20228,27,#20226,0,"0<(jd|0)")
 #20229=@"loc,{#10000},1,6,1,13"
 locations_default(#20229,#10000,1,6,1,13)
 hasLocation(#20228,#20229)
-enclosingStmt(#20228,#20221)
+enclosing_stmt(#20228,#20221)
 exprContainers(#20228,#20001)
 #20230=*
 exprs(#20230,3,#20228,0,"0")
 hasLocation(#20230,#20017)
-enclosingStmt(#20230,#20221)
+enclosing_stmt(#20230,#20221)
 exprContainers(#20230,#20001)
 literals("0","0",#20230)
 #20231=*
@@ -604,19 +604,19 @@ exprs(#20231,63,#20228,1,"(jd|0)")
 #20232=@"loc,{#10000},1,8,1,13"
 locations_default(#20232,#10000,1,8,1,13)
 hasLocation(#20231,#20232)
-enclosingStmt(#20231,#20221)
+enclosing_stmt(#20231,#20221)
 exprContainers(#20231,#20001)
 #20233=*
 exprs(#20233,39,#20231,0,"jd|0")
 #20234=@"loc,{#10000},1,9,1,12"
 locations_default(#20234,#10000,1,9,1,12)
 hasLocation(#20233,#20234)
-enclosingStmt(#20233,#20221)
+enclosing_stmt(#20233,#20221)
 exprContainers(#20233,#20001)
 #20235=*
 exprs(#20235,79,#20233,0,"jd")
 hasLocation(#20235,#20023)
-enclosingStmt(#20235,#20221)
+enclosing_stmt(#20235,#20221)
 exprContainers(#20235,#20001)
 literals("jd","jd",#20235)
 #20236=@"var;{jd};{#20000}"
@@ -625,7 +625,7 @@ bind(#20235,#20236)
 #20237=*
 exprs(#20237,3,#20233,1,"0")
 hasLocation(#20237,#20027)
-enclosingStmt(#20237,#20221)
+enclosing_stmt(#20237,#20221)
 exprContainers(#20237,#20001)
 literals("0","0",#20237)
 #20238=*
@@ -633,12 +633,12 @@ exprs(#20238,29,#20226,1,"0>(Wc|0)")
 #20239=@"loc,{#10000},1,15,1,22"
 locations_default(#20239,#10000,1,15,1,22)
 hasLocation(#20238,#20239)
-enclosingStmt(#20238,#20221)
+enclosing_stmt(#20238,#20221)
 exprContainers(#20238,#20001)
 #20240=*
 exprs(#20240,3,#20238,0,"0")
 hasLocation(#20240,#20033)
-enclosingStmt(#20240,#20221)
+enclosing_stmt(#20240,#20221)
 exprContainers(#20240,#20001)
 literals("0","0",#20240)
 #20241=*
@@ -646,19 +646,19 @@ exprs(#20241,63,#20238,1,"(Wc|0)")
 #20242=@"loc,{#10000},1,17,1,22"
 locations_default(#20242,#10000,1,17,1,22)
 hasLocation(#20241,#20242)
-enclosingStmt(#20241,#20221)
+enclosing_stmt(#20241,#20221)
 exprContainers(#20241,#20001)
 #20243=*
 exprs(#20243,39,#20241,0,"Wc|0")
 #20244=@"loc,{#10000},1,18,1,21"
 locations_default(#20244,#10000,1,18,1,21)
 hasLocation(#20243,#20244)
-enclosingStmt(#20243,#20221)
+enclosing_stmt(#20243,#20221)
 exprContainers(#20243,#20001)
 #20245=*
 exprs(#20245,79,#20243,0,"Wc")
 hasLocation(#20245,#20039)
-enclosingStmt(#20245,#20221)
+enclosing_stmt(#20245,#20221)
 exprContainers(#20245,#20001)
 literals("Wc","Wc",#20245)
 #20246=@"var;{Wc};{#20000}"
@@ -667,7 +667,7 @@ bind(#20245,#20246)
 #20247=*
 exprs(#20247,3,#20243,1,"0")
 hasLocation(#20247,#20043)
-enclosingStmt(#20247,#20221)
+enclosing_stmt(#20247,#20221)
 exprContainers(#20247,#20001)
 literals("0","0",#20247)
 #20248=*
@@ -685,12 +685,12 @@ exprs(#20251,47,#20250,0,"g=(g|0) ... |0)?e:g")
 #20252=@"loc,{#10000},2,1,2,29"
 locations_default(#20252,#10000,2,1,2,29)
 hasLocation(#20251,#20252)
-enclosingStmt(#20251,#20250)
+enclosing_stmt(#20251,#20250)
 exprContainers(#20251,#20001)
 #20253=*
 exprs(#20253,79,#20251,0,"g")
 hasLocation(#20253,#20055)
-enclosingStmt(#20253,#20250)
+enclosing_stmt(#20253,#20250)
 exprContainers(#20253,#20001)
 literals("g","g",#20253)
 #20254=@"var;{g};{#20000}"
@@ -701,47 +701,47 @@ exprs(#20255,11,#20251,1,"(g|0)<( ... |0)?e:g")
 #20256=@"loc,{#10000},2,3,2,29"
 locations_default(#20256,#10000,2,3,2,29)
 hasLocation(#20255,#20256)
-enclosingStmt(#20255,#20250)
+enclosing_stmt(#20255,#20250)
 exprContainers(#20255,#20001)
 #20257=*
 exprs(#20257,39,#20255,0,"(g|0)<( ... )>(b|0)")
 #20258=@"loc,{#10000},2,3,2,25"
 locations_default(#20258,#10000,2,3,2,25)
 hasLocation(#20257,#20258)
-enclosingStmt(#20257,#20250)
+enclosing_stmt(#20257,#20250)
 exprContainers(#20257,#20001)
 #20259=*
 exprs(#20259,27,#20257,0,"(g|0)<(e|0)")
 #20260=@"loc,{#10000},2,3,2,13"
 locations_default(#20260,#10000,2,3,2,13)
 hasLocation(#20259,#20260)
-enclosingStmt(#20259,#20250)
+enclosing_stmt(#20259,#20250)
 exprContainers(#20259,#20001)
 #20261=*
 exprs(#20261,63,#20259,0,"(g|0)")
 #20262=@"loc,{#10000},2,3,2,7"
 locations_default(#20262,#10000,2,3,2,7)
 hasLocation(#20261,#20262)
-enclosingStmt(#20261,#20250)
+enclosing_stmt(#20261,#20250)
 exprContainers(#20261,#20001)
 #20263=*
 exprs(#20263,39,#20261,0,"g|0")
 #20264=@"loc,{#10000},2,4,2,6"
 locations_default(#20264,#10000,2,4,2,6)
 hasLocation(#20263,#20264)
-enclosingStmt(#20263,#20250)
+enclosing_stmt(#20263,#20250)
 exprContainers(#20263,#20001)
 #20265=*
 exprs(#20265,79,#20263,0,"g")
 hasLocation(#20265,#20061)
-enclosingStmt(#20265,#20250)
+enclosing_stmt(#20265,#20250)
 exprContainers(#20265,#20001)
 literals("g","g",#20265)
 bind(#20265,#20254)
 #20266=*
 exprs(#20266,3,#20263,1,"0")
 hasLocation(#20266,#20065)
-enclosingStmt(#20266,#20250)
+enclosing_stmt(#20266,#20250)
 exprContainers(#20266,#20001)
 literals("0","0",#20266)
 #20267=*
@@ -749,19 +749,19 @@ exprs(#20267,63,#20259,1,"(e|0)")
 #20268=@"loc,{#10000},2,9,2,13"
 locations_default(#20268,#10000,2,9,2,13)
 hasLocation(#20267,#20268)
-enclosingStmt(#20267,#20250)
+enclosing_stmt(#20267,#20250)
 exprContainers(#20267,#20001)
 #20269=*
 exprs(#20269,39,#20267,0,"e|0")
 #20270=@"loc,{#10000},2,10,2,12"
 locations_default(#20270,#10000,2,10,2,12)
 hasLocation(#20269,#20270)
-enclosingStmt(#20269,#20250)
+enclosing_stmt(#20269,#20250)
 exprContainers(#20269,#20001)
 #20271=*
 exprs(#20271,79,#20269,0,"e")
 hasLocation(#20271,#20073)
-enclosingStmt(#20271,#20250)
+enclosing_stmt(#20271,#20250)
 exprContainers(#20271,#20001)
 literals("e","e",#20271)
 #20272=@"var;{e};{#20000}"
@@ -770,7 +770,7 @@ bind(#20271,#20272)
 #20273=*
 exprs(#20273,3,#20269,1,"0")
 hasLocation(#20273,#20077)
-enclosingStmt(#20273,#20250)
+enclosing_stmt(#20273,#20250)
 exprContainers(#20273,#20001)
 literals("0","0",#20273)
 #20274=*
@@ -778,33 +778,33 @@ exprs(#20274,29,#20257,1,"(g|0)>(b|0)")
 #20275=@"loc,{#10000},2,15,2,25"
 locations_default(#20275,#10000,2,15,2,25)
 hasLocation(#20274,#20275)
-enclosingStmt(#20274,#20250)
+enclosing_stmt(#20274,#20250)
 exprContainers(#20274,#20001)
 #20276=*
 exprs(#20276,63,#20274,0,"(g|0)")
 #20277=@"loc,{#10000},2,15,2,19"
 locations_default(#20277,#10000,2,15,2,19)
 hasLocation(#20276,#20277)
-enclosingStmt(#20276,#20250)
+enclosing_stmt(#20276,#20250)
 exprContainers(#20276,#20001)
 #20278=*
 exprs(#20278,39,#20276,0,"g|0")
 #20279=@"loc,{#10000},2,16,2,18"
 locations_default(#20279,#10000,2,16,2,18)
 hasLocation(#20278,#20279)
-enclosingStmt(#20278,#20250)
+enclosing_stmt(#20278,#20250)
 exprContainers(#20278,#20001)
 #20280=*
 exprs(#20280,79,#20278,0,"g")
 hasLocation(#20280,#20085)
-enclosingStmt(#20280,#20250)
+enclosing_stmt(#20280,#20250)
 exprContainers(#20280,#20001)
 literals("g","g",#20280)
 bind(#20280,#20254)
 #20281=*
 exprs(#20281,3,#20278,1,"0")
 hasLocation(#20281,#20089)
-enclosingStmt(#20281,#20250)
+enclosing_stmt(#20281,#20250)
 exprContainers(#20281,#20001)
 literals("0","0",#20281)
 #20282=*
@@ -812,19 +812,19 @@ exprs(#20282,63,#20274,1,"(b|0)")
 #20283=@"loc,{#10000},2,21,2,25"
 locations_default(#20283,#10000,2,21,2,25)
 hasLocation(#20282,#20283)
-enclosingStmt(#20282,#20250)
+enclosing_stmt(#20282,#20250)
 exprContainers(#20282,#20001)
 #20284=*
 exprs(#20284,39,#20282,0,"b|0")
 #20285=@"loc,{#10000},2,22,2,24"
 locations_default(#20285,#10000,2,22,2,24)
 hasLocation(#20284,#20285)
-enclosingStmt(#20284,#20250)
+enclosing_stmt(#20284,#20250)
 exprContainers(#20284,#20001)
 #20286=*
 exprs(#20286,79,#20284,0,"b")
 hasLocation(#20286,#20097)
-enclosingStmt(#20286,#20250)
+enclosing_stmt(#20286,#20250)
 exprContainers(#20286,#20001)
 literals("b","b",#20286)
 #20287=@"var;{b};{#20000}"
@@ -833,20 +833,20 @@ bind(#20286,#20287)
 #20288=*
 exprs(#20288,3,#20284,1,"0")
 hasLocation(#20288,#20101)
-enclosingStmt(#20288,#20250)
+enclosing_stmt(#20288,#20250)
 exprContainers(#20288,#20001)
 literals("0","0",#20288)
 #20289=*
 exprs(#20289,79,#20255,1,"e")
 hasLocation(#20289,#20107)
-enclosingStmt(#20289,#20250)
+enclosing_stmt(#20289,#20250)
 exprContainers(#20289,#20001)
 literals("e","e",#20289)
 bind(#20289,#20272)
 #20290=*
 exprs(#20290,79,#20255,2,"g")
 hasLocation(#20290,#20111)
-enclosingStmt(#20290,#20250)
+enclosing_stmt(#20290,#20250)
 exprContainers(#20290,#20001)
 literals("g","g",#20290)
 bind(#20290,#20254)
@@ -859,47 +859,47 @@ exprs(#20292,39,#20291,0,"(I|0)<( ... )>(H|0)")
 #20293=@"loc,{#10000},3,4,3,50"
 locations_default(#20293,#10000,3,4,3,50)
 hasLocation(#20292,#20293)
-enclosingStmt(#20292,#20291)
+enclosing_stmt(#20292,#20291)
 exprContainers(#20292,#20001)
 #20294=*
 exprs(#20294,39,#20292,0,"(I|0)<( ... )<(F|0)")
 #20295=@"loc,{#10000},3,4,3,38"
 locations_default(#20295,#10000,3,4,3,38)
 hasLocation(#20294,#20295)
-enclosingStmt(#20294,#20291)
+enclosing_stmt(#20294,#20291)
 exprContainers(#20294,#20001)
 #20296=*
 exprs(#20296,39,#20294,0,"(I|0)<( ... )>(P|0)")
 #20297=@"loc,{#10000},3,4,3,26"
 locations_default(#20297,#10000,3,4,3,26)
 hasLocation(#20296,#20297)
-enclosingStmt(#20296,#20291)
+enclosing_stmt(#20296,#20291)
 exprContainers(#20296,#20001)
 #20298=*
 exprs(#20298,27,#20296,0,"(I|0)<(D|0)")
 #20299=@"loc,{#10000},3,4,3,14"
 locations_default(#20299,#10000,3,4,3,14)
 hasLocation(#20298,#20299)
-enclosingStmt(#20298,#20291)
+enclosing_stmt(#20298,#20291)
 exprContainers(#20298,#20001)
 #20300=*
 exprs(#20300,63,#20298,0,"(I|0)")
 #20301=@"loc,{#10000},3,4,3,8"
 locations_default(#20301,#10000,3,4,3,8)
 hasLocation(#20300,#20301)
-enclosingStmt(#20300,#20291)
+enclosing_stmt(#20300,#20291)
 exprContainers(#20300,#20001)
 #20302=*
 exprs(#20302,39,#20300,0,"I|0")
 #20303=@"loc,{#10000},3,5,3,7"
 locations_default(#20303,#10000,3,5,3,7)
 hasLocation(#20302,#20303)
-enclosingStmt(#20302,#20291)
+enclosing_stmt(#20302,#20291)
 exprContainers(#20302,#20001)
 #20304=*
 exprs(#20304,79,#20302,0,"I")
 hasLocation(#20304,#20121)
-enclosingStmt(#20304,#20291)
+enclosing_stmt(#20304,#20291)
 exprContainers(#20304,#20001)
 literals("I","I",#20304)
 #20305=@"var;{I};{#20000}"
@@ -908,7 +908,7 @@ bind(#20304,#20305)
 #20306=*
 exprs(#20306,3,#20302,1,"0")
 hasLocation(#20306,#20125)
-enclosingStmt(#20306,#20291)
+enclosing_stmt(#20306,#20291)
 exprContainers(#20306,#20001)
 literals("0","0",#20306)
 #20307=*
@@ -916,19 +916,19 @@ exprs(#20307,63,#20298,1,"(D|0)")
 #20308=@"loc,{#10000},3,10,3,14"
 locations_default(#20308,#10000,3,10,3,14)
 hasLocation(#20307,#20308)
-enclosingStmt(#20307,#20291)
+enclosing_stmt(#20307,#20291)
 exprContainers(#20307,#20001)
 #20309=*
 exprs(#20309,39,#20307,0,"D|0")
 #20310=@"loc,{#10000},3,11,3,13"
 locations_default(#20310,#10000,3,11,3,13)
 hasLocation(#20309,#20310)
-enclosingStmt(#20309,#20291)
+enclosing_stmt(#20309,#20291)
 exprContainers(#20309,#20001)
 #20311=*
 exprs(#20311,79,#20309,0,"D")
 hasLocation(#20311,#20133)
-enclosingStmt(#20311,#20291)
+enclosing_stmt(#20311,#20291)
 exprContainers(#20311,#20001)
 literals("D","D",#20311)
 #20312=@"var;{D};{#20000}"
@@ -937,7 +937,7 @@ bind(#20311,#20312)
 #20313=*
 exprs(#20313,3,#20309,1,"0")
 hasLocation(#20313,#20137)
-enclosingStmt(#20313,#20291)
+enclosing_stmt(#20313,#20291)
 exprContainers(#20313,#20001)
 literals("0","0",#20313)
 #20314=*
@@ -945,26 +945,26 @@ exprs(#20314,29,#20296,1,"(N|0)>(P|0)")
 #20315=@"loc,{#10000},3,16,3,26"
 locations_default(#20315,#10000,3,16,3,26)
 hasLocation(#20314,#20315)
-enclosingStmt(#20314,#20291)
+enclosing_stmt(#20314,#20291)
 exprContainers(#20314,#20001)
 #20316=*
 exprs(#20316,63,#20314,0,"(N|0)")
 #20317=@"loc,{#10000},3,16,3,20"
 locations_default(#20317,#10000,3,16,3,20)
 hasLocation(#20316,#20317)
-enclosingStmt(#20316,#20291)
+enclosing_stmt(#20316,#20291)
 exprContainers(#20316,#20001)
 #20318=*
 exprs(#20318,39,#20316,0,"N|0")
 #20319=@"loc,{#10000},3,17,3,19"
 locations_default(#20319,#10000,3,17,3,19)
 hasLocation(#20318,#20319)
-enclosingStmt(#20318,#20291)
+enclosing_stmt(#20318,#20291)
 exprContainers(#20318,#20001)
 #20320=*
 exprs(#20320,79,#20318,0,"N")
 hasLocation(#20320,#20145)
-enclosingStmt(#20320,#20291)
+enclosing_stmt(#20320,#20291)
 exprContainers(#20320,#20001)
 literals("N","N",#20320)
 #20321=@"var;{N};{#20000}"
@@ -973,7 +973,7 @@ bind(#20320,#20321)
 #20322=*
 exprs(#20322,3,#20318,1,"0")
 hasLocation(#20322,#20149)
-enclosingStmt(#20322,#20291)
+enclosing_stmt(#20322,#20291)
 exprContainers(#20322,#20001)
 literals("0","0",#20322)
 #20323=*
@@ -981,19 +981,19 @@ exprs(#20323,63,#20314,1,"(P|0)")
 #20324=@"loc,{#10000},3,22,3,26"
 locations_default(#20324,#10000,3,22,3,26)
 hasLocation(#20323,#20324)
-enclosingStmt(#20323,#20291)
+enclosing_stmt(#20323,#20291)
 exprContainers(#20323,#20001)
 #20325=*
 exprs(#20325,39,#20323,0,"P|0")
 #20326=@"loc,{#10000},3,23,3,25"
 locations_default(#20326,#10000,3,23,3,25)
 hasLocation(#20325,#20326)
-enclosingStmt(#20325,#20291)
+enclosing_stmt(#20325,#20291)
 exprContainers(#20325,#20001)
 #20327=*
 exprs(#20327,79,#20325,0,"P")
 hasLocation(#20327,#20157)
-enclosingStmt(#20327,#20291)
+enclosing_stmt(#20327,#20291)
 exprContainers(#20327,#20001)
 literals("P","P",#20327)
 #20328=@"var;{P};{#20000}"
@@ -1002,7 +1002,7 @@ bind(#20327,#20328)
 #20329=*
 exprs(#20329,3,#20325,1,"0")
 hasLocation(#20329,#20161)
-enclosingStmt(#20329,#20291)
+enclosing_stmt(#20329,#20291)
 exprContainers(#20329,#20001)
 literals("0","0",#20329)
 #20330=*
@@ -1010,26 +1010,26 @@ exprs(#20330,27,#20294,1,"(M|0)<(F|0)")
 #20331=@"loc,{#10000},3,28,3,38"
 locations_default(#20331,#10000,3,28,3,38)
 hasLocation(#20330,#20331)
-enclosingStmt(#20330,#20291)
+enclosing_stmt(#20330,#20291)
 exprContainers(#20330,#20001)
 #20332=*
 exprs(#20332,63,#20330,0,"(M|0)")
 #20333=@"loc,{#10000},3,28,3,32"
 locations_default(#20333,#10000,3,28,3,32)
 hasLocation(#20332,#20333)
-enclosingStmt(#20332,#20291)
+enclosing_stmt(#20332,#20291)
 exprContainers(#20332,#20001)
 #20334=*
 exprs(#20334,39,#20332,0,"M|0")
 #20335=@"loc,{#10000},3,29,3,31"
 locations_default(#20335,#10000,3,29,3,31)
 hasLocation(#20334,#20335)
-enclosingStmt(#20334,#20291)
+enclosing_stmt(#20334,#20291)
 exprContainers(#20334,#20001)
 #20336=*
 exprs(#20336,79,#20334,0,"M")
 hasLocation(#20336,#20169)
-enclosingStmt(#20336,#20291)
+enclosing_stmt(#20336,#20291)
 exprContainers(#20336,#20001)
 literals("M","M",#20336)
 #20337=@"var;{M};{#20000}"
@@ -1038,7 +1038,7 @@ bind(#20336,#20337)
 #20338=*
 exprs(#20338,3,#20334,1,"0")
 hasLocation(#20338,#20173)
-enclosingStmt(#20338,#20291)
+enclosing_stmt(#20338,#20291)
 exprContainers(#20338,#20001)
 literals("0","0",#20338)
 #20339=*
@@ -1046,19 +1046,19 @@ exprs(#20339,63,#20330,1,"(F|0)")
 #20340=@"loc,{#10000},3,34,3,38"
 locations_default(#20340,#10000,3,34,3,38)
 hasLocation(#20339,#20340)
-enclosingStmt(#20339,#20291)
+enclosing_stmt(#20339,#20291)
 exprContainers(#20339,#20001)
 #20341=*
 exprs(#20341,39,#20339,0,"F|0")
 #20342=@"loc,{#10000},3,35,3,37"
 locations_default(#20342,#10000,3,35,3,37)
 hasLocation(#20341,#20342)
-enclosingStmt(#20341,#20291)
+enclosing_stmt(#20341,#20291)
 exprContainers(#20341,#20001)
 #20343=*
 exprs(#20343,79,#20341,0,"F")
 hasLocation(#20343,#20181)
-enclosingStmt(#20343,#20291)
+enclosing_stmt(#20343,#20291)
 exprContainers(#20343,#20001)
 literals("F","F",#20343)
 #20344=@"var;{F};{#20000}"
@@ -1067,7 +1067,7 @@ bind(#20343,#20344)
 #20345=*
 exprs(#20345,3,#20341,1,"0")
 hasLocation(#20345,#20185)
-enclosingStmt(#20345,#20291)
+enclosing_stmt(#20345,#20291)
 exprContainers(#20345,#20001)
 literals("0","0",#20345)
 #20346=*
@@ -1075,26 +1075,26 @@ exprs(#20346,29,#20292,1,"(L|0)>(H|0)")
 #20347=@"loc,{#10000},3,40,3,50"
 locations_default(#20347,#10000,3,40,3,50)
 hasLocation(#20346,#20347)
-enclosingStmt(#20346,#20291)
+enclosing_stmt(#20346,#20291)
 exprContainers(#20346,#20001)
 #20348=*
 exprs(#20348,63,#20346,0,"(L|0)")
 #20349=@"loc,{#10000},3,40,3,44"
 locations_default(#20349,#10000,3,40,3,44)
 hasLocation(#20348,#20349)
-enclosingStmt(#20348,#20291)
+enclosing_stmt(#20348,#20291)
 exprContainers(#20348,#20001)
 #20350=*
 exprs(#20350,39,#20348,0,"L|0")
 #20351=@"loc,{#10000},3,41,3,43"
 locations_default(#20351,#10000,3,41,3,43)
 hasLocation(#20350,#20351)
-enclosingStmt(#20350,#20291)
+enclosing_stmt(#20350,#20291)
 exprContainers(#20350,#20001)
 #20352=*
 exprs(#20352,79,#20350,0,"L")
 hasLocation(#20352,#20193)
-enclosingStmt(#20352,#20291)
+enclosing_stmt(#20352,#20291)
 exprContainers(#20352,#20001)
 literals("L","L",#20352)
 #20353=@"var;{L};{#20000}"
@@ -1103,7 +1103,7 @@ bind(#20352,#20353)
 #20354=*
 exprs(#20354,3,#20350,1,"0")
 hasLocation(#20354,#20197)
-enclosingStmt(#20354,#20291)
+enclosing_stmt(#20354,#20291)
 exprContainers(#20354,#20001)
 literals("0","0",#20354)
 #20355=*
@@ -1111,19 +1111,19 @@ exprs(#20355,63,#20346,1,"(H|0)")
 #20356=@"loc,{#10000},3,46,3,50"
 locations_default(#20356,#10000,3,46,3,50)
 hasLocation(#20355,#20356)
-enclosingStmt(#20355,#20291)
+enclosing_stmt(#20355,#20291)
 exprContainers(#20355,#20001)
 #20357=*
 exprs(#20357,39,#20355,0,"H|0")
 #20358=@"loc,{#10000},3,47,3,49"
 locations_default(#20358,#10000,3,47,3,49)
 hasLocation(#20357,#20358)
-enclosingStmt(#20357,#20291)
+enclosing_stmt(#20357,#20291)
 exprContainers(#20357,#20001)
 #20359=*
 exprs(#20359,79,#20357,0,"H")
 hasLocation(#20359,#20205)
-enclosingStmt(#20359,#20291)
+enclosing_stmt(#20359,#20291)
 exprContainers(#20359,#20001)
 literals("H","H",#20359)
 #20360=@"var;{H};{#20000}"
@@ -1132,7 +1132,7 @@ bind(#20359,#20360)
 #20361=*
 exprs(#20361,3,#20357,1,"0")
 hasLocation(#20361,#20209)
-enclosingStmt(#20361,#20291)
+enclosing_stmt(#20361,#20291)
 exprContainers(#20361,#20001)
 literals("0","0",#20361)
 #20362=*
diff --git a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
index 133f8537298..938e197d850 100644
--- a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
@@ -352,7 +352,7 @@ stmt_containers(#20126,#20117)
 #20128=*
 exprs(#20128,79,#20126,0,"a")
 hasLocation(#20128,#20043)
-enclosingStmt(#20128,#20126)
+enclosing_stmt(#20128,#20126)
 exprContainers(#20128,#20117)
 literals("a","a",#20128)
 bind(#20128,#20121)
@@ -396,7 +396,7 @@ stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,79,#20138,0,"b")
 hasLocation(#20140,#20070)
-enclosingStmt(#20140,#20138)
+enclosing_stmt(#20140,#20138)
 exprContainers(#20140,#20001)
 literals("b","b",#20140)
 #20141=@"var;{b};{#20000}"
@@ -411,7 +411,7 @@ exprs(#20143,65,#20142,0,"(c): bo ... ks => c")
 #20144=@"loc,{#10000},8,1,8,25"
 locations_default(#20144,#10000,8,1,8,25)
 hasLocation(#20143,#20144)
-enclosingStmt(#20143,#20142)
+enclosing_stmt(#20143,#20142)
 exprContainers(#20143,#20001)
 #20145=*
 scopes(#20145,1)
@@ -440,7 +440,7 @@ exprs(#20150,65,#20149,0,"(d): %checks => d")
 #20151=@"loc,{#10000},9,1,9,17"
 locations_default(#20151,#10000,9,1,9,17)
 hasLocation(#20150,#20151)
-enclosingStmt(#20150,#20149)
+enclosing_stmt(#20150,#20149)
 exprContainers(#20150,#20001)
 #20152=*
 scopes(#20152,1)
diff --git a/javascript/extractor/tests/flow/output/trap/tst.js.trap b/javascript/extractor/tests/flow/output/trap/tst.js.trap
index d0a38423f4a..f8c81ad36b7 100644
--- a/javascript/extractor/tests/flow/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/tst.js.trap
@@ -527,7 +527,7 @@ stmt_containers(#20193,#20001)
 #20195=*
 exprs(#20195,78,#20193,0,"A")
 hasLocation(#20195,#20072)
-enclosingStmt(#20195,#20193)
+enclosing_stmt(#20195,#20193)
 exprContainers(#20195,#20001)
 literals("A","A",#20195)
 decl(#20195,#20191)
@@ -555,7 +555,7 @@ hasLocation(#20201,#20202)
 #20203=*
 exprs(#20203,0,#20201,0,"m")
 hasLocation(#20203,#20090)
-enclosingStmt(#20203,#20193)
+enclosing_stmt(#20203,#20193)
 exprContainers(#20203,#20001)
 literals("m","m",#20203)
 #20204=*
@@ -563,7 +563,7 @@ exprs(#20204,9,#20201,1,"() : Point {}")
 #20205=@"loc,{#10000},8,4,8,16"
 locations_default(#20205,#10000,8,4,8,16)
 hasLocation(#20204,#20205)
-enclosingStmt(#20204,#20193)
+enclosing_stmt(#20204,#20193)
 exprContainers(#20204,#20001)
 #20206=*
 scopes(#20206,1)
@@ -587,12 +587,12 @@ hasLocation(#20210,#20211)
 #20212=*
 exprs(#20212,0,#20210,0,"constructor")
 hasLocation(#20212,#20211)
-enclosingStmt(#20212,#20193)
+enclosing_stmt(#20212,#20193)
 exprContainers(#20212,#20001)
 literals("constructor","constructor",#20212)
 exprs(#20199,9,#20210,1,"() {}")
 hasLocation(#20199,#20211)
-enclosingStmt(#20199,#20193)
+enclosing_stmt(#20199,#20193)
 exprContainers(#20199,#20001)
 #20213=*
 scopes(#20213,1)
@@ -640,7 +640,7 @@ stmt_containers(#20223,#20216)
 #20225=*
 exprs(#20225,79,#20223,-1,"x")
 hasLocation(#20225,#20119)
-enclosingStmt(#20225,#20223)
+enclosing_stmt(#20225,#20223)
 exprContainers(#20225,#20216)
 literals("x","x",#20225)
 #20226=@"var;{x};{#20000}"
@@ -657,12 +657,12 @@ exprs(#20229,63,#20227,-1,"(42)")
 #20230=@"loc,{#10000},13,8,13,11"
 locations_default(#20230,#10000,13,8,13,11)
 hasLocation(#20229,#20230)
-enclosingStmt(#20229,#20227)
+enclosing_stmt(#20229,#20227)
 exprContainers(#20229,#20216)
 #20231=*
 exprs(#20231,3,#20229,0,"42")
 hasLocation(#20231,#20129)
-enclosingStmt(#20231,#20227)
+enclosing_stmt(#20231,#20227)
 exprContainers(#20231,#20216)
 literals("42","42",#20231)
 #20232=*
diff --git a/javascript/extractor/tests/flow/output/trap/variance.js.trap b/javascript/extractor/tests/flow/output/trap/variance.js.trap
index f277b7863a2..0fa9b6c6708 100644
--- a/javascript/extractor/tests/flow/output/trap/variance.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/variance.js.trap
@@ -179,7 +179,7 @@ stmt_containers(#20061,#20001)
 #20063=*
 exprs(#20063,78,#20061,0,"Foo")
 hasLocation(#20063,#20043)
-enclosingStmt(#20063,#20061)
+enclosing_stmt(#20063,#20061)
 exprContainers(#20063,#20001)
 literals("Foo","Foo",#20063)
 decl(#20063,#20059)
@@ -207,12 +207,12 @@ hasLocation(#20069,#20070)
 #20071=*
 exprs(#20071,0,#20069,0,"constructor")
 hasLocation(#20071,#20070)
-enclosingStmt(#20071,#20061)
+enclosing_stmt(#20071,#20061)
 exprContainers(#20071,#20001)
 literals("constructor","constructor",#20071)
 exprs(#20067,9,#20069,1,"() {}")
 hasLocation(#20067,#20070)
-enclosingStmt(#20067,#20061)
+enclosing_stmt(#20067,#20061)
 exprContainers(#20067,#20001)
 #20072=*
 scopes(#20072,1)
diff --git a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
index bdffdd0d444..bb3f55e04fc 100644
--- a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
@@ -246,26 +246,26 @@ exprs(#20092,13,#20091,0,"process ... le.log)")
 #20093=@"loc,{#10000},1,1,1,31"
 locations_default(#20093,#10000,1,1,1,31)
 hasLocation(#20092,#20093)
-enclosingStmt(#20092,#20091)
+enclosing_stmt(#20092,#20091)
 exprContainers(#20092,#20001)
 #20094=*
 exprs(#20094,14,#20092,-1,"process.argv.map")
 #20095=@"loc,{#10000},1,1,1,16"
 locations_default(#20095,#10000,1,1,1,16)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20091)
+enclosing_stmt(#20094,#20091)
 exprContainers(#20094,#20001)
 #20096=*
 exprs(#20096,14,#20094,0,"process.argv")
 #20097=@"loc,{#10000},1,1,1,12"
 locations_default(#20097,#10000,1,1,1,12)
 hasLocation(#20096,#20097)
-enclosingStmt(#20096,#20091)
+enclosing_stmt(#20096,#20091)
 exprContainers(#20096,#20001)
 #20098=*
 exprs(#20098,79,#20096,0,"process")
 hasLocation(#20098,#20013)
-enclosingStmt(#20098,#20091)
+enclosing_stmt(#20098,#20091)
 exprContainers(#20098,#20001)
 literals("process","process",#20098)
 #20099=@"var;{process};{#20000}"
@@ -274,13 +274,13 @@ bind(#20098,#20099)
 #20100=*
 exprs(#20100,0,#20096,1,"argv")
 hasLocation(#20100,#20017)
-enclosingStmt(#20100,#20091)
+enclosing_stmt(#20100,#20091)
 exprContainers(#20100,#20001)
 literals("argv","argv",#20100)
 #20101=*
 exprs(#20101,0,#20094,1,"map")
 hasLocation(#20101,#20021)
-enclosingStmt(#20101,#20091)
+enclosing_stmt(#20101,#20091)
 exprContainers(#20101,#20001)
 literals("map","map",#20101)
 #20102=*
@@ -288,19 +288,19 @@ exprs(#20102,97,#20092,0,"::console.log")
 #20103=@"loc,{#10000},1,18,1,30"
 locations_default(#20103,#10000,1,18,1,30)
 hasLocation(#20102,#20103)
-enclosingStmt(#20102,#20091)
+enclosing_stmt(#20102,#20091)
 exprContainers(#20102,#20001)
 #20104=*
 exprs(#20104,14,#20102,1,"console.log")
 #20105=@"loc,{#10000},1,20,1,30"
 locations_default(#20105,#10000,1,20,1,30)
 hasLocation(#20104,#20105)
-enclosingStmt(#20104,#20091)
+enclosing_stmt(#20104,#20091)
 exprContainers(#20104,#20001)
 #20106=*
 exprs(#20106,79,#20104,0,"console")
 hasLocation(#20106,#20027)
-enclosingStmt(#20106,#20091)
+enclosing_stmt(#20106,#20091)
 exprContainers(#20106,#20001)
 literals("console","console",#20106)
 #20107=@"var;{console};{#20000}"
@@ -309,7 +309,7 @@ bind(#20106,#20107)
 #20108=*
 exprs(#20108,0,#20104,1,"log")
 hasLocation(#20108,#20031)
-enclosingStmt(#20108,#20091)
+enclosing_stmt(#20108,#20091)
 exprContainers(#20108,#20001)
 literals("log","log",#20108)
 #20109=*
@@ -321,12 +321,12 @@ exprs(#20110,64,#20109,0,"hasOwnP ... roperty")
 #20111=@"loc,{#10000},3,5,3,48"
 locations_default(#20111,#10000,3,5,3,48)
 hasLocation(#20110,#20111)
-enclosingStmt(#20110,#20109)
+enclosing_stmt(#20110,#20109)
 exprContainers(#20110,#20001)
 #20112=*
 exprs(#20112,78,#20110,0,"hasOwnProp")
 hasLocation(#20112,#20039)
-enclosingStmt(#20112,#20109)
+enclosing_stmt(#20112,#20109)
 exprContainers(#20112,#20001)
 literals("hasOwnProp","hasOwnProp",#20112)
 decl(#20112,#20089)
@@ -335,19 +335,19 @@ exprs(#20113,14,#20110,1,"Object. ... roperty")
 #20114=@"loc,{#10000},3,18,3,48"
 locations_default(#20114,#10000,3,18,3,48)
 hasLocation(#20113,#20114)
-enclosingStmt(#20113,#20109)
+enclosing_stmt(#20113,#20109)
 exprContainers(#20113,#20001)
 #20115=*
 exprs(#20115,14,#20113,0,"Object.prototype")
 #20116=@"loc,{#10000},3,18,3,33"
 locations_default(#20116,#10000,3,18,3,33)
 hasLocation(#20115,#20116)
-enclosingStmt(#20115,#20109)
+enclosing_stmt(#20115,#20109)
 exprContainers(#20115,#20001)
 #20117=*
 exprs(#20117,79,#20115,0,"Object")
 hasLocation(#20117,#20043)
-enclosingStmt(#20117,#20109)
+enclosing_stmt(#20117,#20109)
 exprContainers(#20117,#20001)
 literals("Object","Object",#20117)
 #20118=@"var;{Object};{#20000}"
@@ -356,13 +356,13 @@ bind(#20117,#20118)
 #20119=*
 exprs(#20119,0,#20115,1,"prototype")
 hasLocation(#20119,#20047)
-enclosingStmt(#20119,#20109)
+enclosing_stmt(#20119,#20109)
 exprContainers(#20119,#20001)
 literals("prototype","prototype",#20119)
 #20120=*
 exprs(#20120,0,#20113,1,"hasOwnProperty")
 hasLocation(#20120,#20051)
-enclosingStmt(#20120,#20109)
+enclosing_stmt(#20120,#20109)
 exprContainers(#20120,#20001)
 literals("hasOwnProperty","hasOwnProperty",#20120)
 #20121=*
@@ -374,12 +374,12 @@ exprs(#20122,64,#20121,0,"obj = { x: 100 }")
 #20123=@"loc,{#10000},4,5,4,20"
 locations_default(#20123,#10000,4,5,4,20)
 hasLocation(#20122,#20123)
-enclosingStmt(#20122,#20121)
+enclosing_stmt(#20122,#20121)
 exprContainers(#20122,#20001)
 #20124=*
 exprs(#20124,78,#20122,0,"obj")
 hasLocation(#20124,#20057)
-enclosingStmt(#20124,#20121)
+enclosing_stmt(#20124,#20121)
 exprContainers(#20124,#20001)
 literals("obj","obj",#20124)
 decl(#20124,#20090)
@@ -388,7 +388,7 @@ exprs(#20125,8,#20122,1,"{ x: 100 }")
 #20126=@"loc,{#10000},4,11,4,20"
 locations_default(#20126,#10000,4,11,4,20)
 hasLocation(#20125,#20126)
-enclosingStmt(#20125,#20121)
+enclosing_stmt(#20125,#20121)
 exprContainers(#20125,#20001)
 #20127=*
 properties(#20127,#20125,0,0,"x: 100")
@@ -398,13 +398,13 @@ hasLocation(#20127,#20128)
 #20129=*
 exprs(#20129,0,#20127,0,"x")
 hasLocation(#20129,#20063)
-enclosingStmt(#20129,#20121)
+enclosing_stmt(#20129,#20121)
 exprContainers(#20129,#20001)
 literals("x","x",#20129)
 #20130=*
 exprs(#20130,3,#20127,1,"100")
 hasLocation(#20130,#20067)
-enclosingStmt(#20130,#20121)
+enclosing_stmt(#20130,#20121)
 exprContainers(#20130,#20001)
 literals("100","100",#20130)
 #20131=*
@@ -416,33 +416,33 @@ exprs(#20132,13,#20131,0,"obj::hasOwnProp(""x"")")
 #20133=@"loc,{#10000},5,1,5,20"
 locations_default(#20133,#10000,5,1,5,20)
 hasLocation(#20132,#20133)
-enclosingStmt(#20132,#20131)
+enclosing_stmt(#20132,#20131)
 exprContainers(#20132,#20001)
 #20134=*
 exprs(#20134,97,#20132,-1,"obj::hasOwnProp")
 #20135=@"loc,{#10000},5,1,5,15"
 locations_default(#20135,#10000,5,1,5,15)
 hasLocation(#20134,#20135)
-enclosingStmt(#20134,#20131)
+enclosing_stmt(#20134,#20131)
 exprContainers(#20134,#20001)
 #20136=*
 exprs(#20136,79,#20134,0,"obj")
 hasLocation(#20136,#20073)
-enclosingStmt(#20136,#20131)
+enclosing_stmt(#20136,#20131)
 exprContainers(#20136,#20001)
 literals("obj","obj",#20136)
 bind(#20136,#20090)
 #20137=*
 exprs(#20137,79,#20134,1,"hasOwnProp")
 hasLocation(#20137,#20077)
-enclosingStmt(#20137,#20131)
+enclosing_stmt(#20137,#20131)
 exprContainers(#20137,#20001)
 literals("hasOwnProp","hasOwnProp",#20137)
 bind(#20137,#20089)
 #20138=*
 exprs(#20138,4,#20132,0,"""x""")
 hasLocation(#20138,#20081)
-enclosingStmt(#20138,#20131)
+enclosing_stmt(#20138,#20131)
 exprContainers(#20138,#20001)
 literals("x","""x""",#20138)
 #20139=*
diff --git a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
index 0c3d6ac75d6..e2e2e7db5db 100644
--- a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
+++ b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
@@ -56,12 +56,12 @@ exprs(#20017,13,#20016,0,"alert("" ... orld!"")")
 #20018=@"loc,{#10000},1,1,1,22"
 locations_default(#20018,#10000,1,1,1,22)
 hasLocation(#20017,#20018)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 #20019=*
 exprs(#20019,79,#20017,-1,"alert")
 hasLocation(#20019,#20005)
-enclosingStmt(#20019,#20016)
+enclosing_stmt(#20019,#20016)
 exprContainers(#20019,#20001)
 literals("alert","alert",#20019)
 #20020=@"var;{alert};{#20000}"
@@ -70,7 +70,7 @@ bind(#20019,#20020)
 #20021=*
 exprs(#20021,4,#20017,0,"""Hello, world!""")
 hasLocation(#20021,#20009)
-enclosingStmt(#20021,#20016)
+enclosing_stmt(#20021,#20016)
 exprContainers(#20021,#20001)
 literals("Hello, world!","""Hello, world!""",#20021)
 #20022=*
diff --git a/javascript/extractor/tests/html/output/trap/entities.html.trap b/javascript/extractor/tests/html/output/trap/entities.html.trap
index 8e177ae9aab..ed94f01b853 100644
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@@ -64,26 +64,26 @@ stmt_containers(#20020,#20001)
 #20021=*
 exprs(#20021,21,#20020,0,"void(alert(""Nope!""))")
 hasLocation(#20021,#20003)
-enclosingStmt(#20021,#20020)
+enclosing_stmt(#20021,#20020)
 exprContainers(#20021,#20001)
 #20022=*
 exprs(#20022,63,#20021,0,"(alert(""Nope!""))")
 #20023=@"loc,{#10000},6,33,6,48"
 locations_default(#20023,#10000,6,33,6,48)
 hasLocation(#20022,#20023)
-enclosingStmt(#20022,#20020)
+enclosing_stmt(#20022,#20020)
 exprContainers(#20022,#20001)
 #20024=*
 exprs(#20024,13,#20022,0,"alert(""Nope!"")")
 #20025=@"loc,{#10000},6,34,6,47"
 locations_default(#20025,#10000,6,34,6,47)
 hasLocation(#20024,#20025)
-enclosingStmt(#20024,#20020)
+enclosing_stmt(#20024,#20020)
 exprContainers(#20024,#20001)
 #20026=*
 exprs(#20026,79,#20024,-1,"alert")
 hasLocation(#20026,#20009)
-enclosingStmt(#20026,#20020)
+enclosing_stmt(#20026,#20020)
 exprContainers(#20026,#20001)
 literals("alert","alert",#20026)
 #20027=@"var;{alert};{#20000}"
@@ -92,7 +92,7 @@ bind(#20026,#20027)
 #20028=*
 exprs(#20028,4,#20024,0,"""Nope!""")
 hasLocation(#20028,#20013)
-enclosingStmt(#20028,#20020)
+enclosing_stmt(#20028,#20020)
 exprContainers(#20028,#20001)
 literals("Nope!","""Nope!""",#20028)
 #20029=*
diff --git a/javascript/extractor/tests/html/output/trap/module.html.trap b/javascript/extractor/tests/html/output/trap/module.html.trap
index 3ed620603ac..f43c3cb3f4c 100644
--- a/javascript/extractor/tests/html/output/trap/module.html.trap
+++ b/javascript/extractor/tests/html/output/trap/module.html.trap
@@ -123,7 +123,7 @@ stmt_containers(#20039,#20001)
 #20041=*
 exprs(#20041,4,#20039,-1,"'bar'")
 hasLocation(#20041,#20017)
-enclosingStmt(#20041,#20039)
+enclosing_stmt(#20041,#20039)
 exprContainers(#20041,#20001)
 literals("bar","'bar'",#20041)
 #20042=*
@@ -135,12 +135,12 @@ regexpConstValue(#20042,"bar")
 #20044=*
 exprs(#20044,84,#20039,0,"foo")
 hasLocation(#20044,#20013)
-enclosingStmt(#20044,#20039)
+enclosing_stmt(#20044,#20039)
 exprContainers(#20044,#20001)
 #20045=*
 exprs(#20045,78,#20044,1,"foo")
 hasLocation(#20045,#20013)
-enclosingStmt(#20045,#20039)
+enclosing_stmt(#20045,#20039)
 exprContainers(#20045,#20001)
 literals("foo","foo",#20045)
 decl(#20045,#20036)
@@ -157,26 +157,26 @@ exprs(#20048,13,#20046,0,"foo.baz()")
 #20049=@"loc,{#10000},6,13,6,21"
 locations_default(#20049,#10000,6,13,6,21)
 hasLocation(#20048,#20049)
-enclosingStmt(#20048,#20046)
+enclosing_stmt(#20048,#20046)
 exprContainers(#20048,#20001)
 #20050=*
 exprs(#20050,14,#20048,-1,"foo.baz")
 #20051=@"loc,{#10000},6,13,6,19"
 locations_default(#20051,#10000,6,13,6,19)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20046)
+enclosing_stmt(#20050,#20046)
 exprContainers(#20050,#20001)
 #20052=*
 exprs(#20052,79,#20050,0,"foo")
 hasLocation(#20052,#20021)
-enclosingStmt(#20052,#20046)
+enclosing_stmt(#20052,#20046)
 exprContainers(#20052,#20001)
 literals("foo","foo",#20052)
 bind(#20052,#20036)
 #20053=*
 exprs(#20053,0,#20050,1,"baz")
 hasLocation(#20053,#20025)
-enclosingStmt(#20053,#20046)
+enclosing_stmt(#20053,#20046)
 exprContainers(#20053,#20001)
 literals("baz","baz",#20053)
 #20054=*
diff --git a/javascript/extractor/tests/html/output/trap/tst.html.trap b/javascript/extractor/tests/html/output/trap/tst.html.trap
index c29c9f3ec55..3699016692b 100644
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@@ -73,12 +73,12 @@ exprs(#20023,13,#20021,0,"alert("" ... orld!"")")
 #20024=@"loc,{#10000},6,13,6,34"
 locations_default(#20024,#10000,6,13,6,34)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20021)
+enclosing_stmt(#20023,#20021)
 exprContainers(#20023,#20001)
 #20025=*
 exprs(#20025,79,#20023,-1,"alert")
 hasLocation(#20025,#20009)
-enclosingStmt(#20025,#20021)
+enclosing_stmt(#20025,#20021)
 exprContainers(#20025,#20001)
 literals("alert","alert",#20025)
 #20026=@"var;{alert};{#20000}"
@@ -87,7 +87,7 @@ bind(#20025,#20026)
 #20027=*
 exprs(#20027,4,#20023,0,"""Hello, world!""")
 hasLocation(#20027,#20013)
-enclosingStmt(#20027,#20021)
+enclosing_stmt(#20027,#20021)
 exprContainers(#20027,#20001)
 literals("Hello, world!","""Hello, world!""",#20027)
 #20028=*
@@ -194,33 +194,33 @@ stmt_containers(#20061,#20042)
 #20062=*
 exprs(#20062,21,#20061,0,"void(alert('Nope!'))")
 hasLocation(#20062,#20044)
-enclosingStmt(#20062,#20061)
+enclosing_stmt(#20062,#20061)
 exprContainers(#20062,#20042)
 #20063=*
 exprs(#20063,63,#20062,0,"(alert('Nope!'))")
 #20064=@"loc,{#10000},11,33,11,48"
 locations_default(#20064,#10000,11,33,11,48)
 hasLocation(#20063,#20064)
-enclosingStmt(#20063,#20061)
+enclosing_stmt(#20063,#20061)
 exprContainers(#20063,#20042)
 #20065=*
 exprs(#20065,13,#20063,0,"alert('Nope!')")
 #20066=@"loc,{#10000},11,34,11,47"
 locations_default(#20066,#10000,11,34,11,47)
 hasLocation(#20065,#20066)
-enclosingStmt(#20065,#20061)
+enclosing_stmt(#20065,#20061)
 exprContainers(#20065,#20042)
 #20067=*
 exprs(#20067,79,#20065,-1,"alert")
 hasLocation(#20067,#20050)
-enclosingStmt(#20067,#20061)
+enclosing_stmt(#20067,#20061)
 exprContainers(#20067,#20042)
 literals("alert","alert",#20067)
 bind(#20067,#20026)
 #20068=*
 exprs(#20068,4,#20065,0,"'Nope!'")
 hasLocation(#20068,#20054)
-enclosingStmt(#20068,#20061)
+enclosing_stmt(#20068,#20061)
 exprContainers(#20068,#20042)
 literals("Nope!","'Nope!'",#20068)
 #20069=*
@@ -285,19 +285,19 @@ stmt_containers(#20087,#20074)
 #20088=*
 exprs(#20088,13,#20087,0,"alert(' ... lick!')")
 hasLocation(#20088,#20076)
-enclosingStmt(#20088,#20087)
+enclosing_stmt(#20088,#20087)
 exprContainers(#20088,#20074)
 #20089=*
 exprs(#20089,79,#20088,-1,"alert")
 hasLocation(#20089,#20078)
-enclosingStmt(#20089,#20087)
+enclosing_stmt(#20089,#20087)
 exprContainers(#20089,#20074)
 literals("alert","alert",#20089)
 bind(#20089,#20026)
 #20090=*
 exprs(#20090,4,#20088,0,"'I said ... click!'")
 hasLocation(#20090,#20082)
-enclosingStmt(#20090,#20087)
+enclosing_stmt(#20090,#20087)
 exprContainers(#20090,#20074)
 literals("I said don't click!","'I said don\'t click!'",#20090)
 #20091=*
@@ -355,7 +355,7 @@ stmt_containers(#20107,#20096)
 #20108=*
 exprs(#20108,2,#20107,0,"false")
 hasLocation(#20108,#20102)
-enclosingStmt(#20108,#20107)
+enclosing_stmt(#20108,#20107)
 exprContainers(#20108,#20096)
 literals("false","false",#20108)
 #20109=*
diff --git a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
index d3c972a6a0a..2c40af4f645 100644
--- a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
@@ -62,7 +62,7 @@ stmt_containers(#20017,#20001)
 #20019=*
 exprs(#20019,3,#20017,0,"42")
 hasLocation(#20019,#20011)
-enclosingStmt(#20019,#20017)
+enclosing_stmt(#20019,#20017)
 exprContainers(#20019,#20001)
 literals("42","42",#20019)
 #20020=*
diff --git a/javascript/extractor/tests/html/output/trap/tst2.html.trap b/javascript/extractor/tests/html/output/trap/tst2.html.trap
index 1a251f89855..eea8280a495 100644
--- a/javascript/extractor/tests/html/output/trap/tst2.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst2.html.trap
@@ -46,12 +46,12 @@ stmt_containers(#20013,#20001)
 #20014=*
 exprs(#20014,64,#20013,0,"hello")
 hasLocation(#20014,#20007)
-enclosingStmt(#20014,#20013)
+enclosing_stmt(#20014,#20013)
 exprContainers(#20014,#20001)
 #20015=*
 exprs(#20015,78,#20014,0,"hello")
 hasLocation(#20015,#20007)
-enclosingStmt(#20015,#20013)
+enclosing_stmt(#20015,#20013)
 exprContainers(#20015,#20001)
 literals("hello","hello",#20015)
 decl(#20015,#20012)
@@ -105,12 +105,12 @@ stmt_containers(#20031,#20019)
 #20032=*
 exprs(#20032,64,#20031,0,"world")
 hasLocation(#20032,#20025)
-enclosingStmt(#20032,#20031)
+enclosing_stmt(#20032,#20031)
 exprContainers(#20032,#20019)
 #20033=*
 exprs(#20033,78,#20032,0,"world")
 hasLocation(#20033,#20025)
-enclosingStmt(#20033,#20031)
+enclosing_stmt(#20033,#20031)
 exprContainers(#20033,#20019)
 literals("world","world",#20033)
 decl(#20033,#20030)
@@ -187,12 +187,12 @@ stmt_containers(#20055,#20037)
 #20057=*
 exprs(#20057,64,#20055,0,"inAModule")
 hasLocation(#20057,#20047)
-enclosingStmt(#20057,#20055)
+enclosing_stmt(#20057,#20055)
 exprContainers(#20057,#20037)
 #20058=*
 exprs(#20058,78,#20057,0,"inAModule")
 hasLocation(#20058,#20047)
-enclosingStmt(#20058,#20055)
+enclosing_stmt(#20058,#20055)
 exprContainers(#20058,#20037)
 literals("inAModule","inAModule",#20058)
 decl(#20058,#20054)
@@ -279,7 +279,7 @@ stmt_containers(#20083,#20061)
 #20085=*
 exprs(#20085,4,#20083,-1,"""f""")
 hasLocation(#20085,#20075)
-enclosingStmt(#20085,#20083)
+enclosing_stmt(#20085,#20083)
 exprContainers(#20085,#20061)
 literals("f","""f""",#20085)
 #20086=*
@@ -291,12 +291,12 @@ regexpConstValue(#20086,"f")
 #20088=*
 exprs(#20088,84,#20083,0,"f")
 hasLocation(#20088,#20071)
-enclosingStmt(#20088,#20083)
+enclosing_stmt(#20088,#20083)
 exprContainers(#20088,#20061)
 #20089=*
 exprs(#20089,78,#20088,1,"f")
 hasLocation(#20089,#20071)
-enclosingStmt(#20089,#20083)
+enclosing_stmt(#20089,#20083)
 exprContainers(#20089,#20061)
 literals("f","f",#20089)
 decl(#20089,#20080)
diff --git a/javascript/extractor/tests/jscript/output/trap/tst.js.trap b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
index 07ee23956f0..0f50064913f 100644
--- a/javascript/extractor/tests/jscript/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
@@ -84,19 +84,19 @@ stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,47,#20028,0,"functio ... es) { }")
 hasLocation(#20029,#20003)
-enclosingStmt(#20029,#20028)
+enclosing_stmt(#20029,#20028)
 exprContainers(#20029,#20001)
 #20030=*
 exprs(#20030,14,#20029,0,"ISMTPOn ... Arrival")
 #20031=@"loc,{#10000},1,10,1,34"
 locations_default(#20031,#10000,1,10,1,34)
 hasLocation(#20030,#20031)
-enclosingStmt(#20030,#20028)
+enclosing_stmt(#20030,#20028)
 exprContainers(#20030,#20001)
 #20032=*
 exprs(#20032,79,#20030,0,"ISMTPOnArrival")
 hasLocation(#20032,#20007)
-enclosingStmt(#20032,#20028)
+enclosing_stmt(#20032,#20028)
 exprContainers(#20032,#20001)
 literals("ISMTPOnArrival","ISMTPOnArrival",#20032)
 #20033=@"var;{ISMTPOnArrival};{#20000}"
@@ -105,13 +105,13 @@ bind(#20032,#20033)
 #20034=*
 exprs(#20034,0,#20030,1,"OnArrival")
 hasLocation(#20034,#20011)
-enclosingStmt(#20034,#20028)
+enclosing_stmt(#20034,#20028)
 exprContainers(#20034,#20001)
 literals("OnArrival","OnArrival",#20034)
 #20035=*
 exprs(#20035,9,#20029,1,"functio ... es) { }")
 hasLocation(#20035,#20003)
-enclosingStmt(#20035,#20028)
+enclosing_stmt(#20035,#20028)
 exprContainers(#20035,#20001)
 #20036=*
 scopes(#20036,1)
diff --git a/javascript/extractor/tests/jsx/output/trap/tst.js.trap b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
index 3eded26c7d2..19939fe44a2 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
@@ -433,12 +433,12 @@ exprs(#20166,89,#20165,0,"<a/>")
 #20167=@"loc,{#10000},1,1,1,4"
 locations_default(#20167,#10000,1,1,1,4)
 hasLocation(#20166,#20167)
-enclosingStmt(#20166,#20165)
+enclosing_stmt(#20166,#20165)
 exprContainers(#20166,#20001)
 #20168=*
 exprs(#20168,0,#20166,-1,"a")
 hasLocation(#20168,#20015)
-enclosingStmt(#20168,#20165)
+enclosing_stmt(#20168,#20165)
 exprContainers(#20168,#20001)
 literals("a","a",#20168)
 #20169=*
@@ -450,25 +450,25 @@ exprs(#20170,89,#20169,0,"<b:c d:e/>")
 #20171=@"loc,{#10000},2,1,2,10"
 locations_default(#20171,#10000,2,1,2,10)
 hasLocation(#20170,#20171)
-enclosingStmt(#20170,#20169)
+enclosing_stmt(#20170,#20169)
 exprContainers(#20170,#20001)
 #20172=*
 exprs(#20172,90,#20170,-1,"b:c")
 #20173=@"loc,{#10000},2,2,2,4"
 locations_default(#20173,#10000,2,2,2,4)
 hasLocation(#20172,#20173)
-enclosingStmt(#20172,#20169)
+enclosing_stmt(#20172,#20169)
 exprContainers(#20172,#20001)
 #20174=*
 exprs(#20174,0,#20172,0,"b")
 hasLocation(#20174,#20025)
-enclosingStmt(#20174,#20169)
+enclosing_stmt(#20174,#20169)
 exprContainers(#20174,#20001)
 literals("b","b",#20174)
 #20175=*
 exprs(#20175,0,#20172,1,"c")
 hasLocation(#20175,#20029)
-enclosingStmt(#20175,#20169)
+enclosing_stmt(#20175,#20169)
 exprContainers(#20175,#20001)
 literals("c","c",#20175)
 #20176=*
@@ -479,18 +479,18 @@ hasLocation(#20176,#20177)
 #20178=*
 exprs(#20178,90,#20176,0,"d:e")
 hasLocation(#20178,#20177)
-enclosingStmt(#20178,#20169)
+enclosing_stmt(#20178,#20169)
 exprContainers(#20178,#20001)
 #20179=*
 exprs(#20179,0,#20178,0,"d")
 hasLocation(#20179,#20031)
-enclosingStmt(#20179,#20169)
+enclosing_stmt(#20179,#20169)
 exprContainers(#20179,#20001)
 literals("d","d",#20179)
 #20180=*
 exprs(#20180,0,#20178,1,"e")
 hasLocation(#20180,#20035)
-enclosingStmt(#20180,#20169)
+enclosing_stmt(#20180,#20169)
 exprContainers(#20180,#20001)
 literals("e","e",#20180)
 #20181=*
@@ -502,12 +502,12 @@ exprs(#20182,89,#20181,0,"<f g:h= ... .l></f>")
 #20183=@"loc,{#10000},3,1,3,51"
 locations_default(#20183,#10000,3,1,3,51)
 hasLocation(#20182,#20183)
-enclosingStmt(#20182,#20181)
+enclosing_stmt(#20182,#20181)
 exprContainers(#20182,#20001)
 #20184=*
 exprs(#20184,0,#20182,-1,"f")
 hasLocation(#20184,#20045)
-enclosingStmt(#20184,#20181)
+enclosing_stmt(#20184,#20181)
 exprContainers(#20184,#20001)
 literals("f","f",#20184)
 #20185=*
@@ -520,24 +520,24 @@ exprs(#20187,90,#20185,0,"g:h")
 #20188=@"loc,{#10000},3,4,3,6"
 locations_default(#20188,#10000,3,4,3,6)
 hasLocation(#20187,#20188)
-enclosingStmt(#20187,#20181)
+enclosing_stmt(#20187,#20181)
 exprContainers(#20187,#20001)
 #20189=*
 exprs(#20189,0,#20187,0,"g")
 hasLocation(#20189,#20047)
-enclosingStmt(#20189,#20181)
+enclosing_stmt(#20189,#20181)
 exprContainers(#20189,#20001)
 literals("g","g",#20189)
 #20190=*
 exprs(#20190,0,#20187,1,"h")
 hasLocation(#20190,#20051)
-enclosingStmt(#20190,#20181)
+enclosing_stmt(#20190,#20181)
 exprContainers(#20190,#20001)
 literals("h","h",#20190)
 #20191=*
 exprs(#20191,4,#20185,1,"""b&amp;r""")
 hasLocation(#20191,#20055)
-enclosingStmt(#20191,#20181)
+enclosing_stmt(#20191,#20181)
 exprContainers(#20191,#20001)
 literals("b&r","""b&amp;r""",#20191)
 #20192=*
@@ -554,7 +554,7 @@ hasLocation(#20194,#20195)
 #20196=*
 exprs(#20196,0,#20194,0,"i")
 hasLocation(#20196,#20057)
-enclosingStmt(#20196,#20181)
+enclosing_stmt(#20196,#20181)
 exprContainers(#20196,#20001)
 literals("i","i",#20196)
 #20197=*
@@ -562,12 +562,12 @@ exprs(#20197,34,#20194,1,"""a""+""b""")
 #20198=@"loc,{#10000},3,21,3,27"
 locations_default(#20198,#10000,3,21,3,27)
 hasLocation(#20197,#20198)
-enclosingStmt(#20197,#20181)
+enclosing_stmt(#20197,#20181)
 exprContainers(#20197,#20001)
 #20199=*
 exprs(#20199,4,#20197,0,"""a""")
 hasLocation(#20199,#20063)
-enclosingStmt(#20199,#20181)
+enclosing_stmt(#20199,#20181)
 exprContainers(#20199,#20001)
 literals("a","""a""",#20199)
 #20200=*
@@ -579,7 +579,7 @@ regexpConstValue(#20200,"a")
 #20202=*
 exprs(#20202,4,#20197,1,"""b""")
 hasLocation(#20202,#20067)
-enclosingStmt(#20202,#20181)
+enclosing_stmt(#20202,#20181)
 exprContainers(#20202,#20001)
 literals("b","""b""",#20202)
 #20203=*
@@ -591,7 +591,7 @@ regexpConstValue(#20203,"b")
 #20205=*
 exprs(#20205,79,#20182,-2,"j")
 hasLocation(#20205,#20075)
-enclosingStmt(#20205,#20181)
+enclosing_stmt(#20205,#20181)
 exprContainers(#20205,#20001)
 literals("j","j",#20205)
 #20206=@"var;{j};{#20000}"
@@ -602,19 +602,19 @@ exprs(#20207,89,#20182,-3,"<k.l><M/></k.l>")
 #20208=@"loc,{#10000},3,33,3,47"
 locations_default(#20208,#10000,3,33,3,47)
 hasLocation(#20207,#20208)
-enclosingStmt(#20207,#20181)
+enclosing_stmt(#20207,#20181)
 exprContainers(#20207,#20001)
 #20209=*
 exprs(#20209,14,#20207,-1,"k.l")
 #20210=@"loc,{#10000},3,34,3,36"
 locations_default(#20210,#10000,3,34,3,36)
 hasLocation(#20209,#20210)
-enclosingStmt(#20209,#20181)
+enclosing_stmt(#20209,#20181)
 exprContainers(#20209,#20001)
 #20211=*
 exprs(#20211,79,#20209,0,"k")
 hasLocation(#20211,#20081)
-enclosingStmt(#20211,#20181)
+enclosing_stmt(#20211,#20181)
 exprContainers(#20211,#20001)
 literals("k","k",#20211)
 #20212=@"var;{k};{#20000}"
@@ -623,7 +623,7 @@ bind(#20211,#20212)
 #20213=*
 exprs(#20213,0,#20209,1,"l")
 hasLocation(#20213,#20085)
-enclosingStmt(#20213,#20181)
+enclosing_stmt(#20213,#20181)
 exprContainers(#20213,#20001)
 literals("l","l",#20213)
 #20214=*
@@ -631,12 +631,12 @@ exprs(#20214,89,#20207,-2,"<M/>")
 #20215=@"loc,{#10000},3,38,3,41"
 locations_default(#20215,#10000,3,38,3,41)
 hasLocation(#20214,#20215)
-enclosingStmt(#20214,#20181)
+enclosing_stmt(#20214,#20181)
 exprContainers(#20214,#20001)
 #20216=*
 exprs(#20216,79,#20214,-1,"M")
 hasLocation(#20216,#20091)
-enclosingStmt(#20216,#20181)
+enclosing_stmt(#20216,#20181)
 exprContainers(#20216,#20001)
 literals("M","M",#20216)
 #20217=@"var;{M};{#20000}"
@@ -651,12 +651,12 @@ exprs(#20219,89,#20218,0,"<n {...props}/>")
 #20220=@"loc,{#10000},4,1,4,15"
 locations_default(#20220,#10000,4,1,4,15)
 hasLocation(#20219,#20220)
-enclosingStmt(#20219,#20218)
+enclosing_stmt(#20219,#20218)
 exprContainers(#20219,#20001)
 #20221=*
 exprs(#20221,0,#20219,-1,"n")
 hasLocation(#20221,#20121)
-enclosingStmt(#20221,#20218)
+enclosing_stmt(#20221,#20218)
 exprContainers(#20221,#20001)
 literals("n","n",#20221)
 #20222=*
@@ -667,12 +667,12 @@ hasLocation(#20222,#20223)
 #20224=*
 exprs(#20224,66,#20222,1,"...props")
 hasLocation(#20224,#20223)
-enclosingStmt(#20224,#20218)
+enclosing_stmt(#20224,#20218)
 exprContainers(#20224,#20001)
 #20225=*
 exprs(#20225,79,#20224,0,"props")
 hasLocation(#20225,#20127)
-enclosingStmt(#20225,#20218)
+enclosing_stmt(#20225,#20218)
 exprContainers(#20225,#20001)
 literals("props","props",#20225)
 #20226=@"var;{props};{#20000}"
@@ -685,19 +685,19 @@ stmt_containers(#20227,#20001)
 #20228=*
 exprs(#20228,89,#20227,0,"<><a/><b/></>")
 hasLocation(#20228,#20011)
-enclosingStmt(#20228,#20227)
+enclosing_stmt(#20228,#20227)
 exprContainers(#20228,#20001)
 #20229=*
 exprs(#20229,89,#20228,-2,"<a/>")
 #20230=@"loc,{#10000},5,3,5,6"
 locations_default(#20230,#10000,5,3,5,6)
 hasLocation(#20229,#20230)
-enclosingStmt(#20229,#20227)
+enclosing_stmt(#20229,#20227)
 exprContainers(#20229,#20001)
 #20231=*
 exprs(#20231,0,#20229,-1,"a")
 hasLocation(#20231,#20143)
-enclosingStmt(#20231,#20227)
+enclosing_stmt(#20231,#20227)
 exprContainers(#20231,#20001)
 literals("a","a",#20231)
 #20232=*
@@ -705,12 +705,12 @@ exprs(#20232,89,#20228,-3,"<b/>")
 #20233=@"loc,{#10000},5,7,5,10"
 locations_default(#20233,#10000,5,7,5,10)
 hasLocation(#20232,#20233)
-enclosingStmt(#20232,#20227)
+enclosing_stmt(#20232,#20227)
 exprContainers(#20232,#20001)
 #20234=*
 exprs(#20234,0,#20232,-1,"b")
 hasLocation(#20234,#20151)
-enclosingStmt(#20234,#20227)
+enclosing_stmt(#20234,#20227)
 exprContainers(#20234,#20001)
 literals("b","b",#20234)
 #20235=*
diff --git a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
index b78733bfc6b..3b53db742a7 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
@@ -69,18 +69,18 @@ stmt_containers(#20022,#20001)
 #20023=*
 exprs(#20023,89,#20022,0,"<a>/b&gt;</a>")
 hasLocation(#20023,#20003)
-enclosingStmt(#20023,#20022)
+enclosing_stmt(#20023,#20022)
 exprContainers(#20023,#20001)
 #20024=*
 exprs(#20024,0,#20023,-1,"a")
 hasLocation(#20024,#20007)
-enclosingStmt(#20024,#20022)
+enclosing_stmt(#20024,#20022)
 exprContainers(#20024,#20001)
 literals("a","a",#20024)
 #20025=*
 exprs(#20025,4,#20023,-2,"/b&gt;")
 hasLocation(#20025,#20011)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 literals("/b>","/b&gt;",#20025)
 #20026=*
diff --git a/javascript/extractor/tests/keywords/output/trap/tst.js.trap b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
index 8c5d98eb9d3..bbdcb01f5dd 100644
--- a/javascript/extractor/tests/keywords/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
@@ -146,12 +146,12 @@ exprs(#20052,27,#20048,1,"i < spe ... .length")
 #20053=@"loc,{#10000},1,17,1,38"
 locations_default(#20053,#10000,1,17,1,38)
 hasLocation(#20052,#20053)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20001)
 #20054=*
 exprs(#20054,79,#20052,0,"i")
 hasLocation(#20054,#20021)
-enclosingStmt(#20054,#20048)
+enclosing_stmt(#20054,#20048)
 exprContainers(#20054,#20001)
 literals("i","i",#20054)
 bind(#20054,#20051)
@@ -160,19 +160,19 @@ exprs(#20055,14,#20052,1,"spec.switch.length")
 #20056=@"loc,{#10000},1,21,1,38"
 locations_default(#20056,#10000,1,21,1,38)
 hasLocation(#20055,#20056)
-enclosingStmt(#20055,#20048)
+enclosing_stmt(#20055,#20048)
 exprContainers(#20055,#20001)
 #20057=*
 exprs(#20057,14,#20055,0,"spec.switch")
 #20058=@"loc,{#10000},1,21,1,31"
 locations_default(#20058,#10000,1,21,1,31)
 hasLocation(#20057,#20058)
-enclosingStmt(#20057,#20048)
+enclosing_stmt(#20057,#20048)
 exprContainers(#20057,#20001)
 #20059=*
 exprs(#20059,79,#20057,0,"spec")
 hasLocation(#20059,#20025)
-enclosingStmt(#20059,#20048)
+enclosing_stmt(#20059,#20048)
 exprContainers(#20059,#20001)
 literals("spec","spec",#20059)
 #20060=@"var;{spec};{#20000}"
@@ -181,13 +181,13 @@ bind(#20059,#20060)
 #20061=*
 exprs(#20061,0,#20057,1,"switch")
 hasLocation(#20061,#20029)
-enclosingStmt(#20061,#20048)
+enclosing_stmt(#20061,#20048)
 exprContainers(#20061,#20001)
 literals("switch","switch",#20061)
 #20062=*
 exprs(#20062,0,#20055,1,"length")
 hasLocation(#20062,#20033)
-enclosingStmt(#20062,#20048)
+enclosing_stmt(#20062,#20048)
 exprContainers(#20062,#20001)
 literals("length","length",#20062)
 #20063=*
@@ -195,12 +195,12 @@ exprs(#20063,60,#20048,2,"i++")
 #20064=@"loc,{#10000},1,41,1,43"
 locations_default(#20064,#10000,1,41,1,43)
 hasLocation(#20063,#20064)
-enclosingStmt(#20063,#20048)
+enclosing_stmt(#20063,#20048)
 exprContainers(#20063,#20001)
 #20065=*
 exprs(#20065,79,#20063,0,"i")
 hasLocation(#20065,#20037)
-enclosingStmt(#20065,#20048)
+enclosing_stmt(#20065,#20048)
 exprContainers(#20065,#20001)
 literals("i","i",#20065)
 bind(#20065,#20051)
@@ -215,19 +215,19 @@ exprs(#20068,64,#20066,0,"i = 0")
 #20069=@"loc,{#10000},1,10,1,14"
 locations_default(#20069,#10000,1,10,1,14)
 hasLocation(#20068,#20069)
-enclosingStmt(#20068,#20066)
+enclosing_stmt(#20068,#20066)
 exprContainers(#20068,#20001)
 #20070=*
 exprs(#20070,78,#20068,0,"i")
 hasLocation(#20070,#20013)
-enclosingStmt(#20070,#20066)
+enclosing_stmt(#20070,#20066)
 exprContainers(#20070,#20001)
 literals("i","i",#20070)
 decl(#20070,#20051)
 #20071=*
 exprs(#20071,3,#20068,1,"0")
 hasLocation(#20071,#20017)
-enclosingStmt(#20071,#20066)
+enclosing_stmt(#20071,#20066)
 exprContainers(#20071,#20001)
 literals("0","0",#20071)
 #20072=*
diff --git a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
index c3a5626e985..9be5040c0f9 100644
--- a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
@@ -413,14 +413,14 @@ exprs(#20158,73,#20157,0,"[for (y ... ) year]")
 #20159=@"loc,{#10000},1,1,1,43"
 locations_default(#20159,#10000,1,1,1,43)
 hasLocation(#20158,#20159)
-enclosingStmt(#20158,#20157)
+enclosing_stmt(#20158,#20157)
 exprContainers(#20158,#20001)
 #20160=*
 exprs(#20160,76,#20158,1,"for (year of years)")
 #20161=@"loc,{#10000},1,2,1,20"
 locations_default(#20161,#10000,1,2,1,20)
 hasLocation(#20160,#20161)
-enclosingStmt(#20160,#20157)
+enclosing_stmt(#20160,#20157)
 exprContainers(#20160,#20001)
 #20162=*
 scopes(#20162,7)
@@ -431,14 +431,14 @@ variables(#20163,"year",#20162)
 #20164=*
 exprs(#20164,78,#20160,0,"year")
 hasLocation(#20164,#20019)
-enclosingStmt(#20164,#20157)
+enclosing_stmt(#20164,#20157)
 exprContainers(#20164,#20001)
 literals("year","year",#20164)
 decl(#20164,#20163)
 #20165=*
 exprs(#20165,79,#20160,1,"years")
 hasLocation(#20165,#20023)
-enclosingStmt(#20165,#20157)
+enclosing_stmt(#20165,#20157)
 exprContainers(#20165,#20001)
 literals("years","years",#20165)
 #20166=@"var;{years};{#20000}"
@@ -449,25 +449,25 @@ exprs(#20167,29,#20158,-1,"year > 2000")
 #20168=@"loc,{#10000},1,26,1,36"
 locations_default(#20168,#10000,1,26,1,36)
 hasLocation(#20167,#20168)
-enclosingStmt(#20167,#20157)
+enclosing_stmt(#20167,#20157)
 exprContainers(#20167,#20001)
 #20169=*
 exprs(#20169,79,#20167,0,"year")
 hasLocation(#20169,#20031)
-enclosingStmt(#20169,#20157)
+enclosing_stmt(#20169,#20157)
 exprContainers(#20169,#20001)
 literals("year","year",#20169)
 bind(#20169,#20163)
 #20170=*
 exprs(#20170,3,#20167,1,"2000")
 hasLocation(#20170,#20035)
-enclosingStmt(#20170,#20157)
+enclosing_stmt(#20170,#20157)
 exprContainers(#20170,#20001)
 literals("2000","2000",#20170)
 #20171=*
 exprs(#20171,79,#20158,0,"year")
 hasLocation(#20171,#20039)
-enclosingStmt(#20171,#20157)
+enclosing_stmt(#20171,#20157)
 exprContainers(#20171,#20001)
 literals("year","year",#20171)
 bind(#20171,#20163)
@@ -478,7 +478,7 @@ stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,79,#20172,0,"year")
 hasLocation(#20173,#20045)
-enclosingStmt(#20173,#20172)
+enclosing_stmt(#20173,#20172)
 exprContainers(#20173,#20001)
 literals("year","year",#20173)
 #20174=@"var;{year};{#20000}"
@@ -493,14 +493,14 @@ exprs(#20176,73,#20175,0,"[for (i ... s) i+j]")
 #20177=@"loc,{#10000},3,1,3,43"
 locations_default(#20177,#10000,3,1,3,43)
 hasLocation(#20176,#20177)
-enclosingStmt(#20176,#20175)
+enclosing_stmt(#20176,#20175)
 exprContainers(#20176,#20001)
 #20178=*
 exprs(#20178,76,#20176,1,"for (i of numbers)")
 #20179=@"loc,{#10000},3,2,3,19"
 locations_default(#20179,#10000,3,2,3,19)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20175)
+enclosing_stmt(#20178,#20175)
 exprContainers(#20178,#20001)
 #20180=*
 scopes(#20180,7)
@@ -511,14 +511,14 @@ variables(#20181,"i",#20180)
 #20182=*
 exprs(#20182,78,#20178,0,"i")
 hasLocation(#20182,#20055)
-enclosingStmt(#20182,#20175)
+enclosing_stmt(#20182,#20175)
 exprContainers(#20182,#20001)
 literals("i","i",#20182)
 decl(#20182,#20181)
 #20183=*
 exprs(#20183,79,#20178,1,"numbers")
 hasLocation(#20183,#20059)
-enclosingStmt(#20183,#20175)
+enclosing_stmt(#20183,#20175)
 exprContainers(#20183,#20001)
 literals("numbers","numbers",#20183)
 #20184=@"var;{numbers};{#20000}"
@@ -529,7 +529,7 @@ exprs(#20185,76,#20176,2,"for (j of letters)")
 #20186=@"loc,{#10000},3,21,3,38"
 locations_default(#20186,#10000,3,21,3,38)
 hasLocation(#20185,#20186)
-enclosingStmt(#20185,#20175)
+enclosing_stmt(#20185,#20175)
 exprContainers(#20185,#20001)
 #20187=*
 scopes(#20187,7)
@@ -540,14 +540,14 @@ variables(#20188,"j",#20187)
 #20189=*
 exprs(#20189,78,#20185,0,"j")
 hasLocation(#20189,#20067)
-enclosingStmt(#20189,#20175)
+enclosing_stmt(#20189,#20175)
 exprContainers(#20189,#20001)
 literals("j","j",#20189)
 decl(#20189,#20188)
 #20190=*
 exprs(#20190,79,#20185,1,"letters")
 hasLocation(#20190,#20071)
-enclosingStmt(#20190,#20175)
+enclosing_stmt(#20190,#20175)
 exprContainers(#20190,#20001)
 literals("letters","letters",#20190)
 #20191=@"var;{letters};{#20000}"
@@ -558,19 +558,19 @@ exprs(#20192,34,#20176,0,"i+j")
 #20193=@"loc,{#10000},3,40,3,42"
 locations_default(#20193,#10000,3,40,3,42)
 hasLocation(#20192,#20193)
-enclosingStmt(#20192,#20175)
+enclosing_stmt(#20192,#20175)
 exprContainers(#20192,#20001)
 #20194=*
 exprs(#20194,79,#20192,0,"i")
 hasLocation(#20194,#20075)
-enclosingStmt(#20194,#20175)
+enclosing_stmt(#20194,#20175)
 exprContainers(#20194,#20001)
 literals("i","i",#20194)
 bind(#20194,#20181)
 #20195=*
 exprs(#20195,79,#20192,1,"j")
 hasLocation(#20195,#20079)
-enclosingStmt(#20195,#20175)
+enclosing_stmt(#20195,#20175)
 exprContainers(#20195,#20001)
 literals("j","j",#20195)
 bind(#20195,#20188)
@@ -583,14 +583,14 @@ exprs(#20197,73,#20196,0,"[for (i ... j) i+j]")
 #20198=@"loc,{#10000},4,1,4,52"
 locations_default(#20198,#10000,4,1,4,52)
 hasLocation(#20197,#20198)
-enclosingStmt(#20197,#20196)
+enclosing_stmt(#20197,#20196)
 exprContainers(#20197,#20001)
 #20199=*
 exprs(#20199,76,#20197,1,"for (i of numbers)")
 #20200=@"loc,{#10000},4,2,4,19"
 locations_default(#20200,#10000,4,2,4,19)
 hasLocation(#20199,#20200)
-enclosingStmt(#20199,#20196)
+enclosing_stmt(#20199,#20196)
 exprContainers(#20199,#20001)
 #20201=*
 scopes(#20201,7)
@@ -601,14 +601,14 @@ variables(#20202,"i",#20201)
 #20203=*
 exprs(#20203,78,#20199,0,"i")
 hasLocation(#20203,#20091)
-enclosingStmt(#20203,#20196)
+enclosing_stmt(#20203,#20196)
 exprContainers(#20203,#20001)
 literals("i","i",#20203)
 decl(#20203,#20202)
 #20204=*
 exprs(#20204,79,#20199,1,"numbers")
 hasLocation(#20204,#20095)
-enclosingStmt(#20204,#20196)
+enclosing_stmt(#20204,#20196)
 exprContainers(#20204,#20001)
 literals("numbers","numbers",#20204)
 bind(#20204,#20184)
@@ -617,7 +617,7 @@ exprs(#20205,76,#20197,2,"for (j of letters)")
 #20206=@"loc,{#10000},4,21,4,38"
 locations_default(#20206,#10000,4,21,4,38)
 hasLocation(#20205,#20206)
-enclosingStmt(#20205,#20196)
+enclosing_stmt(#20205,#20196)
 exprContainers(#20205,#20001)
 #20207=*
 scopes(#20207,7)
@@ -628,14 +628,14 @@ variables(#20208,"j",#20207)
 #20209=*
 exprs(#20209,78,#20205,0,"j")
 hasLocation(#20209,#20103)
-enclosingStmt(#20209,#20196)
+enclosing_stmt(#20209,#20196)
 exprContainers(#20209,#20001)
 literals("j","j",#20209)
 decl(#20209,#20208)
 #20210=*
 exprs(#20210,79,#20205,1,"letters")
 hasLocation(#20210,#20107)
-enclosingStmt(#20210,#20196)
+enclosing_stmt(#20210,#20196)
 exprContainers(#20210,#20001)
 literals("letters","letters",#20210)
 bind(#20210,#20191)
@@ -644,19 +644,19 @@ exprs(#20211,27,#20197,-1,"i<j")
 #20212=@"loc,{#10000},4,44,4,46"
 locations_default(#20212,#10000,4,44,4,46)
 hasLocation(#20211,#20212)
-enclosingStmt(#20211,#20196)
+enclosing_stmt(#20211,#20196)
 exprContainers(#20211,#20001)
 #20213=*
 exprs(#20213,79,#20211,0,"i")
 hasLocation(#20213,#20115)
-enclosingStmt(#20213,#20196)
+enclosing_stmt(#20213,#20196)
 exprContainers(#20213,#20001)
 literals("i","i",#20213)
 bind(#20213,#20202)
 #20214=*
 exprs(#20214,79,#20211,1,"j")
 hasLocation(#20214,#20119)
-enclosingStmt(#20214,#20196)
+enclosing_stmt(#20214,#20196)
 exprContainers(#20214,#20001)
 literals("j","j",#20214)
 bind(#20214,#20208)
@@ -665,19 +665,19 @@ exprs(#20215,34,#20197,0,"i+j")
 #20216=@"loc,{#10000},4,49,4,51"
 locations_default(#20216,#10000,4,49,4,51)
 hasLocation(#20215,#20216)
-enclosingStmt(#20215,#20196)
+enclosing_stmt(#20215,#20196)
 exprContainers(#20215,#20001)
 #20217=*
 exprs(#20217,79,#20215,0,"i")
 hasLocation(#20217,#20123)
-enclosingStmt(#20217,#20196)
+enclosing_stmt(#20217,#20196)
 exprContainers(#20217,#20001)
 literals("i","i",#20217)
 bind(#20217,#20202)
 #20218=*
 exprs(#20218,79,#20215,1,"j")
 hasLocation(#20218,#20127)
-enclosingStmt(#20218,#20196)
+enclosing_stmt(#20218,#20196)
 exprContainers(#20218,#20001)
 literals("j","j",#20218)
 bind(#20218,#20208)
@@ -690,14 +690,14 @@ exprs(#20220,73,#20219,0,"[for ea ... ers) i]")
 #20221=@"loc,{#10000},5,1,5,27"
 locations_default(#20221,#10000,5,1,5,27)
 hasLocation(#20220,#20221)
-enclosingStmt(#20220,#20219)
+enclosing_stmt(#20220,#20219)
 exprContainers(#20220,#20001)
 #20222=*
 exprs(#20222,76,#20220,1,"for eac ... umbers)")
 #20223=@"loc,{#10000},5,2,5,24"
 locations_default(#20223,#10000,5,2,5,24)
 hasLocation(#20222,#20223)
-enclosingStmt(#20222,#20219)
+enclosing_stmt(#20222,#20219)
 exprContainers(#20222,#20001)
 #20224=*
 scopes(#20224,7)
@@ -708,21 +708,21 @@ variables(#20225,"i",#20224)
 #20226=*
 exprs(#20226,78,#20222,0,"i")
 hasLocation(#20226,#20141)
-enclosingStmt(#20226,#20219)
+enclosing_stmt(#20226,#20219)
 exprContainers(#20226,#20001)
 literals("i","i",#20226)
 decl(#20226,#20225)
 #20227=*
 exprs(#20227,79,#20222,1,"numbers")
 hasLocation(#20227,#20145)
-enclosingStmt(#20227,#20219)
+enclosing_stmt(#20227,#20219)
 exprContainers(#20227,#20001)
 literals("numbers","numbers",#20227)
 bind(#20227,#20184)
 #20228=*
 exprs(#20228,79,#20220,0,"i")
 hasLocation(#20228,#20149)
-enclosingStmt(#20228,#20219)
+enclosing_stmt(#20228,#20219)
 exprContainers(#20228,#20001)
 literals("i","i",#20228)
 bind(#20228,#20225)
diff --git a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
index ffbe5c8732e..cd4341034a9 100644
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@@ -255,7 +255,7 @@ stmt_containers(#20086,#20001)
 #20088=*
 exprs(#20088,9,#20086,0,"functio ... )\n  }\n}")
 hasLocation(#20088,#20087)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20001)
 #20089=*
 scopes(#20089,1)
@@ -289,7 +289,7 @@ stmt_containers(#20096,#20088)
 #20098=*
 exprs(#20098,79,#20096,0,"b")
 hasLocation(#20098,#20047)
-enclosingStmt(#20098,#20096)
+enclosing_stmt(#20098,#20096)
 exprContainers(#20098,#20088)
 literals("b","b",#20098)
 bind(#20098,#20091)
diff --git a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
index ddc16bb9a05..99aa6e5e28f 100644
--- a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
@@ -302,19 +302,19 @@ exprs(#20112,64,#20111,0,"sum = 0")
 #20113=@"loc,{#10000},1,5,1,11"
 locations_default(#20113,#10000,1,5,1,11)
 hasLocation(#20112,#20113)
-enclosingStmt(#20112,#20111)
+enclosing_stmt(#20112,#20111)
 exprContainers(#20112,#20001)
 #20114=*
 exprs(#20114,78,#20112,0,"sum")
 hasLocation(#20114,#20023)
-enclosingStmt(#20114,#20111)
+enclosing_stmt(#20114,#20111)
 exprContainers(#20114,#20001)
 literals("sum","sum",#20114)
 decl(#20114,#20108)
 #20115=*
 exprs(#20115,3,#20112,1,"0")
 hasLocation(#20115,#20027)
-enclosingStmt(#20115,#20111)
+enclosing_stmt(#20115,#20111)
 exprContainers(#20115,#20001)
 literals("0","0",#20115)
 #20116=*
@@ -326,12 +326,12 @@ exprs(#20117,64,#20116,0,"obj = { ... op3: 8}")
 #20118=@"loc,{#10000},2,5,2,41"
 locations_default(#20118,#10000,2,5,2,41)
 hasLocation(#20117,#20118)
-enclosingStmt(#20117,#20116)
+enclosing_stmt(#20117,#20116)
 exprContainers(#20117,#20001)
 #20119=*
 exprs(#20119,78,#20117,0,"obj")
 hasLocation(#20119,#20033)
-enclosingStmt(#20119,#20116)
+enclosing_stmt(#20119,#20116)
 exprContainers(#20119,#20001)
 literals("obj","obj",#20119)
 decl(#20119,#20109)
@@ -340,7 +340,7 @@ exprs(#20120,8,#20117,1,"{prop1: ... op3: 8}")
 #20121=@"loc,{#10000},2,11,2,41"
 locations_default(#20121,#10000,2,11,2,41)
 hasLocation(#20120,#20121)
-enclosingStmt(#20120,#20116)
+enclosing_stmt(#20120,#20116)
 exprContainers(#20120,#20001)
 #20122=*
 properties(#20122,#20120,0,0,"prop1: 5")
@@ -350,13 +350,13 @@ hasLocation(#20122,#20123)
 #20124=*
 exprs(#20124,0,#20122,0,"prop1")
 hasLocation(#20124,#20039)
-enclosingStmt(#20124,#20116)
+enclosing_stmt(#20124,#20116)
 exprContainers(#20124,#20001)
 literals("prop1","prop1",#20124)
 #20125=*
 exprs(#20125,3,#20122,1,"5")
 hasLocation(#20125,#20043)
-enclosingStmt(#20125,#20116)
+enclosing_stmt(#20125,#20116)
 exprContainers(#20125,#20001)
 literals("5","5",#20125)
 #20126=*
@@ -367,13 +367,13 @@ hasLocation(#20126,#20127)
 #20128=*
 exprs(#20128,0,#20126,0,"prop2")
 hasLocation(#20128,#20047)
-enclosingStmt(#20128,#20116)
+enclosing_stmt(#20128,#20116)
 exprContainers(#20128,#20001)
 literals("prop2","prop2",#20128)
 #20129=*
 exprs(#20129,3,#20126,1,"13")
 hasLocation(#20129,#20051)
-enclosingStmt(#20129,#20116)
+enclosing_stmt(#20129,#20116)
 exprContainers(#20129,#20001)
 literals("13","13",#20129)
 #20130=*
@@ -384,13 +384,13 @@ hasLocation(#20130,#20131)
 #20132=*
 exprs(#20132,0,#20130,0,"prop3")
 hasLocation(#20132,#20055)
-enclosingStmt(#20132,#20116)
+enclosing_stmt(#20132,#20116)
 exprContainers(#20132,#20001)
 literals("prop3","prop3",#20132)
 #20133=*
 exprs(#20133,3,#20130,1,"8")
 hasLocation(#20133,#20059)
-enclosingStmt(#20133,#20116)
+enclosing_stmt(#20133,#20116)
 exprContainers(#20133,#20001)
 literals("8","8",#20133)
 #20134=*
@@ -402,7 +402,7 @@ stmt_containers(#20134,#20001)
 #20136=*
 exprs(#20136,79,#20134,1,"obj")
 hasLocation(#20136,#20077)
-enclosingStmt(#20136,#20134)
+enclosing_stmt(#20136,#20134)
 exprContainers(#20136,#20001)
 literals("obj","obj",#20136)
 bind(#20136,#20109)
@@ -415,12 +415,12 @@ stmt_containers(#20137,#20001)
 #20139=*
 exprs(#20139,64,#20137,0,"item")
 hasLocation(#20139,#20073)
-enclosingStmt(#20139,#20137)
+enclosing_stmt(#20139,#20137)
 exprContainers(#20139,#20001)
 #20140=*
 exprs(#20140,78,#20139,0,"item")
 hasLocation(#20140,#20073)
-enclosingStmt(#20140,#20137)
+enclosing_stmt(#20140,#20137)
 exprContainers(#20140,#20001)
 literals("item","item",#20140)
 decl(#20140,#20110)
@@ -441,19 +441,19 @@ exprs(#20145,48,#20143,0,"sum += item")
 #20146=@"loc,{#10000},5,3,5,13"
 locations_default(#20146,#10000,5,3,5,13)
 hasLocation(#20145,#20146)
-enclosingStmt(#20145,#20143)
+enclosing_stmt(#20145,#20143)
 exprContainers(#20145,#20001)
 #20147=*
 exprs(#20147,79,#20145,0,"sum")
 hasLocation(#20147,#20083)
-enclosingStmt(#20147,#20143)
+enclosing_stmt(#20147,#20143)
 exprContainers(#20147,#20001)
 literals("sum","sum",#20147)
 bind(#20147,#20108)
 #20148=*
 exprs(#20148,79,#20145,1,"item")
 hasLocation(#20148,#20087)
-enclosingStmt(#20148,#20143)
+enclosing_stmt(#20148,#20143)
 exprContainers(#20148,#20001)
 literals("item","item",#20148)
 bind(#20148,#20110)
@@ -468,19 +468,19 @@ exprs(#20151,13,#20149,0,"console.log(sum)")
 #20152=@"loc,{#10000},8,1,8,16"
 locations_default(#20152,#10000,8,1,8,16)
 hasLocation(#20151,#20152)
-enclosingStmt(#20151,#20149)
+enclosing_stmt(#20151,#20149)
 exprContainers(#20151,#20001)
 #20153=*
 exprs(#20153,14,#20151,-1,"console.log")
 #20154=@"loc,{#10000},8,1,8,11"
 locations_default(#20154,#10000,8,1,8,11)
 hasLocation(#20153,#20154)
-enclosingStmt(#20153,#20149)
+enclosing_stmt(#20153,#20149)
 exprContainers(#20153,#20001)
 #20155=*
 exprs(#20155,79,#20153,0,"console")
 hasLocation(#20155,#20092)
-enclosingStmt(#20155,#20149)
+enclosing_stmt(#20155,#20149)
 exprContainers(#20155,#20001)
 literals("console","console",#20155)
 #20156=@"var;{console};{#20000}"
@@ -489,13 +489,13 @@ bind(#20155,#20156)
 #20157=*
 exprs(#20157,0,#20153,1,"log")
 hasLocation(#20157,#20096)
-enclosingStmt(#20157,#20149)
+enclosing_stmt(#20157,#20149)
 exprContainers(#20157,#20001)
 literals("log","log",#20157)
 #20158=*
 exprs(#20158,79,#20151,0,"sum")
 hasLocation(#20158,#20100)
-enclosingStmt(#20158,#20149)
+enclosing_stmt(#20158,#20149)
 exprContainers(#20158,#20001)
 literals("sum","sum",#20158)
 bind(#20158,#20108)
diff --git a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
index adeda0c1e59..c51eeb49f08 100644
--- a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
@@ -489,14 +489,14 @@ exprs(#20188,74,#20187,0,"(for (y ... ) year)")
 #20189=@"loc,{#10000},1,1,1,43"
 locations_default(#20189,#10000,1,1,1,43)
 hasLocation(#20188,#20189)
-enclosingStmt(#20188,#20187)
+enclosing_stmt(#20188,#20187)
 exprContainers(#20188,#20001)
 #20190=*
 exprs(#20190,76,#20188,1,"for (year of years)")
 #20191=@"loc,{#10000},1,2,1,20"
 locations_default(#20191,#10000,1,2,1,20)
 hasLocation(#20190,#20191)
-enclosingStmt(#20190,#20187)
+enclosing_stmt(#20190,#20187)
 exprContainers(#20190,#20001)
 #20192=*
 scopes(#20192,7)
@@ -507,14 +507,14 @@ variables(#20193,"year",#20192)
 #20194=*
 exprs(#20194,78,#20190,0,"year")
 hasLocation(#20194,#20021)
-enclosingStmt(#20194,#20187)
+enclosing_stmt(#20194,#20187)
 exprContainers(#20194,#20001)
 literals("year","year",#20194)
 decl(#20194,#20193)
 #20195=*
 exprs(#20195,79,#20190,1,"years")
 hasLocation(#20195,#20025)
-enclosingStmt(#20195,#20187)
+enclosing_stmt(#20195,#20187)
 exprContainers(#20195,#20001)
 literals("years","years",#20195)
 #20196=@"var;{years};{#20000}"
@@ -525,25 +525,25 @@ exprs(#20197,29,#20188,-1,"year > 2000")
 #20198=@"loc,{#10000},1,26,1,36"
 locations_default(#20198,#10000,1,26,1,36)
 hasLocation(#20197,#20198)
-enclosingStmt(#20197,#20187)
+enclosing_stmt(#20197,#20187)
 exprContainers(#20197,#20001)
 #20199=*
 exprs(#20199,79,#20197,0,"year")
 hasLocation(#20199,#20033)
-enclosingStmt(#20199,#20187)
+enclosing_stmt(#20199,#20187)
 exprContainers(#20199,#20001)
 literals("year","year",#20199)
 bind(#20199,#20193)
 #20200=*
 exprs(#20200,3,#20197,1,"2000")
 hasLocation(#20200,#20037)
-enclosingStmt(#20200,#20187)
+enclosing_stmt(#20200,#20187)
 exprContainers(#20200,#20001)
 literals("2000","2000",#20200)
 #20201=*
 exprs(#20201,79,#20188,0,"year")
 hasLocation(#20201,#20041)
-enclosingStmt(#20201,#20187)
+enclosing_stmt(#20201,#20187)
 exprContainers(#20201,#20001)
 literals("year","year",#20201)
 bind(#20201,#20193)
@@ -554,7 +554,7 @@ stmt_containers(#20202,#20001)
 #20203=*
 exprs(#20203,79,#20202,0,"year")
 hasLocation(#20203,#20047)
-enclosingStmt(#20203,#20202)
+enclosing_stmt(#20203,#20202)
 exprContainers(#20203,#20001)
 literals("year","year",#20203)
 #20204=@"var;{year};{#20000}"
@@ -569,14 +569,14 @@ exprs(#20206,74,#20205,0,"(for (i ... s) i+j)")
 #20207=@"loc,{#10000},3,1,3,43"
 locations_default(#20207,#10000,3,1,3,43)
 hasLocation(#20206,#20207)
-enclosingStmt(#20206,#20205)
+enclosing_stmt(#20206,#20205)
 exprContainers(#20206,#20001)
 #20208=*
 exprs(#20208,76,#20206,1,"for (i of numbers)")
 #20209=@"loc,{#10000},3,2,3,19"
 locations_default(#20209,#10000,3,2,3,19)
 hasLocation(#20208,#20209)
-enclosingStmt(#20208,#20205)
+enclosing_stmt(#20208,#20205)
 exprContainers(#20208,#20001)
 #20210=*
 scopes(#20210,7)
@@ -587,14 +587,14 @@ variables(#20211,"i",#20210)
 #20212=*
 exprs(#20212,78,#20208,0,"i")
 hasLocation(#20212,#20057)
-enclosingStmt(#20212,#20205)
+enclosing_stmt(#20212,#20205)
 exprContainers(#20212,#20001)
 literals("i","i",#20212)
 decl(#20212,#20211)
 #20213=*
 exprs(#20213,79,#20208,1,"numbers")
 hasLocation(#20213,#20061)
-enclosingStmt(#20213,#20205)
+enclosing_stmt(#20213,#20205)
 exprContainers(#20213,#20001)
 literals("numbers","numbers",#20213)
 #20214=@"var;{numbers};{#20000}"
@@ -605,7 +605,7 @@ exprs(#20215,76,#20206,2,"for (j of letters)")
 #20216=@"loc,{#10000},3,21,3,38"
 locations_default(#20216,#10000,3,21,3,38)
 hasLocation(#20215,#20216)
-enclosingStmt(#20215,#20205)
+enclosing_stmt(#20215,#20205)
 exprContainers(#20215,#20001)
 #20217=*
 scopes(#20217,7)
@@ -616,14 +616,14 @@ variables(#20218,"j",#20217)
 #20219=*
 exprs(#20219,78,#20215,0,"j")
 hasLocation(#20219,#20069)
-enclosingStmt(#20219,#20205)
+enclosing_stmt(#20219,#20205)
 exprContainers(#20219,#20001)
 literals("j","j",#20219)
 decl(#20219,#20218)
 #20220=*
 exprs(#20220,79,#20215,1,"letters")
 hasLocation(#20220,#20073)
-enclosingStmt(#20220,#20205)
+enclosing_stmt(#20220,#20205)
 exprContainers(#20220,#20001)
 literals("letters","letters",#20220)
 #20221=@"var;{letters};{#20000}"
@@ -634,19 +634,19 @@ exprs(#20222,34,#20206,0,"i+j")
 #20223=@"loc,{#10000},3,40,3,42"
 locations_default(#20223,#10000,3,40,3,42)
 hasLocation(#20222,#20223)
-enclosingStmt(#20222,#20205)
+enclosing_stmt(#20222,#20205)
 exprContainers(#20222,#20001)
 #20224=*
 exprs(#20224,79,#20222,0,"i")
 hasLocation(#20224,#20077)
-enclosingStmt(#20224,#20205)
+enclosing_stmt(#20224,#20205)
 exprContainers(#20224,#20001)
 literals("i","i",#20224)
 bind(#20224,#20211)
 #20225=*
 exprs(#20225,79,#20222,1,"j")
 hasLocation(#20225,#20081)
-enclosingStmt(#20225,#20205)
+enclosing_stmt(#20225,#20205)
 exprContainers(#20225,#20001)
 literals("j","j",#20225)
 bind(#20225,#20218)
@@ -659,14 +659,14 @@ exprs(#20227,74,#20226,0,"(for (i ... j) i+j)")
 #20228=@"loc,{#10000},4,1,4,52"
 locations_default(#20228,#10000,4,1,4,52)
 hasLocation(#20227,#20228)
-enclosingStmt(#20227,#20226)
+enclosing_stmt(#20227,#20226)
 exprContainers(#20227,#20001)
 #20229=*
 exprs(#20229,76,#20227,1,"for (i of numbers)")
 #20230=@"loc,{#10000},4,2,4,19"
 locations_default(#20230,#10000,4,2,4,19)
 hasLocation(#20229,#20230)
-enclosingStmt(#20229,#20226)
+enclosing_stmt(#20229,#20226)
 exprContainers(#20229,#20001)
 #20231=*
 scopes(#20231,7)
@@ -677,14 +677,14 @@ variables(#20232,"i",#20231)
 #20233=*
 exprs(#20233,78,#20229,0,"i")
 hasLocation(#20233,#20093)
-enclosingStmt(#20233,#20226)
+enclosing_stmt(#20233,#20226)
 exprContainers(#20233,#20001)
 literals("i","i",#20233)
 decl(#20233,#20232)
 #20234=*
 exprs(#20234,79,#20229,1,"numbers")
 hasLocation(#20234,#20097)
-enclosingStmt(#20234,#20226)
+enclosing_stmt(#20234,#20226)
 exprContainers(#20234,#20001)
 literals("numbers","numbers",#20234)
 bind(#20234,#20214)
@@ -693,7 +693,7 @@ exprs(#20235,76,#20227,2,"for (j of letters)")
 #20236=@"loc,{#10000},4,21,4,38"
 locations_default(#20236,#10000,4,21,4,38)
 hasLocation(#20235,#20236)
-enclosingStmt(#20235,#20226)
+enclosing_stmt(#20235,#20226)
 exprContainers(#20235,#20001)
 #20237=*
 scopes(#20237,7)
@@ -704,14 +704,14 @@ variables(#20238,"j",#20237)
 #20239=*
 exprs(#20239,78,#20235,0,"j")
 hasLocation(#20239,#20105)
-enclosingStmt(#20239,#20226)
+enclosing_stmt(#20239,#20226)
 exprContainers(#20239,#20001)
 literals("j","j",#20239)
 decl(#20239,#20238)
 #20240=*
 exprs(#20240,79,#20235,1,"letters")
 hasLocation(#20240,#20109)
-enclosingStmt(#20240,#20226)
+enclosing_stmt(#20240,#20226)
 exprContainers(#20240,#20001)
 literals("letters","letters",#20240)
 bind(#20240,#20221)
@@ -720,19 +720,19 @@ exprs(#20241,27,#20227,-1,"i<j")
 #20242=@"loc,{#10000},4,44,4,46"
 locations_default(#20242,#10000,4,44,4,46)
 hasLocation(#20241,#20242)
-enclosingStmt(#20241,#20226)
+enclosing_stmt(#20241,#20226)
 exprContainers(#20241,#20001)
 #20243=*
 exprs(#20243,79,#20241,0,"i")
 hasLocation(#20243,#20117)
-enclosingStmt(#20243,#20226)
+enclosing_stmt(#20243,#20226)
 exprContainers(#20243,#20001)
 literals("i","i",#20243)
 bind(#20243,#20232)
 #20244=*
 exprs(#20244,79,#20241,1,"j")
 hasLocation(#20244,#20121)
-enclosingStmt(#20244,#20226)
+enclosing_stmt(#20244,#20226)
 exprContainers(#20244,#20001)
 literals("j","j",#20244)
 bind(#20244,#20238)
@@ -741,19 +741,19 @@ exprs(#20245,34,#20227,0,"i+j")
 #20246=@"loc,{#10000},4,49,4,51"
 locations_default(#20246,#10000,4,49,4,51)
 hasLocation(#20245,#20246)
-enclosingStmt(#20245,#20226)
+enclosing_stmt(#20245,#20226)
 exprContainers(#20245,#20001)
 #20247=*
 exprs(#20247,79,#20245,0,"i")
 hasLocation(#20247,#20125)
-enclosingStmt(#20247,#20226)
+enclosing_stmt(#20247,#20226)
 exprContainers(#20247,#20001)
 literals("i","i",#20247)
 bind(#20247,#20232)
 #20248=*
 exprs(#20248,79,#20245,1,"j")
 hasLocation(#20248,#20129)
-enclosingStmt(#20248,#20226)
+enclosing_stmt(#20248,#20226)
 exprContainers(#20248,#20001)
 literals("j","j",#20248)
 bind(#20248,#20238)
@@ -766,14 +766,14 @@ exprs(#20250,74,#20249,0,"(x.p for (x in xs))")
 #20251=@"loc,{#10000},5,1,5,19"
 locations_default(#20251,#10000,5,1,5,19)
 hasLocation(#20250,#20251)
-enclosingStmt(#20250,#20249)
+enclosing_stmt(#20250,#20249)
 exprContainers(#20250,#20001)
 #20252=*
 exprs(#20252,75,#20250,1,"for (x in xs)")
 #20253=@"loc,{#10000},5,6,5,18"
 locations_default(#20253,#10000,5,6,5,18)
 hasLocation(#20252,#20253)
-enclosingStmt(#20252,#20249)
+enclosing_stmt(#20252,#20249)
 exprContainers(#20252,#20001)
 #20254=*
 scopes(#20254,7)
@@ -784,14 +784,14 @@ variables(#20255,"x",#20254)
 #20256=*
 exprs(#20256,78,#20252,0,"x")
 hasLocation(#20256,#20147)
-enclosingStmt(#20256,#20249)
+enclosing_stmt(#20256,#20249)
 exprContainers(#20256,#20001)
 literals("x","x",#20256)
 decl(#20256,#20255)
 #20257=*
 exprs(#20257,79,#20252,1,"xs")
 hasLocation(#20257,#20151)
-enclosingStmt(#20257,#20249)
+enclosing_stmt(#20257,#20249)
 exprContainers(#20257,#20001)
 literals("xs","xs",#20257)
 #20258=@"var;{xs};{#20000}"
@@ -802,19 +802,19 @@ exprs(#20259,14,#20250,0,"x.p")
 #20260=@"loc,{#10000},5,2,5,4"
 locations_default(#20260,#10000,5,2,5,4)
 hasLocation(#20259,#20260)
-enclosingStmt(#20259,#20249)
+enclosing_stmt(#20259,#20249)
 exprContainers(#20259,#20001)
 #20261=*
 exprs(#20261,79,#20259,0,"x")
 hasLocation(#20261,#20137)
-enclosingStmt(#20261,#20249)
+enclosing_stmt(#20261,#20249)
 exprContainers(#20261,#20001)
 literals("x","x",#20261)
 bind(#20261,#20255)
 #20262=*
 exprs(#20262,0,#20259,1,"p")
 hasLocation(#20262,#20141)
-enclosingStmt(#20262,#20249)
+enclosing_stmt(#20262,#20249)
 exprContainers(#20262,#20001)
 literals("p","p",#20262)
 #20263=*
@@ -826,14 +826,14 @@ exprs(#20264,74,#20263,0,"(x.p fo ... in xs))")
 #20265=@"loc,{#10000},6,1,6,24"
 locations_default(#20265,#10000,6,1,6,24)
 hasLocation(#20264,#20265)
-enclosingStmt(#20264,#20263)
+enclosing_stmt(#20264,#20263)
 exprContainers(#20264,#20001)
 #20266=*
 exprs(#20266,76,#20264,1,"for each (x in xs)")
 #20267=@"loc,{#10000},6,6,6,23"
 locations_default(#20267,#10000,6,6,6,23)
 hasLocation(#20266,#20267)
-enclosingStmt(#20266,#20263)
+enclosing_stmt(#20266,#20263)
 exprContainers(#20266,#20001)
 #20268=*
 scopes(#20268,7)
@@ -844,14 +844,14 @@ variables(#20269,"x",#20268)
 #20270=*
 exprs(#20270,78,#20266,0,"x")
 hasLocation(#20270,#20173)
-enclosingStmt(#20270,#20263)
+enclosing_stmt(#20270,#20263)
 exprContainers(#20270,#20001)
 literals("x","x",#20270)
 decl(#20270,#20269)
 #20271=*
 exprs(#20271,79,#20266,1,"xs")
 hasLocation(#20271,#20177)
-enclosingStmt(#20271,#20263)
+enclosing_stmt(#20271,#20263)
 exprContainers(#20271,#20001)
 literals("xs","xs",#20271)
 bind(#20271,#20258)
@@ -860,19 +860,19 @@ exprs(#20272,14,#20264,0,"x.p")
 #20273=@"loc,{#10000},6,2,6,4"
 locations_default(#20273,#10000,6,2,6,4)
 hasLocation(#20272,#20273)
-enclosingStmt(#20272,#20263)
+enclosing_stmt(#20272,#20263)
 exprContainers(#20272,#20001)
 #20274=*
 exprs(#20274,79,#20272,0,"x")
 hasLocation(#20274,#20161)
-enclosingStmt(#20274,#20263)
+enclosing_stmt(#20274,#20263)
 exprContainers(#20274,#20001)
 literals("x","x",#20274)
 bind(#20274,#20269)
 #20275=*
 exprs(#20275,0,#20272,1,"p")
 hasLocation(#20275,#20165)
-enclosingStmt(#20275,#20263)
+enclosing_stmt(#20275,#20263)
 exprContainers(#20275,#20001)
 literals("p","p",#20275)
 #20276=*
diff --git a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
index df1df5ddc33..7b1fdf5cabe 100644
--- a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
@@ -353,12 +353,12 @@ exprs(#20125,13,#20123,0,"g()")
 #20126=@"loc,{#10000},3,3,3,5"
 locations_default(#20126,#10000,3,3,3,5)
 hasLocation(#20125,#20126)
-enclosingStmt(#20125,#20123)
+enclosing_stmt(#20125,#20123)
 exprContainers(#20125,#20111)
 #20127=*
 exprs(#20127,79,#20125,-1,"g")
 hasLocation(#20127,#20037)
-enclosingStmt(#20127,#20123)
+enclosing_stmt(#20127,#20123)
 exprContainers(#20127,#20111)
 literals("g","g",#20127)
 bind(#20127,#20114)
@@ -377,7 +377,7 @@ variables(#20131,"e",#20130)
 #20132=*
 exprs(#20132,78,#20128,0,"e")
 hasLocation(#20132,#20051)
-enclosingStmt(#20132,#20128)
+enclosing_stmt(#20132,#20128)
 exprContainers(#20132,#20111)
 literals("e","e",#20132)
 decl(#20132,#20131)
@@ -386,19 +386,19 @@ exprs(#20133,43,#20128,2,"e instanceof Error")
 #20134=@"loc,{#10000},4,16,4,33"
 locations_default(#20134,#10000,4,16,4,33)
 hasLocation(#20133,#20134)
-enclosingStmt(#20133,#20128)
+enclosing_stmt(#20133,#20128)
 exprContainers(#20133,#20111)
 #20135=*
 exprs(#20135,79,#20133,0,"e")
 hasLocation(#20135,#20055)
-enclosingStmt(#20135,#20128)
+enclosing_stmt(#20135,#20128)
 exprContainers(#20135,#20111)
 literals("e","e",#20135)
 bind(#20135,#20131)
 #20136=*
 exprs(#20136,79,#20133,1,"Error")
 hasLocation(#20136,#20059)
-enclosingStmt(#20136,#20128)
+enclosing_stmt(#20136,#20128)
 exprContainers(#20136,#20111)
 literals("Error","Error",#20136)
 #20137=@"var;{Error};{#20000}"
@@ -421,19 +421,19 @@ exprs(#20142,13,#20140,0,"console ... rror!"")")
 #20143=@"loc,{#10000},5,3,5,23"
 locations_default(#20143,#10000,5,3,5,23)
 hasLocation(#20142,#20143)
-enclosingStmt(#20142,#20140)
+enclosing_stmt(#20142,#20140)
 exprContainers(#20142,#20111)
 #20144=*
 exprs(#20144,14,#20142,-1,"console.log")
 #20145=@"loc,{#10000},5,3,5,13"
 locations_default(#20145,#10000,5,3,5,13)
 hasLocation(#20144,#20145)
-enclosingStmt(#20144,#20140)
+enclosing_stmt(#20144,#20140)
 exprContainers(#20144,#20111)
 #20146=*
 exprs(#20146,79,#20144,0,"console")
 hasLocation(#20146,#20065)
-enclosingStmt(#20146,#20140)
+enclosing_stmt(#20146,#20140)
 exprContainers(#20146,#20111)
 literals("console","console",#20146)
 #20147=@"var;{console};{#20000}"
@@ -442,13 +442,13 @@ bind(#20146,#20147)
 #20148=*
 exprs(#20148,0,#20144,1,"log")
 hasLocation(#20148,#20069)
-enclosingStmt(#20148,#20140)
+enclosing_stmt(#20148,#20140)
 exprContainers(#20148,#20111)
 literals("log","log",#20148)
 #20149=*
 exprs(#20149,4,#20142,0,"""error!""")
 hasLocation(#20149,#20073)
-enclosingStmt(#20149,#20140)
+enclosing_stmt(#20149,#20140)
 exprContainers(#20149,#20111)
 literals("error!","""error!""",#20149)
 #20150=*
@@ -472,7 +472,7 @@ variables(#20155,"e",#20154)
 #20156=*
 exprs(#20156,78,#20152,0,"e")
 hasLocation(#20156,#20085)
-enclosingStmt(#20156,#20152)
+enclosing_stmt(#20156,#20152)
 exprContainers(#20156,#20111)
 literals("e","e",#20156)
 decl(#20156,#20155)
@@ -493,32 +493,32 @@ exprs(#20161,13,#20159,0,"console ... else!"")")
 #20162=@"loc,{#10000},7,3,7,32"
 locations_default(#20162,#10000,7,3,7,32)
 hasLocation(#20161,#20162)
-enclosingStmt(#20161,#20159)
+enclosing_stmt(#20161,#20159)
 exprContainers(#20161,#20111)
 #20163=*
 exprs(#20163,14,#20161,-1,"console.log")
 #20164=@"loc,{#10000},7,3,7,13"
 locations_default(#20164,#10000,7,3,7,13)
 hasLocation(#20163,#20164)
-enclosingStmt(#20163,#20159)
+enclosing_stmt(#20163,#20159)
 exprContainers(#20163,#20111)
 #20165=*
 exprs(#20165,79,#20163,0,"console")
 hasLocation(#20165,#20091)
-enclosingStmt(#20165,#20159)
+enclosing_stmt(#20165,#20159)
 exprContainers(#20165,#20111)
 literals("console","console",#20165)
 bind(#20165,#20147)
 #20166=*
 exprs(#20166,0,#20163,1,"log")
 hasLocation(#20166,#20095)
-enclosingStmt(#20166,#20159)
+enclosing_stmt(#20166,#20159)
 exprContainers(#20166,#20111)
 literals("log","log",#20166)
 #20167=*
 exprs(#20167,4,#20161,0,"""something else!""")
 hasLocation(#20167,#20099)
-enclosingStmt(#20167,#20159)
+enclosing_stmt(#20167,#20159)
 exprContainers(#20167,#20111)
 literals("something else!","""something else!""",#20167)
 #20168=*
diff --git a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
index 6e6733ab1c4..e311b3ade68 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
@@ -384,19 +384,19 @@ exprs(#20146,64,#20145,0,"x = 42")
 #20147=@"loc,{#10000},1,5,1,10"
 locations_default(#20147,#10000,1,5,1,10)
 hasLocation(#20146,#20147)
-enclosingStmt(#20146,#20145)
+enclosing_stmt(#20146,#20145)
 exprContainers(#20146,#20001)
 #20148=*
 exprs(#20148,78,#20146,0,"x")
 hasLocation(#20148,#20019)
-enclosingStmt(#20148,#20145)
+enclosing_stmt(#20148,#20145)
 exprContainers(#20148,#20001)
 literals("x","x",#20148)
 decl(#20148,#20143)
 #20149=*
 exprs(#20149,3,#20146,1,"42")
 hasLocation(#20149,#20023)
-enclosingStmt(#20149,#20145)
+enclosing_stmt(#20149,#20145)
 exprContainers(#20149,#20001)
 literals("42","42",#20149)
 #20150=*
@@ -404,19 +404,19 @@ exprs(#20150,64,#20145,1,"y = 19")
 #20151=@"loc,{#10000},1,13,1,18"
 locations_default(#20151,#10000,1,13,1,18)
 hasLocation(#20150,#20151)
-enclosingStmt(#20150,#20145)
+enclosing_stmt(#20150,#20145)
 exprContainers(#20150,#20001)
 #20152=*
 exprs(#20152,78,#20150,0,"y")
 hasLocation(#20152,#20027)
-enclosingStmt(#20152,#20145)
+enclosing_stmt(#20152,#20145)
 exprContainers(#20152,#20001)
 literals("y","y",#20152)
 decl(#20152,#20144)
 #20153=*
 exprs(#20153,3,#20150,1,"19")
 hasLocation(#20153,#20031)
-enclosingStmt(#20153,#20145)
+enclosing_stmt(#20153,#20145)
 exprContainers(#20153,#20001)
 literals("19","19",#20153)
 #20154=*
@@ -428,19 +428,19 @@ exprs(#20155,13,#20154,0,"console ...  x + y)")
 #20156=@"loc,{#10000},3,1,3,39"
 locations_default(#20156,#10000,3,1,3,39)
 hasLocation(#20155,#20156)
-enclosingStmt(#20155,#20154)
+enclosing_stmt(#20155,#20154)
 exprContainers(#20155,#20001)
 #20157=*
 exprs(#20157,14,#20155,-1,"console.log")
 #20158=@"loc,{#10000},3,1,3,11"
 locations_default(#20158,#10000,3,1,3,11)
 hasLocation(#20157,#20158)
-enclosingStmt(#20157,#20154)
+enclosing_stmt(#20157,#20154)
 exprContainers(#20157,#20001)
 #20159=*
 exprs(#20159,79,#20157,0,"console")
 hasLocation(#20159,#20035)
-enclosingStmt(#20159,#20154)
+enclosing_stmt(#20159,#20154)
 exprContainers(#20159,#20001)
 literals("console","console",#20159)
 #20160=@"var;{console};{#20000}"
@@ -449,7 +449,7 @@ bind(#20159,#20160)
 #20161=*
 exprs(#20161,0,#20157,1,"log")
 hasLocation(#20161,#20039)
-enclosingStmt(#20161,#20154)
+enclosing_stmt(#20161,#20154)
 exprContainers(#20161,#20001)
 literals("log","log",#20161)
 #20162=*
@@ -457,7 +457,7 @@ exprs(#20162,77,#20155,0,"let (x  ... ) x + y")
 #20163=@"loc,{#10000},3,13,3,38"
 locations_default(#20163,#10000,3,13,3,38)
 hasLocation(#20162,#20163)
-enclosingStmt(#20162,#20154)
+enclosing_stmt(#20162,#20154)
 exprContainers(#20162,#20001)
 #20164=*
 scopes(#20164,4)
@@ -472,19 +472,19 @@ exprs(#20167,64,#20162,0,"x = 23")
 #20168=@"loc,{#10000},3,18,3,23"
 locations_default(#20168,#10000,3,18,3,23)
 hasLocation(#20167,#20168)
-enclosingStmt(#20167,#20154)
+enclosing_stmt(#20167,#20154)
 exprContainers(#20167,#20001)
 #20169=*
 exprs(#20169,78,#20167,0,"x")
 hasLocation(#20169,#20047)
-enclosingStmt(#20169,#20154)
+enclosing_stmt(#20169,#20154)
 exprContainers(#20169,#20001)
 literals("x","x",#20169)
 decl(#20169,#20165)
 #20170=*
 exprs(#20170,3,#20167,1,"23")
 hasLocation(#20170,#20051)
-enclosingStmt(#20170,#20154)
+enclosing_stmt(#20170,#20154)
 exprContainers(#20170,#20001)
 literals("23","23",#20170)
 #20171=*
@@ -492,19 +492,19 @@ exprs(#20171,64,#20162,1,"y = 19")
 #20172=@"loc,{#10000},3,26,3,31"
 locations_default(#20172,#10000,3,26,3,31)
 hasLocation(#20171,#20172)
-enclosingStmt(#20171,#20154)
+enclosing_stmt(#20171,#20154)
 exprContainers(#20171,#20001)
 #20173=*
 exprs(#20173,78,#20171,0,"y")
 hasLocation(#20173,#20055)
-enclosingStmt(#20173,#20154)
+enclosing_stmt(#20173,#20154)
 exprContainers(#20173,#20001)
 literals("y","y",#20173)
 decl(#20173,#20166)
 #20174=*
 exprs(#20174,3,#20171,1,"19")
 hasLocation(#20174,#20059)
-enclosingStmt(#20174,#20154)
+enclosing_stmt(#20174,#20154)
 exprContainers(#20174,#20001)
 literals("19","19",#20174)
 #20175=*
@@ -512,19 +512,19 @@ exprs(#20175,34,#20162,-1,"x + y")
 #20176=@"loc,{#10000},3,34,3,38"
 locations_default(#20176,#10000,3,34,3,38)
 hasLocation(#20175,#20176)
-enclosingStmt(#20175,#20154)
+enclosing_stmt(#20175,#20154)
 exprContainers(#20175,#20001)
 #20177=*
 exprs(#20177,79,#20175,0,"x")
 hasLocation(#20177,#20063)
-enclosingStmt(#20177,#20154)
+enclosing_stmt(#20177,#20154)
 exprContainers(#20177,#20001)
 literals("x","x",#20177)
 bind(#20177,#20165)
 #20178=*
 exprs(#20178,79,#20175,1,"y")
 hasLocation(#20178,#20067)
-enclosingStmt(#20178,#20154)
+enclosing_stmt(#20178,#20154)
 exprContainers(#20178,#20001)
 literals("y","y",#20178)
 bind(#20178,#20166)
@@ -537,26 +537,26 @@ exprs(#20180,13,#20179,0,"console.log(x - y)")
 #20181=@"loc,{#10000},5,1,5,18"
 locations_default(#20181,#10000,5,1,5,18)
 hasLocation(#20180,#20181)
-enclosingStmt(#20180,#20179)
+enclosing_stmt(#20180,#20179)
 exprContainers(#20180,#20001)
 #20182=*
 exprs(#20182,14,#20180,-1,"console.log")
 #20183=@"loc,{#10000},5,1,5,11"
 locations_default(#20183,#10000,5,1,5,11)
 hasLocation(#20182,#20183)
-enclosingStmt(#20182,#20179)
+enclosing_stmt(#20182,#20179)
 exprContainers(#20182,#20001)
 #20184=*
 exprs(#20184,79,#20182,0,"console")
 hasLocation(#20184,#20073)
-enclosingStmt(#20184,#20179)
+enclosing_stmt(#20184,#20179)
 exprContainers(#20184,#20001)
 literals("console","console",#20184)
 bind(#20184,#20160)
 #20185=*
 exprs(#20185,0,#20182,1,"log")
 hasLocation(#20185,#20077)
-enclosingStmt(#20185,#20179)
+enclosing_stmt(#20185,#20179)
 exprContainers(#20185,#20001)
 literals("log","log",#20185)
 #20186=*
@@ -564,19 +564,19 @@ exprs(#20186,35,#20180,0,"x - y")
 #20187=@"loc,{#10000},5,13,5,17"
 locations_default(#20187,#10000,5,13,5,17)
 hasLocation(#20186,#20187)
-enclosingStmt(#20186,#20179)
+enclosing_stmt(#20186,#20179)
 exprContainers(#20186,#20001)
 #20188=*
 exprs(#20188,79,#20186,0,"x")
 hasLocation(#20188,#20081)
-enclosingStmt(#20188,#20179)
+enclosing_stmt(#20188,#20179)
 exprContainers(#20188,#20001)
 literals("x","x",#20188)
 bind(#20188,#20143)
 #20189=*
 exprs(#20189,79,#20186,1,"y")
 hasLocation(#20189,#20085)
-enclosingStmt(#20189,#20179)
+enclosing_stmt(#20189,#20179)
 exprContainers(#20189,#20001)
 literals("y","y",#20189)
 bind(#20189,#20144)
@@ -589,19 +589,19 @@ exprs(#20191,13,#20190,0,"JSON.st ...  y: y})")
 #20192=@"loc,{#10000},7,1,7,50"
 locations_default(#20192,#10000,7,1,7,50)
 hasLocation(#20191,#20192)
-enclosingStmt(#20191,#20190)
+enclosing_stmt(#20191,#20190)
 exprContainers(#20191,#20001)
 #20193=*
 exprs(#20193,14,#20191,-1,"JSON.stringify")
 #20194=@"loc,{#10000},7,1,7,14"
 locations_default(#20194,#10000,7,1,7,14)
 hasLocation(#20193,#20194)
-enclosingStmt(#20193,#20190)
+enclosing_stmt(#20193,#20190)
 exprContainers(#20193,#20001)
 #20195=*
 exprs(#20195,79,#20193,0,"JSON")
 hasLocation(#20195,#20091)
-enclosingStmt(#20195,#20190)
+enclosing_stmt(#20195,#20190)
 exprContainers(#20195,#20001)
 literals("JSON","JSON",#20195)
 #20196=@"var;{JSON};{#20000}"
@@ -610,7 +610,7 @@ bind(#20195,#20196)
 #20197=*
 exprs(#20197,0,#20193,1,"stringify")
 hasLocation(#20197,#20095)
-enclosingStmt(#20197,#20190)
+enclosing_stmt(#20197,#20190)
 exprContainers(#20197,#20001)
 literals("stringify","stringify",#20197)
 #20198=*
@@ -618,7 +618,7 @@ exprs(#20198,77,#20191,0,"let (x  ... , y: y}")
 #20199=@"loc,{#10000},7,16,7,49"
 locations_default(#20199,#10000,7,16,7,49)
 hasLocation(#20198,#20199)
-enclosingStmt(#20198,#20190)
+enclosing_stmt(#20198,#20190)
 exprContainers(#20198,#20001)
 #20200=*
 scopes(#20200,4)
@@ -633,19 +633,19 @@ exprs(#20203,64,#20198,0,"x = 23")
 #20204=@"loc,{#10000},7,21,7,26"
 locations_default(#20204,#10000,7,21,7,26)
 hasLocation(#20203,#20204)
-enclosingStmt(#20203,#20190)
+enclosing_stmt(#20203,#20190)
 exprContainers(#20203,#20001)
 #20205=*
 exprs(#20205,78,#20203,0,"x")
 hasLocation(#20205,#20103)
-enclosingStmt(#20205,#20190)
+enclosing_stmt(#20205,#20190)
 exprContainers(#20205,#20001)
 literals("x","x",#20205)
 decl(#20205,#20201)
 #20206=*
 exprs(#20206,3,#20203,1,"23")
 hasLocation(#20206,#20107)
-enclosingStmt(#20206,#20190)
+enclosing_stmt(#20206,#20190)
 exprContainers(#20206,#20001)
 literals("23","23",#20206)
 #20207=*
@@ -653,19 +653,19 @@ exprs(#20207,64,#20198,1,"y = 19")
 #20208=@"loc,{#10000},7,29,7,34"
 locations_default(#20208,#10000,7,29,7,34)
 hasLocation(#20207,#20208)
-enclosingStmt(#20207,#20190)
+enclosing_stmt(#20207,#20190)
 exprContainers(#20207,#20001)
 #20209=*
 exprs(#20209,78,#20207,0,"y")
 hasLocation(#20209,#20111)
-enclosingStmt(#20209,#20190)
+enclosing_stmt(#20209,#20190)
 exprContainers(#20209,#20001)
 literals("y","y",#20209)
 decl(#20209,#20202)
 #20210=*
 exprs(#20210,3,#20207,1,"19")
 hasLocation(#20210,#20115)
-enclosingStmt(#20210,#20190)
+enclosing_stmt(#20210,#20190)
 exprContainers(#20210,#20001)
 literals("19","19",#20210)
 #20211=*
@@ -673,7 +673,7 @@ exprs(#20211,8,#20198,-1,"{ x: x, y: y}")
 #20212=@"loc,{#10000},7,37,7,49"
 locations_default(#20212,#10000,7,37,7,49)
 hasLocation(#20211,#20212)
-enclosingStmt(#20211,#20190)
+enclosing_stmt(#20211,#20190)
 exprContainers(#20211,#20001)
 #20213=*
 properties(#20213,#20211,0,0,"x: x")
@@ -683,13 +683,13 @@ hasLocation(#20213,#20214)
 #20215=*
 exprs(#20215,0,#20213,0,"x")
 hasLocation(#20215,#20121)
-enclosingStmt(#20215,#20190)
+enclosing_stmt(#20215,#20190)
 exprContainers(#20215,#20001)
 literals("x","x",#20215)
 #20216=*
 exprs(#20216,79,#20213,1,"x")
 hasLocation(#20216,#20125)
-enclosingStmt(#20216,#20190)
+enclosing_stmt(#20216,#20190)
 exprContainers(#20216,#20001)
 literals("x","x",#20216)
 bind(#20216,#20201)
@@ -701,13 +701,13 @@ hasLocation(#20217,#20218)
 #20219=*
 exprs(#20219,0,#20217,0,"y")
 hasLocation(#20219,#20129)
-enclosingStmt(#20219,#20190)
+enclosing_stmt(#20219,#20190)
 exprContainers(#20219,#20001)
 literals("y","y",#20219)
 #20220=*
 exprs(#20220,79,#20217,1,"y")
 hasLocation(#20220,#20133)
-enclosingStmt(#20220,#20190)
+enclosing_stmt(#20220,#20190)
 exprContainers(#20220,#20001)
 literals("y","y",#20220)
 bind(#20220,#20202)
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
index 5ee20363a2d..c99d0aac332 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
@@ -269,19 +269,19 @@ exprs(#20099,64,#20098,0,"x = 42")
 #20100=@"loc,{#10000},1,5,1,10"
 locations_default(#20100,#10000,1,5,1,10)
 hasLocation(#20099,#20100)
-enclosingStmt(#20099,#20098)
+enclosing_stmt(#20099,#20098)
 exprContainers(#20099,#20001)
 #20101=*
 exprs(#20101,78,#20099,0,"x")
 hasLocation(#20101,#20019)
-enclosingStmt(#20101,#20098)
+enclosing_stmt(#20101,#20098)
 exprContainers(#20101,#20001)
 literals("x","x",#20101)
 decl(#20101,#20096)
 #20102=*
 exprs(#20102,3,#20099,1,"42")
 hasLocation(#20102,#20023)
-enclosingStmt(#20102,#20098)
+enclosing_stmt(#20102,#20098)
 exprContainers(#20102,#20001)
 literals("42","42",#20102)
 #20103=*
@@ -289,19 +289,19 @@ exprs(#20103,64,#20098,1,"y = 19")
 #20104=@"loc,{#10000},1,13,1,18"
 locations_default(#20104,#10000,1,13,1,18)
 hasLocation(#20103,#20104)
-enclosingStmt(#20103,#20098)
+enclosing_stmt(#20103,#20098)
 exprContainers(#20103,#20001)
 #20105=*
 exprs(#20105,78,#20103,0,"y")
 hasLocation(#20105,#20027)
-enclosingStmt(#20105,#20098)
+enclosing_stmt(#20105,#20098)
 exprContainers(#20105,#20001)
 literals("y","y",#20105)
 decl(#20105,#20097)
 #20106=*
 exprs(#20106,3,#20103,1,"19")
 hasLocation(#20106,#20031)
-enclosingStmt(#20106,#20098)
+enclosing_stmt(#20106,#20098)
 exprContainers(#20106,#20001)
 literals("19","19",#20106)
 #20107=*
@@ -323,19 +323,19 @@ exprs(#20112,64,#20107,0,"x = 23")
 #20113=@"loc,{#10000},3,6,3,11"
 locations_default(#20113,#10000,3,6,3,11)
 hasLocation(#20112,#20113)
-enclosingStmt(#20112,#20107)
+enclosing_stmt(#20112,#20107)
 exprContainers(#20112,#20001)
 #20114=*
 exprs(#20114,78,#20112,0,"x")
 hasLocation(#20114,#20039)
-enclosingStmt(#20114,#20107)
+enclosing_stmt(#20114,#20107)
 exprContainers(#20114,#20001)
 literals("x","x",#20114)
 decl(#20114,#20110)
 #20115=*
 exprs(#20115,3,#20112,1,"23")
 hasLocation(#20115,#20043)
-enclosingStmt(#20115,#20107)
+enclosing_stmt(#20115,#20107)
 exprContainers(#20115,#20001)
 literals("23","23",#20115)
 #20116=*
@@ -343,19 +343,19 @@ exprs(#20116,64,#20107,1,"y = 19")
 #20117=@"loc,{#10000},3,14,3,19"
 locations_default(#20117,#10000,3,14,3,19)
 hasLocation(#20116,#20117)
-enclosingStmt(#20116,#20107)
+enclosing_stmt(#20116,#20107)
 exprContainers(#20116,#20001)
 #20118=*
 exprs(#20118,78,#20116,0,"y")
 hasLocation(#20118,#20047)
-enclosingStmt(#20118,#20107)
+enclosing_stmt(#20118,#20107)
 exprContainers(#20118,#20001)
 literals("y","y",#20118)
 decl(#20118,#20111)
 #20119=*
 exprs(#20119,3,#20116,1,"19")
 hasLocation(#20119,#20051)
-enclosingStmt(#20119,#20107)
+enclosing_stmt(#20119,#20107)
 exprContainers(#20119,#20001)
 literals("19","19",#20119)
 #20120=*
@@ -375,19 +375,19 @@ exprs(#20124,13,#20122,0,"console.log(x + y)")
 #20125=@"loc,{#10000},4,3,4,20"
 locations_default(#20125,#10000,4,3,4,20)
 hasLocation(#20124,#20125)
-enclosingStmt(#20124,#20122)
+enclosing_stmt(#20124,#20122)
 exprContainers(#20124,#20001)
 #20126=*
 exprs(#20126,14,#20124,-1,"console.log")
 #20127=@"loc,{#10000},4,3,4,13"
 locations_default(#20127,#10000,4,3,4,13)
 hasLocation(#20126,#20127)
-enclosingStmt(#20126,#20122)
+enclosing_stmt(#20126,#20122)
 exprContainers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,0,"console")
 hasLocation(#20128,#20057)
-enclosingStmt(#20128,#20122)
+enclosing_stmt(#20128,#20122)
 exprContainers(#20128,#20001)
 literals("console","console",#20128)
 #20129=@"var;{console};{#20000}"
@@ -396,7 +396,7 @@ bind(#20128,#20129)
 #20130=*
 exprs(#20130,0,#20126,1,"log")
 hasLocation(#20130,#20061)
-enclosingStmt(#20130,#20122)
+enclosing_stmt(#20130,#20122)
 exprContainers(#20130,#20001)
 literals("log","log",#20130)
 #20131=*
@@ -404,19 +404,19 @@ exprs(#20131,34,#20124,0,"x + y")
 #20132=@"loc,{#10000},4,15,4,19"
 locations_default(#20132,#10000,4,15,4,19)
 hasLocation(#20131,#20132)
-enclosingStmt(#20131,#20122)
+enclosing_stmt(#20131,#20122)
 exprContainers(#20131,#20001)
 #20133=*
 exprs(#20133,79,#20131,0,"x")
 hasLocation(#20133,#20065)
-enclosingStmt(#20133,#20122)
+enclosing_stmt(#20133,#20122)
 exprContainers(#20133,#20001)
 literals("x","x",#20133)
 bind(#20133,#20110)
 #20134=*
 exprs(#20134,79,#20131,1,"y")
 hasLocation(#20134,#20069)
-enclosingStmt(#20134,#20122)
+enclosing_stmt(#20134,#20122)
 exprContainers(#20134,#20001)
 literals("y","y",#20134)
 bind(#20134,#20111)
@@ -429,26 +429,26 @@ exprs(#20136,13,#20135,0,"console.log(x - y)")
 #20137=@"loc,{#10000},7,1,7,18"
 locations_default(#20137,#10000,7,1,7,18)
 hasLocation(#20136,#20137)
-enclosingStmt(#20136,#20135)
+enclosing_stmt(#20136,#20135)
 exprContainers(#20136,#20001)
 #20138=*
 exprs(#20138,14,#20136,-1,"console.log")
 #20139=@"loc,{#10000},7,1,7,11"
 locations_default(#20139,#10000,7,1,7,11)
 hasLocation(#20138,#20139)
-enclosingStmt(#20138,#20135)
+enclosing_stmt(#20138,#20135)
 exprContainers(#20138,#20001)
 #20140=*
 exprs(#20140,79,#20138,0,"console")
 hasLocation(#20140,#20076)
-enclosingStmt(#20140,#20135)
+enclosing_stmt(#20140,#20135)
 exprContainers(#20140,#20001)
 literals("console","console",#20140)
 bind(#20140,#20129)
 #20141=*
 exprs(#20141,0,#20138,1,"log")
 hasLocation(#20141,#20080)
-enclosingStmt(#20141,#20135)
+enclosing_stmt(#20141,#20135)
 exprContainers(#20141,#20001)
 literals("log","log",#20141)
 #20142=*
@@ -456,19 +456,19 @@ exprs(#20142,35,#20136,0,"x - y")
 #20143=@"loc,{#10000},7,13,7,17"
 locations_default(#20143,#10000,7,13,7,17)
 hasLocation(#20142,#20143)
-enclosingStmt(#20142,#20135)
+enclosing_stmt(#20142,#20135)
 exprContainers(#20142,#20001)
 #20144=*
 exprs(#20144,79,#20142,0,"x")
 hasLocation(#20144,#20084)
-enclosingStmt(#20144,#20135)
+enclosing_stmt(#20144,#20135)
 exprContainers(#20144,#20001)
 literals("x","x",#20144)
 bind(#20144,#20096)
 #20145=*
 exprs(#20145,79,#20142,1,"y")
 hasLocation(#20145,#20088)
-enclosingStmt(#20145,#20135)
+enclosing_stmt(#20145,#20135)
 exprContainers(#20145,#20001)
 literals("y","y",#20145)
 bind(#20145,#20097)
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
index a981bbea9b4..842cf3694bb 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
@@ -77,19 +77,19 @@ exprs(#20025,64,#20022,0,"x = 0")
 #20026=@"loc,{#10000},1,6,1,10"
 locations_default(#20026,#10000,1,6,1,10)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20022)
+enclosing_stmt(#20025,#20022)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,78,#20025,0,"x")
 hasLocation(#20027,#20009)
-enclosingStmt(#20027,#20022)
+enclosing_stmt(#20027,#20022)
 exprContainers(#20027,#20001)
 literals("x","x",#20027)
 decl(#20027,#20024)
 #20028=*
 exprs(#20028,3,#20025,1,"0")
 hasLocation(#20028,#20013)
-enclosingStmt(#20028,#20022)
+enclosing_stmt(#20028,#20022)
 exprContainers(#20028,#20001)
 literals("0","0",#20028)
 #20029=*
@@ -99,7 +99,7 @@ stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,3,#20029,0,"1")
 hasLocation(#20030,#20017)
-enclosingStmt(#20030,#20029)
+enclosing_stmt(#20030,#20029)
 exprContainers(#20030,#20001)
 literals("1","1",#20030)
 #20031=*
diff --git a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
index 0f615aa631e..2000a9c28cf 100644
--- a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
@@ -144,12 +144,12 @@ stmt_containers(#20049,#20001)
 #20050=*
 exprs(#20050,12,#20049,0,"new A() ... ""bar"" }")
 hasLocation(#20050,#20008)
-enclosingStmt(#20050,#20049)
+enclosing_stmt(#20050,#20049)
 exprContainers(#20050,#20001)
 #20051=*
 exprs(#20051,79,#20050,-1,"A")
 hasLocation(#20051,#20019)
-enclosingStmt(#20051,#20049)
+enclosing_stmt(#20051,#20049)
 exprContainers(#20051,#20001)
 literals("A","A",#20051)
 #20052=@"var;{A};{#20000}"
@@ -160,7 +160,7 @@ exprs(#20053,8,#20050,0,"{ foo: ""bar"" }")
 #20054=@"loc,{#10000},2,9,2,22"
 locations_default(#20054,#10000,2,9,2,22)
 hasLocation(#20053,#20054)
-enclosingStmt(#20053,#20049)
+enclosing_stmt(#20053,#20049)
 exprContainers(#20053,#20001)
 #20055=*
 properties(#20055,#20053,0,0,"foo: ""bar""")
@@ -170,13 +170,13 @@ hasLocation(#20055,#20056)
 #20057=*
 exprs(#20057,0,#20055,0,"foo")
 hasLocation(#20057,#20027)
-enclosingStmt(#20057,#20049)
+enclosing_stmt(#20057,#20049)
 exprContainers(#20057,#20001)
 literals("foo","foo",#20057)
 #20058=*
 exprs(#20058,4,#20055,1,"""bar""")
 hasLocation(#20058,#20031)
-enclosingStmt(#20058,#20049)
+enclosing_stmt(#20058,#20049)
 exprContainers(#20058,#20001)
 literals("bar","""bar""",#20058)
 #20059=*
@@ -192,12 +192,12 @@ stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,12,#20061,0,"new A()")
 hasLocation(#20062,#20013)
-enclosingStmt(#20062,#20061)
+enclosing_stmt(#20062,#20061)
 exprContainers(#20062,#20001)
 #20063=*
 exprs(#20063,79,#20062,-1,"A")
 hasLocation(#20063,#20037)
-enclosingStmt(#20063,#20061)
+enclosing_stmt(#20063,#20061)
 exprContainers(#20063,#20001)
 literals("A","A",#20063)
 bind(#20063,#20052)
diff --git a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
index 088f3c5c52d..466117845c7 100644
--- a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
@@ -147,7 +147,7 @@ stmt_containers(#20047,#20039)
 #20049=*
 exprs(#20049,79,#20047,0,"arguments")
 hasLocation(#20049,#20021)
-enclosingStmt(#20049,#20047)
+enclosing_stmt(#20049,#20047)
 exprContainers(#20049,#20039)
 literals("arguments","arguments",#20049)
 bind(#20049,#20046)
@@ -166,12 +166,12 @@ variables(#20053,"arguments",#20052)
 #20054=*
 exprs(#20054,64,#20050,0,"arguments")
 hasLocation(#20054,#20029)
-enclosingStmt(#20054,#20050)
+enclosing_stmt(#20054,#20050)
 exprContainers(#20054,#20039)
 #20055=*
 exprs(#20055,78,#20054,0,"arguments")
 hasLocation(#20055,#20029)
-enclosingStmt(#20055,#20050)
+enclosing_stmt(#20055,#20050)
 exprContainers(#20055,#20039)
 literals("arguments","arguments",#20055)
 decl(#20055,#20053)
diff --git a/javascript/extractor/tests/node/output/trap/constlet.js.trap b/javascript/extractor/tests/node/output/trap/constlet.js.trap
index 365fcff0b10..ff1e40c02ae 100644
--- a/javascript/extractor/tests/node/output/trap/constlet.js.trap
+++ b/javascript/extractor/tests/node/output/trap/constlet.js.trap
@@ -118,19 +118,19 @@ exprs(#20043,64,#20042,0,"x = 23")
 #20044=@"loc,{#10000},1,7,1,12"
 locations_default(#20044,#10000,1,7,1,12)
 hasLocation(#20043,#20044)
-enclosingStmt(#20043,#20042)
+enclosing_stmt(#20043,#20042)
 exprContainers(#20043,#20001)
 #20045=*
 exprs(#20045,78,#20043,0,"x")
 hasLocation(#20045,#20009)
-enclosingStmt(#20045,#20042)
+enclosing_stmt(#20045,#20042)
 exprContainers(#20045,#20001)
 literals("x","x",#20045)
 decl(#20045,#20040)
 #20046=*
 exprs(#20046,3,#20043,1,"23")
 hasLocation(#20046,#20013)
-enclosingStmt(#20046,#20042)
+enclosing_stmt(#20046,#20042)
 exprContainers(#20046,#20001)
 literals("23","23",#20046)
 #20047=*
@@ -142,19 +142,19 @@ exprs(#20048,64,#20047,0,"y = 42")
 #20049=@"loc,{#10000},2,5,2,10"
 locations_default(#20049,#10000,2,5,2,10)
 hasLocation(#20048,#20049)
-enclosingStmt(#20048,#20047)
+enclosing_stmt(#20048,#20047)
 exprContainers(#20048,#20001)
 #20050=*
 exprs(#20050,78,#20048,0,"y")
 hasLocation(#20050,#20019)
-enclosingStmt(#20050,#20047)
+enclosing_stmt(#20050,#20047)
 exprContainers(#20050,#20001)
 literals("y","y",#20050)
 decl(#20050,#20041)
 #20051=*
 exprs(#20051,3,#20048,1,"42")
 hasLocation(#20051,#20023)
-enclosingStmt(#20051,#20047)
+enclosing_stmt(#20051,#20047)
 exprContainers(#20051,#20001)
 literals("42","42",#20051)
 #20052=*
diff --git a/javascript/extractor/tests/node/output/trap/hello.trap b/javascript/extractor/tests/node/output/trap/hello.trap
index 921972fe719..760d96121af 100644
--- a/javascript/extractor/tests/node/output/trap/hello.trap
+++ b/javascript/extractor/tests/node/output/trap/hello.trap
@@ -94,32 +94,32 @@ exprs(#20032,13,#20031,0,"console ... orld!"")")
 #20033=@"loc,{#10000},2,1,2,28"
 locations_default(#20033,#10000,2,1,2,28)
 hasLocation(#20032,#20033)
-enclosingStmt(#20032,#20031)
+enclosing_stmt(#20032,#20031)
 exprContainers(#20032,#20001)
 #20034=*
 exprs(#20034,14,#20032,-1,"console.log")
 #20035=@"loc,{#10000},2,1,2,11"
 locations_default(#20035,#10000,2,1,2,11)
 hasLocation(#20034,#20035)
-enclosingStmt(#20034,#20031)
+enclosing_stmt(#20034,#20031)
 exprContainers(#20034,#20001)
 #20036=*
 exprs(#20036,79,#20034,0,"console")
 hasLocation(#20036,#20005)
-enclosingStmt(#20036,#20031)
+enclosing_stmt(#20036,#20031)
 exprContainers(#20036,#20001)
 literals("console","console",#20036)
 bind(#20036,#20022)
 #20037=*
 exprs(#20037,0,#20034,1,"log")
 hasLocation(#20037,#20009)
-enclosingStmt(#20037,#20031)
+enclosing_stmt(#20037,#20031)
 exprContainers(#20037,#20001)
 literals("log","log",#20037)
 #20038=*
 exprs(#20038,4,#20032,0,"""Hello, world!""")
 hasLocation(#20038,#20013)
-enclosingStmt(#20038,#20031)
+enclosing_stmt(#20038,#20031)
 exprContainers(#20038,#20001)
 literals("Hello, world!","""Hello, world!""",#20038)
 #20039=*
diff --git a/javascript/extractor/tests/node/output/trap/tst.html.trap b/javascript/extractor/tests/node/output/trap/tst.html.trap
index afe59f427ec..49829bc2a70 100644
--- a/javascript/extractor/tests/node/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.html.trap
@@ -58,19 +58,19 @@ exprs(#20018,64,#20017,0,"x = 42")
 #20019=@"loc,{#10000},6,17,6,22"
 locations_default(#20019,#10000,6,17,6,22)
 hasLocation(#20018,#20019)
-enclosingStmt(#20018,#20017)
+enclosing_stmt(#20018,#20017)
 exprContainers(#20018,#20001)
 #20020=*
 exprs(#20020,78,#20018,0,"x")
 hasLocation(#20020,#20007)
-enclosingStmt(#20020,#20017)
+enclosing_stmt(#20020,#20017)
 exprContainers(#20020,#20001)
 literals("x","x",#20020)
 decl(#20020,#20016)
 #20021=*
 exprs(#20021,3,#20018,1,"42")
 hasLocation(#20021,#20011)
-enclosingStmt(#20021,#20017)
+enclosing_stmt(#20021,#20017)
 exprContainers(#20021,#20001)
 literals("42","42",#20021)
 #20022=*
diff --git a/javascript/extractor/tests/node/output/trap/tst.js.trap b/javascript/extractor/tests/node/output/trap/tst.js.trap
index 1be029fbed2..912efa0b7b2 100644
--- a/javascript/extractor/tests/node/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.js.trap
@@ -203,12 +203,12 @@ exprs(#20076,64,#20075,0,"fs = require('fs')")
 #20077=@"loc,{#10000},1,5,1,22"
 locations_default(#20077,#10000,1,5,1,22)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20075)
+enclosing_stmt(#20076,#20075)
 exprContainers(#20076,#20001)
 #20078=*
 exprs(#20078,78,#20076,0,"fs")
 hasLocation(#20078,#20013)
-enclosingStmt(#20078,#20075)
+enclosing_stmt(#20078,#20075)
 exprContainers(#20078,#20001)
 literals("fs","fs",#20078)
 decl(#20078,#20074)
@@ -217,19 +217,19 @@ exprs(#20079,13,#20076,1,"require('fs')")
 #20080=@"loc,{#10000},1,10,1,22"
 locations_default(#20080,#10000,1,10,1,22)
 hasLocation(#20079,#20080)
-enclosingStmt(#20079,#20075)
+enclosing_stmt(#20079,#20075)
 exprContainers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,-1,"require")
 hasLocation(#20081,#20017)
-enclosingStmt(#20081,#20075)
+enclosing_stmt(#20081,#20075)
 exprContainers(#20081,#20001)
 literals("require","require",#20081)
 bind(#20081,#20068)
 #20082=*
 exprs(#20082,4,#20079,0,"'fs'")
 hasLocation(#20082,#20021)
-enclosingStmt(#20082,#20075)
+enclosing_stmt(#20082,#20075)
 exprContainers(#20082,#20001)
 literals("fs","'fs'",#20082)
 #20083=*
@@ -247,12 +247,12 @@ exprs(#20086,47,#20085,0,"y = 42")
 #20087=@"loc,{#10000},2,1,2,6"
 locations_default(#20087,#10000,2,1,2,6)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20085)
+enclosing_stmt(#20086,#20085)
 exprContainers(#20086,#20001)
 #20088=*
 exprs(#20088,79,#20086,0,"y")
 hasLocation(#20088,#20027)
-enclosingStmt(#20088,#20085)
+enclosing_stmt(#20088,#20085)
 exprContainers(#20088,#20001)
 literals("y","y",#20088)
 #20089=@"var;{y};{#20000}"
@@ -261,7 +261,7 @@ bind(#20088,#20089)
 #20090=*
 exprs(#20090,3,#20086,1,"42")
 hasLocation(#20090,#20031)
-enclosingStmt(#20090,#20085)
+enclosing_stmt(#20090,#20085)
 exprContainers(#20090,#20001)
 literals("42","42",#20090)
 #20091=*
@@ -273,32 +273,32 @@ exprs(#20092,13,#20091,0,"console ... lename)")
 #20093=@"loc,{#10000},3,1,3,23"
 locations_default(#20093,#10000,3,1,3,23)
 hasLocation(#20092,#20093)
-enclosingStmt(#20092,#20091)
+enclosing_stmt(#20092,#20091)
 exprContainers(#20092,#20001)
 #20094=*
 exprs(#20094,14,#20092,-1,"console.log")
 #20095=@"loc,{#10000},3,1,3,11"
 locations_default(#20095,#10000,3,1,3,11)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20091)
+enclosing_stmt(#20094,#20091)
 exprContainers(#20094,#20001)
 #20096=*
 exprs(#20096,79,#20094,0,"console")
 hasLocation(#20096,#20035)
-enclosingStmt(#20096,#20091)
+enclosing_stmt(#20096,#20091)
 exprContainers(#20096,#20001)
 literals("console","console",#20096)
 bind(#20096,#20065)
 #20097=*
 exprs(#20097,0,#20094,1,"log")
 hasLocation(#20097,#20039)
-enclosingStmt(#20097,#20091)
+enclosing_stmt(#20097,#20091)
 exprContainers(#20097,#20001)
 literals("log","log",#20097)
 #20098=*
 exprs(#20098,79,#20092,0,"__filename")
 hasLocation(#20098,#20043)
-enclosingStmt(#20098,#20091)
+enclosing_stmt(#20098,#20091)
 exprContainers(#20098,#20001)
 literals("__filename","__filename",#20098)
 bind(#20098,#20071)
@@ -311,19 +311,19 @@ exprs(#20100,15,#20099,0,"arguments[0]")
 #20101=@"loc,{#10000},4,8,4,19"
 locations_default(#20101,#10000,4,8,4,19)
 hasLocation(#20100,#20101)
-enclosingStmt(#20100,#20099)
+enclosing_stmt(#20100,#20099)
 exprContainers(#20100,#20001)
 #20102=*
 exprs(#20102,79,#20100,0,"arguments")
 hasLocation(#20102,#20051)
-enclosingStmt(#20102,#20099)
+enclosing_stmt(#20102,#20099)
 exprContainers(#20102,#20001)
 literals("arguments","arguments",#20102)
 bind(#20102,#20073)
 #20103=*
 exprs(#20103,3,#20100,1,"0")
 hasLocation(#20103,#20055)
-enclosingStmt(#20103,#20099)
+enclosing_stmt(#20103,#20099)
 exprContainers(#20103,#20001)
 literals("0","0",#20103)
 #20104=*
diff --git a/javascript/extractor/tests/node/output/trap/tst.mjs.trap b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
index 86a2c231c93..fc185dca80e 100644
--- a/javascript/extractor/tests/node/output/trap/tst.mjs.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
@@ -60,12 +60,12 @@ stmt_containers(#20018,#20001)
 #20019=*
 exprs(#20019,64,#20018,0,"x")
 hasLocation(#20019,#20007)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20020=*
 exprs(#20020,78,#20019,0,"x")
 hasLocation(#20020,#20007)
-enclosingStmt(#20020,#20018)
+enclosing_stmt(#20020,#20018)
 exprContainers(#20020,#20001)
 literals("x","x",#20020)
 decl(#20020,#20017)
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
index dcc39e328f8..90893e76587 100644
--- a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -122,7 +122,7 @@ stmt_containers(#20041,#20001)
 #20042=*
 exprs(#20042,5,#20041,0,"/^(?<ws ... k<ws>$/")
 hasLocation(#20042,#20015)
-enclosingStmt(#20042,#20041)
+enclosing_stmt(#20042,#20041)
 exprContainers(#20042,#20001)
 literals("/^(?<ws>\s+)\w+\k<ws>$/","/^(?<ws>\s+)\w+\k<ws>$/",#20042)
 #20043=*
@@ -184,7 +184,7 @@ stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,5,#20061,0,"/(?<=.)/")
 hasLocation(#20062,#20019)
-enclosingStmt(#20062,#20061)
+enclosing_stmt(#20062,#20061)
 exprContainers(#20062,#20001)
 literals("/(?<=.)/","/(?<=.)/",#20062)
 #20063=*
@@ -204,7 +204,7 @@ stmt_containers(#20067,#20001)
 #20068=*
 exprs(#20068,5,#20067,0,"/(?<!.)/")
 hasLocation(#20068,#20023)
-enclosingStmt(#20068,#20067)
+enclosing_stmt(#20068,#20067)
 exprContainers(#20068,#20001)
 literals("/(?<!.)/","/(?<!.)/",#20068)
 #20069=*
@@ -224,7 +224,7 @@ stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,5,#20073,0,"/\p{Number}/u")
 hasLocation(#20074,#20027)
-enclosingStmt(#20074,#20073)
+enclosing_stmt(#20074,#20073)
 exprContainers(#20074,#20001)
 literals("/\p{Number}/u","/\p{Number}/u",#20074)
 #20075=*
@@ -240,7 +240,7 @@ stmt_containers(#20077,#20001)
 #20078=*
 exprs(#20078,5,#20077,0,"/\P{Script=Greek}/u")
 hasLocation(#20078,#20031)
-enclosingStmt(#20078,#20077)
+enclosing_stmt(#20078,#20077)
 exprContainers(#20078,#20001)
 literals("/\P{Script=Greek}/u","/\P{Script=Greek}/u",#20078)
 #20079=*
@@ -257,7 +257,7 @@ stmt_containers(#20081,#20001)
 #20082=*
 exprs(#20082,5,#20081,0,"/\k</")
 hasLocation(#20082,#20035)
-enclosingStmt(#20082,#20081)
+enclosing_stmt(#20082,#20081)
 exprContainers(#20082,#20001)
 literals("/\k</","/\k</",#20082)
 #20083=*
diff --git a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
index 18128d2ffdb..d89025d9a92 100644
--- a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
@@ -39,7 +39,7 @@ stmt_containers(#20010,#20001)
 #20011=*
 exprs(#20011,5,#20010,0,"/dice/y")
 hasLocation(#20011,#20005)
-enclosingStmt(#20011,#20010)
+enclosing_stmt(#20011,#20010)
 exprContainers(#20011,#20001)
 literals("/dice/y","/dice/y",#20011)
 #20012=*
diff --git a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
index dbcd8ea3b09..71618224764 100644
--- a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
@@ -202,12 +202,12 @@ stmt_containers(#20072,#20001)
 #20073=*
 exprs(#20073,64,#20072,0,"r")
 hasLocation(#20073,#20019)
-enclosingStmt(#20073,#20072)
+enclosing_stmt(#20073,#20072)
 exprContainers(#20073,#20001)
 #20074=*
 exprs(#20074,78,#20073,0,"r")
 hasLocation(#20074,#20019)
-enclosingStmt(#20074,#20072)
+enclosing_stmt(#20074,#20072)
 exprContainers(#20074,#20001)
 literals("r","r",#20074)
 decl(#20074,#20071)
@@ -222,12 +222,12 @@ exprs(#20077,13,#20075,0,"reportC ... on 1""\n)")
 #20078=@"loc,{#10000},3,1,7,1"
 locations_default(#20078,#10000,3,1,7,1)
 hasLocation(#20077,#20078)
-enclosingStmt(#20077,#20075)
+enclosing_stmt(#20077,#20075)
 exprContainers(#20077,#20001)
 #20079=*
 exprs(#20079,79,#20077,-1,"reportCompare")
 hasLocation(#20079,#20023)
-enclosingStmt(#20079,#20075)
+enclosing_stmt(#20079,#20075)
 exprContainers(#20079,#20001)
 literals("reportCompare","reportCompare",#20079)
 #20080=@"var;{reportCompare};{#20000}"
@@ -236,7 +236,7 @@ bind(#20079,#20080)
 #20081=*
 exprs(#20081,4,#20077,0,"""x""")
 hasLocation(#20081,#20027)
-enclosingStmt(#20081,#20075)
+enclosing_stmt(#20081,#20075)
 exprContainers(#20081,#20001)
 literals("x","""x""",#20081)
 #20082=*
@@ -250,26 +250,26 @@ exprs(#20084,44,#20077,1,"(r = /[ ... && r[0]")
 #20085=@"loc,{#10000},5,3,5,33"
 locations_default(#20085,#10000,5,3,5,33)
 hasLocation(#20084,#20085)
-enclosingStmt(#20084,#20075)
+enclosing_stmt(#20084,#20075)
 exprContainers(#20084,#20001)
 #20086=*
 exprs(#20086,63,#20084,0,"(r = /[ ... c(""x""))")
 #20087=@"loc,{#10000},5,3,5,25"
 locations_default(#20087,#10000,5,3,5,25)
 hasLocation(#20086,#20087)
-enclosingStmt(#20086,#20075)
+enclosing_stmt(#20086,#20075)
 exprContainers(#20086,#20001)
 #20088=*
 exprs(#20088,47,#20086,0,"r = /[\ ... ec(""x"")")
 #20089=@"loc,{#10000},5,4,5,24"
 locations_default(#20089,#10000,5,4,5,24)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20075)
+enclosing_stmt(#20088,#20075)
 exprContainers(#20088,#20001)
 #20090=*
 exprs(#20090,79,#20088,0,"r")
 hasLocation(#20090,#20033)
-enclosingStmt(#20090,#20075)
+enclosing_stmt(#20090,#20075)
 exprContainers(#20090,#20001)
 literals("r","r",#20090)
 bind(#20090,#20071)
@@ -278,19 +278,19 @@ exprs(#20091,13,#20088,1,"/[\x]+/.exec(""x"")")
 #20092=@"loc,{#10000},5,8,5,24"
 locations_default(#20092,#10000,5,8,5,24)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20075)
+enclosing_stmt(#20091,#20075)
 exprContainers(#20091,#20001)
 #20093=*
 exprs(#20093,14,#20091,-1,"/[\x]+/.exec")
 #20094=@"loc,{#10000},5,8,5,19"
 locations_default(#20094,#10000,5,8,5,19)
 hasLocation(#20093,#20094)
-enclosingStmt(#20093,#20075)
+enclosing_stmt(#20093,#20075)
 exprContainers(#20093,#20001)
 #20095=*
 exprs(#20095,5,#20093,0,"/[\x]+/")
 hasLocation(#20095,#20037)
-enclosingStmt(#20095,#20075)
+enclosing_stmt(#20095,#20075)
 exprContainers(#20095,#20001)
 literals("/[\x]+/","/[\x]+/",#20095)
 #20096=*
@@ -321,13 +321,13 @@ hasLocation(#20104,#20103)
 #20105=*
 exprs(#20105,0,#20093,1,"exec")
 hasLocation(#20105,#20041)
-enclosingStmt(#20105,#20075)
+enclosing_stmt(#20105,#20075)
 exprContainers(#20105,#20001)
 literals("exec","exec",#20105)
 #20106=*
 exprs(#20106,4,#20091,0,"""x""")
 hasLocation(#20106,#20045)
-enclosingStmt(#20106,#20075)
+enclosing_stmt(#20106,#20075)
 exprContainers(#20106,#20001)
 literals("x","""x""",#20106)
 #20107=*
@@ -341,25 +341,25 @@ exprs(#20109,15,#20084,1,"r[0]")
 #20110=@"loc,{#10000},5,30,5,33"
 locations_default(#20110,#10000,5,30,5,33)
 hasLocation(#20109,#20110)
-enclosingStmt(#20109,#20075)
+enclosing_stmt(#20109,#20075)
 exprContainers(#20109,#20001)
 #20111=*
 exprs(#20111,79,#20109,0,"r")
 hasLocation(#20111,#20053)
-enclosingStmt(#20111,#20075)
+enclosing_stmt(#20111,#20075)
 exprContainers(#20111,#20001)
 literals("r","r",#20111)
 bind(#20111,#20071)
 #20112=*
 exprs(#20112,3,#20109,1,"0")
 hasLocation(#20112,#20057)
-enclosingStmt(#20112,#20075)
+enclosing_stmt(#20112,#20075)
 exprContainers(#20112,#20001)
 literals("0","0",#20112)
 #20113=*
 exprs(#20113,4,#20077,2,"""Section 1""")
 hasLocation(#20113,#20063)
-enclosingStmt(#20113,#20075)
+enclosing_stmt(#20113,#20075)
 exprContainers(#20113,#20001)
 literals("Section 1","""Section 1""",#20113)
 #20114=*
diff --git a/javascript/extractor/tests/regexp/output/trap/tst.js.trap b/javascript/extractor/tests/regexp/output/trap/tst.js.trap
index 232de4fa791..8d19a4a435c 100644
Binary files a/javascript/extractor/tests/regexp/output/trap/tst.js.trap and b/javascript/extractor/tests/regexp/output/trap/tst.js.trap differ
diff --git a/javascript/extractor/tests/restprops/output/trap/tst.js.trap b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
index df9ba712449..45b59c28e3c 100644
--- a/javascript/extractor/tests/restprops/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
@@ -101,12 +101,12 @@ exprs(#20035,64,#20034,0,"f = ({...p}) => {}")
 #20036=@"loc,{#10000},1,5,1,22"
 locations_default(#20036,#10000,1,5,1,22)
 hasLocation(#20035,#20036)
-enclosingStmt(#20035,#20034)
+enclosing_stmt(#20035,#20034)
 exprContainers(#20035,#20001)
 #20037=*
 exprs(#20037,78,#20035,0,"f")
 hasLocation(#20037,#20007)
-enclosingStmt(#20037,#20034)
+enclosing_stmt(#20037,#20034)
 exprContainers(#20037,#20001)
 literals("f","f",#20037)
 decl(#20037,#20033)
@@ -115,7 +115,7 @@ exprs(#20038,65,#20035,1,"({...p}) => {}")
 #20039=@"loc,{#10000},1,9,1,22"
 locations_default(#20039,#10000,1,9,1,22)
 hasLocation(#20038,#20039)
-enclosingStmt(#20038,#20034)
+enclosing_stmt(#20038,#20034)
 exprContainers(#20038,#20001)
 #20040=*
 scopes(#20040,1)
diff --git a/javascript/extractor/tests/shebang/output/trap/tst.js.trap b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
index fabc408ffe4..01a79f9a411 100644
--- a/javascript/extractor/tests/shebang/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
@@ -81,12 +81,12 @@ exprs(#20028,13,#20027,0,"alert(""Hi!"")")
 #20029=@"loc,{#10000},2,1,2,12"
 locations_default(#20029,#10000,2,1,2,12)
 hasLocation(#20028,#20029)
-enclosingStmt(#20028,#20027)
+enclosing_stmt(#20028,#20027)
 exprContainers(#20028,#20001)
 #20030=*
 exprs(#20030,79,#20028,-1,"alert")
 hasLocation(#20030,#20005)
-enclosingStmt(#20030,#20027)
+enclosing_stmt(#20030,#20027)
 exprContainers(#20030,#20001)
 literals("alert","alert",#20030)
 #20031=@"var;{alert};{#20000}"
@@ -95,7 +95,7 @@ bind(#20030,#20031)
 #20032=*
 exprs(#20032,4,#20028,0,"""Hi!""")
 hasLocation(#20032,#20009)
-enclosingStmt(#20032,#20027)
+enclosing_stmt(#20032,#20027)
 exprContainers(#20032,#20001)
 literals("Hi!","""Hi!""",#20032)
 #20033=*
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
index 7b36f0f6983..7ef14a8a04d 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
@@ -93,7 +93,7 @@ stmt_containers(#20029,#20001)
 #20031=*
 typeexprs(#20031,1,#20029,0,"Foo")
 hasLocation(#20031,#20013)
-enclosingStmt(#20031,#20029)
+enclosing_stmt(#20031,#20029)
 exprContainers(#20031,#20001)
 literals("Foo","Foo",#20031)
 typedecl(#20031,#20028)
@@ -105,14 +105,14 @@ hasLocation(#20032,#20033)
 #20034=*
 exprs(#20034,0,#20032,0,"x")
 hasLocation(#20034,#20017)
-enclosingStmt(#20034,#20029)
+enclosing_stmt(#20034,#20029)
 exprContainers(#20034,#20001)
 literals("x","x",#20034)
 isAbstractMember(#20032)
 #20035=*
 typeexprs(#20035,2,#20032,2,"number")
 hasLocation(#20035,#20021)
-enclosingStmt(#20035,#20029)
+enclosing_stmt(#20035,#20029)
 exprContainers(#20035,#20001)
 literals("number","number",#20035)
 #20036=*
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
index 9ee33c24525..8b0b99a8691 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
@@ -87,7 +87,7 @@ stmt_containers(#20027,#20001)
 #20029=*
 typeexprs(#20029,1,#20027,0,"Foo")
 hasLocation(#20029,#20011)
-enclosingStmt(#20029,#20027)
+enclosing_stmt(#20029,#20027)
 exprContainers(#20029,#20001)
 literals("Foo","Foo",#20029)
 typedecl(#20029,#20026)
@@ -99,14 +99,14 @@ hasLocation(#20030,#20031)
 #20032=*
 exprs(#20032,0,#20030,0,"x")
 hasLocation(#20032,#20015)
-enclosingStmt(#20032,#20027)
+enclosing_stmt(#20032,#20027)
 exprContainers(#20032,#20001)
 literals("x","x",#20032)
 isAbstractMember(#20030)
 #20033=*
 typeexprs(#20033,2,#20030,2,"number")
 hasLocation(#20033,#20019)
-enclosingStmt(#20033,#20027)
+enclosing_stmt(#20033,#20027)
 exprContainers(#20033,#20001)
 literals("number","number",#20033)
 #20034=*
diff --git a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
index 7b3d0766fc6..fb542227d12 100644
--- a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
@@ -239,7 +239,7 @@ stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,2,#20083,0,"true")
 hasLocation(#20085,#20031)
-enclosingStmt(#20085,#20083)
+enclosing_stmt(#20085,#20083)
 exprContainers(#20085,#20001)
 literals("true","true",#20085)
 #20086=*
@@ -255,7 +255,7 @@ stmt_containers(#20087,#20001)
 #20089=*
 exprs(#20089,79,#20087,0,"b")
 hasLocation(#20089,#20041)
-enclosingStmt(#20089,#20087)
+enclosing_stmt(#20089,#20087)
 exprContainers(#20089,#20001)
 literals("b","b",#20089)
 #20090=@"var;{b};{#20000}"
@@ -278,7 +278,7 @@ stmt_containers(#20093,#20001)
 #20095=*
 exprs(#20095,79,#20093,-1,"b")
 hasLocation(#20095,#20054)
-enclosingStmt(#20095,#20093)
+enclosing_stmt(#20095,#20093)
 exprContainers(#20095,#20001)
 literals("b","b",#20095)
 bind(#20095,#20090)
@@ -289,7 +289,7 @@ stmt_containers(#20096,#20001)
 #20097=*
 exprs(#20097,3,#20096,-1,"23")
 hasLocation(#20097,#20062)
-enclosingStmt(#20097,#20096)
+enclosing_stmt(#20097,#20096)
 exprContainers(#20097,#20001)
 literals("23","23",#20097)
 #20098=*
@@ -301,7 +301,7 @@ stmt_containers(#20098,#20001)
 #20100=*
 exprs(#20100,79,#20098,-1,"c")
 hasLocation(#20100,#20068)
-enclosingStmt(#20100,#20098)
+enclosing_stmt(#20100,#20098)
 exprContainers(#20100,#20001)
 literals("c","c",#20100)
 #20101=@"var;{c};{#20000}"
diff --git a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
index b295cfa8c3b..cc26778068d 100644
--- a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
@@ -163,7 +163,7 @@ stmt_containers(#20059,#20001)
 #20060=*
 exprs(#20060,79,#20059,1,"b")
 hasLocation(#20060,#20021)
-enclosingStmt(#20060,#20059)
+enclosing_stmt(#20060,#20059)
 exprContainers(#20060,#20001)
 literals("b","b",#20060)
 #20061=@"var;{b};{#20000}"
@@ -172,7 +172,7 @@ bind(#20060,#20061)
 #20062=*
 exprs(#20062,79,#20059,0,"a")
 hasLocation(#20062,#20013)
-enclosingStmt(#20062,#20059)
+enclosing_stmt(#20062,#20059)
 exprContainers(#20062,#20001)
 literals("a","a",#20062)
 #20063=@"var;{a};{#20000}"
@@ -181,7 +181,7 @@ bind(#20062,#20063)
 #20064=*
 exprs(#20064,3,#20059,-1,"1")
 hasLocation(#20064,#20017)
-enclosingStmt(#20064,#20059)
+enclosing_stmt(#20064,#20059)
 exprContainers(#20064,#20001)
 literals("1","1",#20064)
 #20065=*
@@ -195,12 +195,12 @@ exprs(#20067,13,#20065,0,"f()")
 #20068=@"loc,{#10000},1,18,1,20"
 locations_default(#20068,#10000,1,18,1,20)
 hasLocation(#20067,#20068)
-enclosingStmt(#20067,#20065)
+enclosing_stmt(#20067,#20065)
 exprContainers(#20067,#20001)
 #20069=*
 exprs(#20069,79,#20067,-1,"f")
 hasLocation(#20069,#20025)
-enclosingStmt(#20069,#20065)
+enclosing_stmt(#20069,#20065)
 exprContainers(#20069,#20001)
 literals("f","f",#20069)
 #20070=@"var;{f};{#20000}"
@@ -213,7 +213,7 @@ stmt_containers(#20071,#20001)
 #20072=*
 exprs(#20072,79,#20071,1,"d")
 hasLocation(#20072,#20045)
-enclosingStmt(#20072,#20071)
+enclosing_stmt(#20072,#20071)
 exprContainers(#20072,#20001)
 literals("d","d",#20072)
 #20073=@"var;{d};{#20000}"
@@ -222,7 +222,7 @@ bind(#20072,#20073)
 #20074=*
 exprs(#20074,79,#20071,0,"c")
 hasLocation(#20074,#20037)
-enclosingStmt(#20074,#20071)
+enclosing_stmt(#20074,#20071)
 exprContainers(#20074,#20001)
 literals("c","c",#20074)
 #20075=@"var;{c};{#20000}"
@@ -231,7 +231,7 @@ bind(#20074,#20075)
 #20076=*
 exprs(#20076,3,#20071,-1,"0")
 hasLocation(#20076,#20041)
-enclosingStmt(#20076,#20071)
+enclosing_stmt(#20076,#20071)
 exprContainers(#20076,#20001)
 literals("0","0",#20076)
 #20077=*
@@ -245,12 +245,12 @@ exprs(#20079,13,#20077,0,"g()")
 #20080=@"loc,{#10000},3,18,3,20"
 locations_default(#20080,#10000,3,18,3,20)
 hasLocation(#20079,#20080)
-enclosingStmt(#20079,#20077)
+enclosing_stmt(#20079,#20077)
 exprContainers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,-1,"g")
 hasLocation(#20081,#20049)
-enclosingStmt(#20081,#20077)
+enclosing_stmt(#20081,#20077)
 exprContainers(#20081,#20001)
 literals("g","g",#20081)
 #20082=@"var;{g};{#20000}"
diff --git a/javascript/extractor/tests/stmts/output/trap/functions.js.trap b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
index b4fa39350b2..e3caf6f2416 100644
--- a/javascript/extractor/tests/stmts/output/trap/functions.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
@@ -361,19 +361,19 @@ exprs(#20128,34,#20126,0,"x+y")
 #20129=@"loc,{#10000},2,12,2,14"
 locations_default(#20129,#10000,2,12,2,14)
 hasLocation(#20128,#20129)
-enclosingStmt(#20128,#20126)
+enclosing_stmt(#20128,#20126)
 exprContainers(#20128,#20115)
 #20130=*
 exprs(#20130,79,#20128,0,"x")
 hasLocation(#20130,#20047)
-enclosingStmt(#20130,#20126)
+enclosing_stmt(#20130,#20126)
 exprContainers(#20130,#20115)
 literals("x","x",#20130)
 bind(#20130,#20119)
 #20131=*
 exprs(#20131,79,#20128,1,"y")
 hasLocation(#20131,#20051)
-enclosingStmt(#20131,#20126)
+enclosing_stmt(#20131,#20126)
 exprContainers(#20131,#20115)
 literals("y","y",#20131)
 bind(#20131,#20121)
@@ -409,12 +409,12 @@ stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,47,#20138,0,"k = fun ... turn;\n}")
 hasLocation(#20140,#20139)
-enclosingStmt(#20140,#20138)
+enclosing_stmt(#20140,#20138)
 exprContainers(#20140,#20001)
 #20141=*
 exprs(#20141,79,#20140,0,"k")
 hasLocation(#20141,#20068)
-enclosingStmt(#20141,#20138)
+enclosing_stmt(#20141,#20138)
 exprContainers(#20141,#20001)
 literals("k","k",#20141)
 #20142=@"var;{k};{#20000}"
@@ -425,7 +425,7 @@ exprs(#20143,9,#20140,1,"functio ... turn;\n}")
 #20144=@"loc,{#10000},7,5,9,1"
 locations_default(#20144,#10000,7,5,9,1)
 hasLocation(#20143,#20144)
-enclosingStmt(#20143,#20138)
+enclosing_stmt(#20143,#20138)
 exprContainers(#20143,#20001)
 #20145=*
 scopes(#20145,1)
@@ -453,12 +453,12 @@ stmt_containers(#20151,#20001)
 #20152=*
 exprs(#20152,47,#20151,0,"l = function f() {}")
 hasLocation(#20152,#20023)
-enclosingStmt(#20152,#20151)
+enclosing_stmt(#20152,#20151)
 exprContainers(#20152,#20001)
 #20153=*
 exprs(#20153,79,#20152,0,"l")
 hasLocation(#20153,#20085)
-enclosingStmt(#20153,#20151)
+enclosing_stmt(#20153,#20151)
 exprContainers(#20153,#20001)
 literals("l","l",#20153)
 #20154=@"var;{l};{#20000}"
@@ -469,7 +469,7 @@ exprs(#20155,9,#20152,1,"function f() {}")
 #20156=@"loc,{#10000},11,5,11,19"
 locations_default(#20156,#10000,11,5,11,19)
 hasLocation(#20155,#20156)
-enclosingStmt(#20155,#20151)
+enclosing_stmt(#20155,#20151)
 exprContainers(#20155,#20001)
 #20157=*
 scopes(#20157,1)
@@ -499,7 +499,7 @@ stmt_containers(#20163,#20001)
 #20164=*
 exprs(#20164,9,#20163,0,"function() {}")
 hasLocation(#20164,#20027)
-enclosingStmt(#20164,#20163)
+enclosing_stmt(#20164,#20163)
 exprContainers(#20164,#20001)
 #20165=*
 scopes(#20165,1)
diff --git a/javascript/extractor/tests/stmts/output/trap/loops.js.trap b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
index 9d437f3c932..f5e352c253f 100644
--- a/javascript/extractor/tests/stmts/output/trap/loops.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
@@ -627,7 +627,7 @@ stmt_containers(#20233,#20001)
 #20235=*
 exprs(#20235,2,#20233,0,"true")
 hasLocation(#20235,#20049)
-enclosingStmt(#20235,#20233)
+enclosing_stmt(#20235,#20233)
 exprContainers(#20235,#20001)
 literals("true","true",#20235)
 #20236=*
@@ -643,7 +643,7 @@ stmt_containers(#20237,#20001)
 #20239=*
 exprs(#20239,0,#20237,0,"outer")
 hasLocation(#20239,#20055)
-enclosingStmt(#20239,#20237)
+enclosing_stmt(#20239,#20237)
 exprContainers(#20239,#20001)
 literals("outer","outer",#20239)
 #20240=*
@@ -655,7 +655,7 @@ stmt_containers(#20240,#20001)
 #20242=*
 exprs(#20242,79,#20240,1,"b")
 hasLocation(#20242,#20067)
-enclosingStmt(#20242,#20240)
+enclosing_stmt(#20242,#20240)
 exprContainers(#20242,#20001)
 literals("b","b",#20242)
 #20243=@"var;{b};{#20000}"
@@ -664,7 +664,7 @@ bind(#20242,#20243)
 #20244=*
 exprs(#20244,79,#20240,2,"c")
 hasLocation(#20244,#20071)
-enclosingStmt(#20244,#20240)
+enclosing_stmt(#20244,#20240)
 exprContainers(#20244,#20001)
 literals("c","c",#20244)
 #20245=@"var;{c};{#20000}"
@@ -673,7 +673,7 @@ bind(#20244,#20245)
 #20246=*
 exprs(#20246,79,#20240,0,"a")
 hasLocation(#20246,#20063)
-enclosingStmt(#20246,#20240)
+enclosing_stmt(#20246,#20240)
 exprContainers(#20246,#20001)
 literals("a","a",#20246)
 #20247=@"var;{a};{#20000}"
@@ -700,7 +700,7 @@ stmt_containers(#20252,#20001)
 #20254=*
 exprs(#20254,79,#20252,0,"d")
 hasLocation(#20254,#20091)
-enclosingStmt(#20254,#20252)
+enclosing_stmt(#20254,#20252)
 exprContainers(#20254,#20001)
 literals("d","d",#20254)
 #20255=@"var;{d};{#20000}"
@@ -715,7 +715,7 @@ stmt_containers(#20256,#20001)
 #20258=*
 exprs(#20258,0,#20256,0,"outer")
 hasLocation(#20258,#20097)
-enclosingStmt(#20258,#20256)
+enclosing_stmt(#20258,#20256)
 exprContainers(#20258,#20001)
 literals("outer","outer",#20258)
 jump_targets(#20256,#20237)
@@ -728,7 +728,7 @@ stmt_containers(#20259,#20001)
 #20261=*
 exprs(#20261,79,#20259,0,"e")
 hasLocation(#20261,#20107)
-enclosingStmt(#20261,#20259)
+enclosing_stmt(#20261,#20259)
 exprContainers(#20261,#20001)
 literals("e","e",#20261)
 #20262=@"var;{e};{#20000}"
@@ -743,7 +743,7 @@ stmt_containers(#20263,#20001)
 #20265=*
 exprs(#20265,0,#20263,0,"outer")
 hasLocation(#20265,#20113)
-enclosingStmt(#20265,#20263)
+enclosing_stmt(#20265,#20263)
 exprContainers(#20265,#20001)
 literals("outer","outer",#20265)
 jump_targets(#20263,#20237)
@@ -763,7 +763,7 @@ stmt_containers(#20268,#20001)
 #20270=*
 exprs(#20270,79,#20268,1,"a")
 hasLocation(#20270,#20136)
-enclosingStmt(#20270,#20268)
+enclosing_stmt(#20270,#20268)
 exprContainers(#20270,#20001)
 literals("a","a",#20270)
 bind(#20270,#20247)
@@ -786,19 +786,19 @@ exprs(#20275,27,#20274,1,"i<n")
 #20276=@"loc,{#10000},17,20,17,22"
 locations_default(#20276,#10000,17,20,17,22)
 hasLocation(#20275,#20276)
-enclosingStmt(#20275,#20274)
+enclosing_stmt(#20275,#20274)
 exprContainers(#20275,#20001)
 #20277=*
 exprs(#20277,79,#20275,0,"i")
 hasLocation(#20277,#20164)
-enclosingStmt(#20277,#20274)
+enclosing_stmt(#20277,#20274)
 exprContainers(#20277,#20001)
 literals("i","i",#20277)
 bind(#20277,#20230)
 #20278=*
 exprs(#20278,79,#20275,1,"n")
 hasLocation(#20278,#20168)
-enclosingStmt(#20278,#20274)
+enclosing_stmt(#20278,#20274)
 exprContainers(#20278,#20001)
 literals("n","n",#20278)
 bind(#20278,#20231)
@@ -807,12 +807,12 @@ exprs(#20279,59,#20274,2,"++i")
 #20280=@"loc,{#10000},17,25,17,27"
 locations_default(#20280,#10000,17,25,17,27)
 hasLocation(#20279,#20280)
-enclosingStmt(#20279,#20274)
+enclosing_stmt(#20279,#20274)
 exprContainers(#20279,#20001)
 #20281=*
 exprs(#20281,79,#20279,0,"i")
 hasLocation(#20281,#20174)
-enclosingStmt(#20281,#20274)
+enclosing_stmt(#20281,#20274)
 exprContainers(#20281,#20001)
 literals("i","i",#20281)
 bind(#20281,#20230)
@@ -827,19 +827,19 @@ exprs(#20284,64,#20282,0,"i=0")
 #20285=@"loc,{#10000},17,10,17,12"
 locations_default(#20285,#10000,17,10,17,12)
 hasLocation(#20284,#20285)
-enclosingStmt(#20284,#20282)
+enclosing_stmt(#20284,#20282)
 exprContainers(#20284,#20001)
 #20286=*
 exprs(#20286,78,#20284,0,"i")
 hasLocation(#20286,#20148)
-enclosingStmt(#20286,#20282)
+enclosing_stmt(#20286,#20282)
 exprContainers(#20286,#20001)
 literals("i","i",#20286)
 decl(#20286,#20230)
 #20287=*
 exprs(#20287,3,#20284,1,"0")
 hasLocation(#20287,#20152)
-enclosingStmt(#20287,#20282)
+enclosing_stmt(#20287,#20282)
 exprContainers(#20287,#20001)
 literals("0","0",#20287)
 #20288=*
@@ -847,19 +847,19 @@ exprs(#20288,64,#20282,1,"n=10")
 #20289=@"loc,{#10000},17,14,17,17"
 locations_default(#20289,#10000,17,14,17,17)
 hasLocation(#20288,#20289)
-enclosingStmt(#20288,#20282)
+enclosing_stmt(#20288,#20282)
 exprContainers(#20288,#20001)
 #20290=*
 exprs(#20290,78,#20288,0,"n")
 hasLocation(#20290,#20156)
-enclosingStmt(#20290,#20282)
+enclosing_stmt(#20290,#20282)
 exprContainers(#20290,#20001)
 literals("n","n",#20290)
 decl(#20290,#20231)
 #20291=*
 exprs(#20291,3,#20288,1,"10")
 hasLocation(#20291,#20160)
-enclosingStmt(#20291,#20282)
+enclosing_stmt(#20291,#20282)
 exprContainers(#20291,#20001)
 literals("10","10",#20291)
 #20292=*
@@ -873,7 +873,7 @@ stmt_containers(#20293,#20001)
 #20294=*
 exprs(#20294,79,#20293,1,"xs")
 hasLocation(#20294,#20190)
-enclosingStmt(#20294,#20293)
+enclosing_stmt(#20294,#20293)
 exprContainers(#20294,#20001)
 literals("xs","xs",#20294)
 #20295=@"var;{xs};{#20000}"
@@ -888,12 +888,12 @@ stmt_containers(#20296,#20001)
 #20298=*
 exprs(#20298,64,#20296,0,"x")
 hasLocation(#20298,#20186)
-enclosingStmt(#20298,#20296)
+enclosing_stmt(#20298,#20296)
 exprContainers(#20298,#20001)
 #20299=*
 exprs(#20299,78,#20298,0,"x")
 hasLocation(#20299,#20186)
-enclosingStmt(#20299,#20296)
+enclosing_stmt(#20299,#20296)
 exprContainers(#20299,#20001)
 literals("x","x",#20299)
 decl(#20299,#20232)
@@ -908,14 +908,14 @@ stmt_containers(#20301,#20001)
 #20302=*
 exprs(#20302,79,#20301,1,"xs")
 hasLocation(#20302,#20204)
-enclosingStmt(#20302,#20301)
+enclosing_stmt(#20302,#20301)
 exprContainers(#20302,#20001)
 literals("xs","xs",#20302)
 bind(#20302,#20295)
 #20303=*
 exprs(#20303,79,#20301,0,"x")
 hasLocation(#20303,#20200)
-enclosingStmt(#20303,#20301)
+enclosing_stmt(#20303,#20301)
 exprContainers(#20303,#20001)
 literals("x","x",#20303)
 bind(#20303,#20232)
@@ -930,7 +930,7 @@ stmt_containers(#20305,#20001)
 #20306=*
 exprs(#20306,79,#20305,1,"xs")
 hasLocation(#20306,#20222)
-enclosingStmt(#20306,#20305)
+enclosing_stmt(#20306,#20305)
 exprContainers(#20306,#20001)
 literals("xs","xs",#20306)
 bind(#20306,#20295)
@@ -939,19 +939,19 @@ exprs(#20307,14,#20305,0,"x.f")
 #20308=@"loc,{#10000},21,6,21,8"
 locations_default(#20308,#10000,21,6,21,8)
 hasLocation(#20307,#20308)
-enclosingStmt(#20307,#20305)
+enclosing_stmt(#20307,#20305)
 exprContainers(#20307,#20001)
 #20309=*
 exprs(#20309,79,#20307,0,"x")
 hasLocation(#20309,#20214)
-enclosingStmt(#20309,#20305)
+enclosing_stmt(#20309,#20305)
 exprContainers(#20309,#20001)
 literals("x","x",#20309)
 bind(#20309,#20232)
 #20310=*
 exprs(#20310,0,#20307,1,"f")
 hasLocation(#20310,#20218)
-enclosingStmt(#20310,#20305)
+enclosing_stmt(#20310,#20305)
 exprContainers(#20310,#20001)
 literals("f","f",#20310)
 #20311=*
diff --git a/javascript/extractor/tests/stmts/output/trap/others.js.trap b/javascript/extractor/tests/stmts/output/trap/others.js.trap
index f62c9b60cb6..fcc860e0279 100644
--- a/javascript/extractor/tests/stmts/output/trap/others.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/others.js.trap
@@ -128,7 +128,7 @@ stmt_containers(#20044,#20001)
 #20046=*
 exprs(#20046,79,#20044,0,"a")
 hasLocation(#20046,#20015)
-enclosingStmt(#20046,#20044)
+enclosing_stmt(#20046,#20044)
 exprContainers(#20046,#20001)
 literals("a","a",#20046)
 #20047=@"var;{a};{#20000}"
@@ -153,30 +153,30 @@ exprs(#20052,64,#20051,0,"x = 23")
 #20053=@"loc,{#10000},4,5,4,10"
 locations_default(#20053,#10000,4,5,4,10)
 hasLocation(#20052,#20053)
-enclosingStmt(#20052,#20051)
+enclosing_stmt(#20052,#20051)
 exprContainers(#20052,#20001)
 #20054=*
 exprs(#20054,78,#20052,0,"x")
 hasLocation(#20054,#20028)
-enclosingStmt(#20054,#20051)
+enclosing_stmt(#20054,#20051)
 exprContainers(#20054,#20001)
 literals("x","x",#20054)
 decl(#20054,#20042)
 #20055=*
 exprs(#20055,3,#20052,1,"23")
 hasLocation(#20055,#20032)
-enclosingStmt(#20055,#20051)
+enclosing_stmt(#20055,#20051)
 exprContainers(#20055,#20001)
 literals("23","23",#20055)
 #20056=*
 exprs(#20056,64,#20051,1,"y")
 hasLocation(#20056,#20036)
-enclosingStmt(#20056,#20051)
+enclosing_stmt(#20056,#20051)
 exprContainers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,0,"y")
 hasLocation(#20057,#20036)
-enclosingStmt(#20057,#20051)
+enclosing_stmt(#20057,#20051)
 exprContainers(#20057,#20001)
 literals("y","y",#20057)
 decl(#20057,#20043)
diff --git a/javascript/extractor/tests/stmts/output/trap/switch.js.trap b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
index 78bdedbec65..a2e6501d55f 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
@@ -368,7 +368,7 @@ stmt_containers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,-1,"x")
 hasLocation(#20132,#20041)
-enclosingStmt(#20132,#20130)
+enclosing_stmt(#20132,#20130)
 exprContainers(#20132,#20001)
 literals("x","x",#20132)
 #20133=@"var;{x};{#20000}"
@@ -396,7 +396,7 @@ stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,3,#20138,-1,"23")
 hasLocation(#20140,#20057)
-enclosingStmt(#20140,#20138)
+enclosing_stmt(#20140,#20138)
 exprContainers(#20140,#20001)
 literals("23","23",#20140)
 #20141=*
@@ -410,19 +410,19 @@ exprs(#20143,48,#20141,0,"x += 19")
 #20144=@"loc,{#10000},5,5,5,11"
 locations_default(#20144,#10000,5,5,5,11)
 hasLocation(#20143,#20144)
-enclosingStmt(#20143,#20141)
+enclosing_stmt(#20143,#20141)
 exprContainers(#20143,#20001)
 #20145=*
 exprs(#20145,79,#20143,0,"x")
 hasLocation(#20145,#20061)
-enclosingStmt(#20145,#20141)
+enclosing_stmt(#20145,#20141)
 exprContainers(#20145,#20001)
 literals("x","x",#20145)
 bind(#20145,#20133)
 #20146=*
 exprs(#20146,3,#20143,1,"19")
 hasLocation(#20146,#20065)
-enclosingStmt(#20146,#20141)
+enclosing_stmt(#20146,#20141)
 exprContainers(#20146,#20001)
 literals("19","19",#20146)
 #20147=*
@@ -459,7 +459,7 @@ stmt_containers(#20154,#20147)
 #20156=*
 exprs(#20156,79,#20154,-1,"x")
 hasLocation(#20156,#20084)
-enclosingStmt(#20156,#20154)
+enclosing_stmt(#20156,#20154)
 exprContainers(#20156,#20147)
 literals("x","x",#20156)
 bind(#20156,#20133)
@@ -472,7 +472,7 @@ stmt_containers(#20157,#20147)
 #20159=*
 exprs(#20159,3,#20157,-1,"0")
 hasLocation(#20159,#20092)
-enclosingStmt(#20159,#20157)
+enclosing_stmt(#20159,#20157)
 exprContainers(#20159,#20147)
 literals("0","0",#20159)
 #20160=*
@@ -484,7 +484,7 @@ stmt_containers(#20160,#20147)
 #20162=*
 exprs(#20162,3,#20160,0,"23")
 hasLocation(#20162,#20098)
-enclosingStmt(#20162,#20160)
+enclosing_stmt(#20162,#20160)
 exprContainers(#20162,#20147)
 literals("23","23",#20162)
 #20163=*
@@ -502,7 +502,7 @@ stmt_containers(#20165,#20147)
 #20167=*
 exprs(#20167,3,#20165,0,"42")
 hasLocation(#20167,#20108)
-enclosingStmt(#20167,#20165)
+enclosing_stmt(#20167,#20165)
 exprContainers(#20167,#20147)
 literals("42","42",#20167)
 #20168=*
@@ -514,7 +514,7 @@ stmt_containers(#20168,#20147)
 #20170=*
 exprs(#20170,3,#20168,-1,"1")
 hasLocation(#20170,#20114)
-enclosingStmt(#20170,#20168)
+enclosing_stmt(#20170,#20168)
 exprContainers(#20170,#20147)
 literals("1","1",#20170)
 #20171=*
@@ -526,7 +526,7 @@ stmt_containers(#20171,#20147)
 #20173=*
 exprs(#20173,3,#20171,0,"56")
 hasLocation(#20173,#20120)
-enclosingStmt(#20173,#20171)
+enclosing_stmt(#20173,#20171)
 exprContainers(#20173,#20147)
 literals("56","56",#20173)
 #20174=*
diff --git a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
index 83139933313..fb1268a1888 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
@@ -244,7 +244,7 @@ stmt_containers(#20082,#20075)
 #20084=*
 exprs(#20084,79,#20082,-1,"x")
 hasLocation(#20084,#20035)
-enclosingStmt(#20084,#20082)
+enclosing_stmt(#20084,#20082)
 exprContainers(#20084,#20075)
 literals("x","x",#20084)
 #20085=@"var;{x};{#20000}"
@@ -259,7 +259,7 @@ stmt_containers(#20086,#20075)
 #20088=*
 exprs(#20088,3,#20086,-1,"0")
 hasLocation(#20088,#20043)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20075)
 literals("0","0",#20088)
 #20089=*
@@ -277,7 +277,7 @@ stmt_containers(#20091,#20075)
 #20093=*
 exprs(#20093,3,#20091,0,"42")
 hasLocation(#20093,#20053)
-enclosingStmt(#20093,#20091)
+enclosing_stmt(#20093,#20091)
 exprContainers(#20093,#20075)
 literals("42","42",#20093)
 #20094=*
@@ -289,7 +289,7 @@ stmt_containers(#20094,#20075)
 #20096=*
 exprs(#20096,3,#20094,-1,"1")
 hasLocation(#20096,#20059)
-enclosingStmt(#20096,#20094)
+enclosing_stmt(#20096,#20094)
 exprContainers(#20096,#20075)
 literals("1","1",#20096)
 #20097=*
@@ -301,7 +301,7 @@ stmt_containers(#20097,#20075)
 #20099=*
 exprs(#20099,3,#20097,0,"56")
 hasLocation(#20099,#20065)
-enclosingStmt(#20099,#20097)
+enclosing_stmt(#20099,#20097)
 exprContainers(#20099,#20075)
 literals("56","56",#20099)
 #20100=*
diff --git a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
index ea92e78d2fc..c510bca059b 100644
--- a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
@@ -62,7 +62,7 @@ stmt_containers(#20019,#20001)
 #20020=*
 exprs(#20020,79,#20019,-1,"x")
 hasLocation(#20020,#20009)
-enclosingStmt(#20020,#20019)
+enclosing_stmt(#20020,#20019)
 exprContainers(#20020,#20001)
 literals("x","x",#20020)
 #20021=@"var;{x};{#20000}"
diff --git a/javascript/extractor/tests/stmts/output/trap/try.js.trap b/javascript/extractor/tests/stmts/output/trap/try.js.trap
index 73f57d6b227..2f18825bdf9 100644
--- a/javascript/extractor/tests/stmts/output/trap/try.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/try.js.trap
@@ -230,7 +230,7 @@ stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""!""")
 hasLocation(#20085,#20019)
-enclosingStmt(#20085,#20083)
+enclosing_stmt(#20085,#20083)
 exprContainers(#20085,#20001)
 literals("!","""!""",#20085)
 #20086=*
@@ -254,7 +254,7 @@ variables(#20091,"x",#20090)
 #20092=*
 exprs(#20092,78,#20088,0,"x")
 hasLocation(#20092,#20029)
-enclosingStmt(#20092,#20088)
+enclosing_stmt(#20092,#20088)
 exprContainers(#20092,#20001)
 literals("x","x",#20092)
 decl(#20092,#20091)
@@ -313,7 +313,7 @@ variables(#20108,"x",#20107)
 #20109=*
 exprs(#20109,78,#20105,0,"x")
 hasLocation(#20109,#20063)
-enclosingStmt(#20109,#20105)
+enclosing_stmt(#20109,#20105)
 exprContainers(#20109,#20001)
 literals("x","x",#20109)
 decl(#20109,#20108)
diff --git a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
index defcb502a44..1b6589e0384 100644
--- a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
@@ -136,7 +136,7 @@ stmt_containers(#20043,#20037)
 #20045=*
 exprs(#20045,4,#20043,0,"'use strict'")
 hasLocation(#20045,#20021)
-enclosingStmt(#20045,#20043)
+enclosing_stmt(#20045,#20043)
 exprContainers(#20045,#20037)
 literals("use strict","'use strict'",#20045)
 #20046=*
@@ -156,19 +156,19 @@ exprs(#20050,47,#20048,0,"arguments = 42")
 #20051=@"loc,{#10000},3,3,3,16"
 locations_default(#20051,#10000,3,3,3,16)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20048)
+enclosing_stmt(#20050,#20048)
 exprContainers(#20050,#20037)
 #20052=*
 exprs(#20052,79,#20050,0,"arguments")
 hasLocation(#20052,#20025)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20037)
 literals("arguments","arguments",#20052)
 bind(#20052,#20040)
 #20053=*
 exprs(#20053,3,#20050,1,"42")
 hasLocation(#20053,#20029)
-enclosingStmt(#20053,#20048)
+enclosing_stmt(#20053,#20048)
 exprContainers(#20053,#20037)
 literals("42","42",#20053)
 #20054=*
diff --git a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
index 6cd340c65d2..289db740933 100644
--- a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
@@ -50,7 +50,7 @@ stmt_containers(#20014,#20001)
 #20015=*
 exprs(#20015,4,#20014,0,"'use strict'")
 hasLocation(#20015,#20007)
-enclosingStmt(#20015,#20014)
+enclosing_stmt(#20015,#20014)
 exprContainers(#20015,#20001)
 literals("use strict","'use strict'",#20015)
 #20016=*
diff --git a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
index 719cb65d800..c72700c5a94 100644
--- a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
@@ -98,26 +98,26 @@ exprs(#20034,64,#20033,0,"[x,y] = [1,2]")
 #20035=@"loc,{#10000},1,5,1,17"
 locations_default(#20035,#10000,1,5,1,17)
 hasLocation(#20034,#20035)
-enclosingStmt(#20034,#20033)
+enclosing_stmt(#20034,#20033)
 exprContainers(#20034,#20001)
 #20036=*
 exprs(#20036,67,#20034,0,"[x,y]")
 #20037=@"loc,{#10000},1,5,1,9"
 locations_default(#20037,#10000,1,5,1,9)
 hasLocation(#20036,#20037)
-enclosingStmt(#20036,#20033)
+enclosing_stmt(#20036,#20033)
 exprContainers(#20036,#20001)
 #20038=*
 exprs(#20038,78,#20036,0,"x")
 hasLocation(#20038,#20009)
-enclosingStmt(#20038,#20033)
+enclosing_stmt(#20038,#20033)
 exprContainers(#20038,#20001)
 literals("x","x",#20038)
 decl(#20038,#20031)
 #20039=*
 exprs(#20039,78,#20036,1,"y")
 hasLocation(#20039,#20013)
-enclosingStmt(#20039,#20033)
+enclosing_stmt(#20039,#20033)
 exprContainers(#20039,#20001)
 literals("y","y",#20039)
 decl(#20039,#20032)
@@ -127,18 +127,18 @@ exprs(#20040,7,#20034,1,"[1,2]")
 #20041=@"loc,{#10000},1,13,1,17"
 locations_default(#20041,#10000,1,13,1,17)
 hasLocation(#20040,#20041)
-enclosingStmt(#20040,#20033)
+enclosing_stmt(#20040,#20033)
 exprContainers(#20040,#20001)
 #20042=*
 exprs(#20042,3,#20040,0,"1")
 hasLocation(#20042,#20021)
-enclosingStmt(#20042,#20033)
+enclosing_stmt(#20042,#20033)
 exprContainers(#20042,#20001)
 literals("1","1",#20042)
 #20043=*
 exprs(#20043,3,#20040,1,"2")
 hasLocation(#20043,#20025)
-enclosingStmt(#20043,#20033)
+enclosing_stmt(#20043,#20033)
 exprContainers(#20043,#20001)
 literals("2","2",#20043)
 arraySize(#20040,2)
diff --git a/javascript/extractor/tests/ts/output/trap/bom.ts.trap b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
index 8207257121e..5e20dd28f86 100644
--- a/javascript/extractor/tests/ts/output/trap/bom.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
@@ -35,7 +35,7 @@ stmt_containers(#20008,#20001)
 #20009=*
 exprs(#20009,3,#20008,0,"42")
 hasLocation(#20009,#20003)
-enclosingStmt(#20009,#20008)
+enclosing_stmt(#20009,#20008)
 exprContainers(#20009,#20001)
 literals("42","42",#20009)
 #20010=*
diff --git a/javascript/extractor/tests/ts/output/trap/classes.ts.trap b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
index 011efe8d556..6217e26cb9a 100644
--- a/javascript/extractor/tests/ts/output/trap/classes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
@@ -111,7 +111,7 @@ isAbstractClass(#20037)
 #20039=*
 exprs(#20039,78,#20037,0,"C")
 hasLocation(#20039,#20011)
-enclosingStmt(#20039,#20037)
+enclosing_stmt(#20039,#20037)
 exprContainers(#20039,#20001)
 literals("C","C",#20039)
 decl(#20039,#20035)
@@ -125,24 +125,24 @@ typeexprs(#20041,14,#20037,-1,"E<F>")
 #20042=@"loc,{#10000},1,40,1,43"
 locations_default(#20042,#10000,1,40,1,43)
 hasLocation(#20041,#20042)
-enclosingStmt(#20041,#20037)
+enclosing_stmt(#20041,#20037)
 exprContainers(#20041,#20001)
 #20043=*
 typeexprs(#20043,0,#20041,-1,"E")
 hasLocation(#20043,#20021)
-enclosingStmt(#20043,#20037)
+enclosing_stmt(#20043,#20037)
 exprContainers(#20043,#20001)
 literals("E","E",#20043)
 #20044=*
 typeexprs(#20044,0,#20041,0,"F")
 hasLocation(#20044,#20025)
-enclosingStmt(#20044,#20037)
+enclosing_stmt(#20044,#20037)
 exprContainers(#20044,#20001)
 literals("F","F",#20044)
 #20045=*
 exprs(#20045,79,#20037,1,"D")
 hasLocation(#20045,#20015)
-enclosingStmt(#20045,#20037)
+enclosing_stmt(#20045,#20037)
 exprContainers(#20045,#20001)
 literals("D","D",#20045)
 #20046=@"var;{D};{#20000}"
@@ -156,13 +156,13 @@ hasLocation(#20047,#20048)
 #20049=*
 exprs(#20049,0,#20047,0,"constructor")
 hasLocation(#20049,#20048)
-enclosingStmt(#20049,#20037)
+enclosing_stmt(#20049,#20037)
 exprContainers(#20049,#20001)
 literals("constructor","constructor",#20049)
 #20050=*
 exprs(#20050,9,#20047,1,"(...arg ... rgs); }")
 hasLocation(#20050,#20048)
-enclosingStmt(#20050,#20037)
+enclosing_stmt(#20050,#20037)
 exprContainers(#20050,#20001)
 #20051=*
 scopes(#20051,1)
@@ -191,22 +191,22 @@ stmt_containers(#20056,#20050)
 #20057=*
 exprs(#20057,13,#20056,0,"super(...args)")
 hasLocation(#20057,#20048)
-enclosingStmt(#20057,#20056)
+enclosing_stmt(#20057,#20056)
 exprContainers(#20057,#20050)
 #20058=*
 exprs(#20058,81,#20057,-1,"super")
 hasLocation(#20058,#20048)
-enclosingStmt(#20058,#20056)
+enclosing_stmt(#20058,#20056)
 exprContainers(#20058,#20050)
 #20059=*
 exprs(#20059,66,#20057,0,"...args")
 hasLocation(#20059,#20048)
-enclosingStmt(#20059,#20056)
+enclosing_stmt(#20059,#20056)
 exprContainers(#20059,#20050)
 #20060=*
 exprs(#20060,79,#20059,0,"args")
 hasLocation(#20060,#20048)
-enclosingStmt(#20060,#20056)
+enclosing_stmt(#20060,#20056)
 exprContainers(#20060,#20050)
 literals("args","args",#20060)
 bind(#20060,#20052)
diff --git a/javascript/extractor/tests/ts/output/trap/comments.ts.trap b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
index 90164054547..8659b52b056 100644
--- a/javascript/extractor/tests/ts/output/trap/comments.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
@@ -90,12 +90,12 @@ stmt_containers(#20026,#20001)
 #20028=*
 exprs(#20028,34,#20026,0,"a /* b */ + c")
 hasLocation(#20028,#20027)
-enclosingStmt(#20028,#20026)
+enclosing_stmt(#20028,#20026)
 exprContainers(#20028,#20001)
 #20029=*
 exprs(#20029,79,#20028,0,"a")
 hasLocation(#20029,#20018)
-enclosingStmt(#20029,#20026)
+enclosing_stmt(#20029,#20026)
 exprContainers(#20029,#20001)
 literals("a","a",#20029)
 #20030=@"var;{a};{#20000}"
@@ -104,7 +104,7 @@ bind(#20029,#20030)
 #20031=*
 exprs(#20031,79,#20028,1,"c")
 hasLocation(#20031,#20022)
-enclosingStmt(#20031,#20026)
+enclosing_stmt(#20031,#20026)
 exprContainers(#20031,#20001)
 literals("c","c",#20031)
 #20032=@"var;{c};{#20000}"
diff --git a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
index 8c85dff77b6..a9f19bfd9e7 100644
--- a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
@@ -5687,7 +5687,7 @@ stmt_containers(#22183,#20001)
 #22185=*
 exprs(#22185,78,#22183,-1,"ConditionalTypes1")
 hasLocation(#22185,#20285)
-enclosingStmt(#22185,#22183)
+enclosing_stmt(#22185,#22183)
 exprContainers(#22185,#20001)
 literals("ConditionalTypes1","ConditionalTypes1",#22185)
 decl(#22185,#22179)
@@ -5777,7 +5777,7 @@ stmt_containers(#22223,#22183)
 #22225=*
 typeexprs(#22225,1,#22223,0,"TypeName")
 hasLocation(#22225,#20291)
-enclosingStmt(#22225,#22223)
+enclosing_stmt(#22225,#22223)
 exprContainers(#22225,#22183)
 literals("TypeName","TypeName",#22225)
 typedecl(#22225,#22189)
@@ -5790,12 +5790,12 @@ local_type_names(#22227,"T",#22226)
 #22228=*
 typeexprs(#22228,22,#22223,2,"T")
 hasLocation(#22228,#20295)
-enclosingStmt(#22228,#22223)
+enclosing_stmt(#22228,#22223)
 exprContainers(#22228,#22183)
 #22229=*
 typeexprs(#22229,1,#22228,0,"T")
 hasLocation(#22229,#20295)
-enclosingStmt(#22229,#22223)
+enclosing_stmt(#22229,#22223)
 exprContainers(#22229,#22183)
 literals("T","T",#22229)
 typedecl(#22229,#22227)
@@ -5804,25 +5804,25 @@ typeexprs(#22230,28,#22223,1,"T exten ... object""")
 #22231=@"loc,{#10000},3,7,8,14"
 locations_default(#22231,#10000,3,7,8,14)
 hasLocation(#22230,#22231)
-enclosingStmt(#22230,#22223)
+enclosing_stmt(#22230,#22223)
 exprContainers(#22230,#22183)
 #22232=*
 typeexprs(#22232,0,#22230,0,"T")
 hasLocation(#22232,#20301)
-enclosingStmt(#22232,#22223)
+enclosing_stmt(#22232,#22223)
 exprContainers(#22232,#22183)
 literals("T","T",#22232)
 typebind(#22232,#22227)
 #22233=*
 typeexprs(#22233,2,#22230,1,"string")
 hasLocation(#22233,#20305)
-enclosingStmt(#22233,#22223)
+enclosing_stmt(#22233,#22223)
 exprContainers(#22233,#22183)
 literals("string","string",#22233)
 #22234=*
 typeexprs(#22234,3,#22230,2,"""string""")
 hasLocation(#22234,#20309)
-enclosingStmt(#22234,#22223)
+enclosing_stmt(#22234,#22223)
 exprContainers(#22234,#22183)
 literals("string","""string""",#22234)
 #22235=*
@@ -5830,25 +5830,25 @@ typeexprs(#22235,28,#22230,3,"T exten ... object""")
 #22236=@"loc,{#10000},4,7,8,14"
 locations_default(#22236,#10000,4,7,8,14)
 hasLocation(#22235,#22236)
-enclosingStmt(#22235,#22223)
+enclosing_stmt(#22235,#22223)
 exprContainers(#22235,#22183)
 #22237=*
 typeexprs(#22237,0,#22235,0,"T")
 hasLocation(#22237,#20313)
-enclosingStmt(#22237,#22223)
+enclosing_stmt(#22237,#22223)
 exprContainers(#22237,#22183)
 literals("T","T",#22237)
 typebind(#22237,#22227)
 #22238=*
 typeexprs(#22238,2,#22235,1,"number")
 hasLocation(#22238,#20317)
-enclosingStmt(#22238,#22223)
+enclosing_stmt(#22238,#22223)
 exprContainers(#22238,#22183)
 literals("number","number",#22238)
 #22239=*
 typeexprs(#22239,3,#22235,2,"""number""")
 hasLocation(#22239,#20321)
-enclosingStmt(#22239,#22223)
+enclosing_stmt(#22239,#22223)
 exprContainers(#22239,#22183)
 literals("number","""number""",#22239)
 #22240=*
@@ -5856,25 +5856,25 @@ typeexprs(#22240,28,#22235,3,"T exten ... object""")
 #22241=@"loc,{#10000},5,7,8,14"
 locations_default(#22241,#10000,5,7,8,14)
 hasLocation(#22240,#22241)
-enclosingStmt(#22240,#22223)
+enclosing_stmt(#22240,#22223)
 exprContainers(#22240,#22183)
 #22242=*
 typeexprs(#22242,0,#22240,0,"T")
 hasLocation(#22242,#20325)
-enclosingStmt(#22242,#22223)
+enclosing_stmt(#22242,#22223)
 exprContainers(#22242,#22183)
 literals("T","T",#22242)
 typebind(#22242,#22227)
 #22243=*
 typeexprs(#22243,2,#22240,1,"boolean")
 hasLocation(#22243,#20329)
-enclosingStmt(#22243,#22223)
+enclosing_stmt(#22243,#22223)
 exprContainers(#22243,#22183)
 literals("boolean","boolean",#22243)
 #22244=*
 typeexprs(#22244,3,#22240,2,"""boolean""")
 hasLocation(#22244,#20333)
-enclosingStmt(#22244,#22223)
+enclosing_stmt(#22244,#22223)
 exprContainers(#22244,#22183)
 literals("boolean","""boolean""",#22244)
 #22245=*
@@ -5882,25 +5882,25 @@ typeexprs(#22245,28,#22240,3,"T exten ... object""")
 #22246=@"loc,{#10000},6,7,8,14"
 locations_default(#22246,#10000,6,7,8,14)
 hasLocation(#22245,#22246)
-enclosingStmt(#22245,#22223)
+enclosing_stmt(#22245,#22223)
 exprContainers(#22245,#22183)
 #22247=*
 typeexprs(#22247,0,#22245,0,"T")
 hasLocation(#22247,#20337)
-enclosingStmt(#22247,#22223)
+enclosing_stmt(#22247,#22223)
 exprContainers(#22247,#22183)
 literals("T","T",#22247)
 typebind(#22247,#22227)
 #22248=*
 typeexprs(#22248,2,#22245,1,"undefined")
 hasLocation(#22248,#20341)
-enclosingStmt(#22248,#22223)
+enclosing_stmt(#22248,#22223)
 exprContainers(#22248,#22183)
 literals("undefined","undefined",#22248)
 #22249=*
 typeexprs(#22249,3,#22245,2,"""undefined""")
 hasLocation(#22249,#20345)
-enclosingStmt(#22249,#22223)
+enclosing_stmt(#22249,#22223)
 exprContainers(#22249,#22183)
 literals("undefined","""undefined""",#22249)
 #22250=*
@@ -5908,31 +5908,31 @@ typeexprs(#22250,28,#22245,3,"T exten ... object""")
 #22251=@"loc,{#10000},7,7,8,14"
 locations_default(#22251,#10000,7,7,8,14)
 hasLocation(#22250,#22251)
-enclosingStmt(#22250,#22223)
+enclosing_stmt(#22250,#22223)
 exprContainers(#22250,#22183)
 #22252=*
 typeexprs(#22252,0,#22250,0,"T")
 hasLocation(#22252,#20349)
-enclosingStmt(#22252,#22223)
+enclosing_stmt(#22252,#22223)
 exprContainers(#22252,#22183)
 literals("T","T",#22252)
 typebind(#22252,#22227)
 #22253=*
 typeexprs(#22253,0,#22250,1,"Function")
 hasLocation(#22253,#20353)
-enclosingStmt(#22253,#22223)
+enclosing_stmt(#22253,#22223)
 exprContainers(#22253,#22183)
 literals("Function","Function",#22253)
 #22254=*
 typeexprs(#22254,3,#22250,2,"""function""")
 hasLocation(#22254,#20357)
-enclosingStmt(#22254,#22223)
+enclosing_stmt(#22254,#22223)
 exprContainers(#22254,#22183)
 literals("function","""function""",#22254)
 #22255=*
 typeexprs(#22255,3,#22250,3,"""object""")
 hasLocation(#22255,#20361)
-enclosingStmt(#22255,#22223)
+enclosing_stmt(#22255,#22223)
 exprContainers(#22255,#22183)
 literals("object","""object""",#22255)
 #22256=*
@@ -5944,7 +5944,7 @@ stmt_containers(#22256,#22183)
 #22258=*
 typeexprs(#22258,1,#22256,0,"T0")
 hasLocation(#22258,#20367)
-enclosingStmt(#22258,#22256)
+enclosing_stmt(#22258,#22256)
 exprContainers(#22258,#22183)
 literals("T0","T0",#22258)
 typedecl(#22258,#22190)
@@ -5953,19 +5953,19 @@ typeexprs(#22259,14,#22256,1,"TypeName<string>")
 #22260=@"loc,{#10000},10,13,10,28"
 locations_default(#22260,#10000,10,13,10,28)
 hasLocation(#22259,#22260)
-enclosingStmt(#22259,#22256)
+enclosing_stmt(#22259,#22256)
 exprContainers(#22259,#22183)
 #22261=*
 typeexprs(#22261,0,#22259,-1,"TypeName")
 hasLocation(#22261,#20371)
-enclosingStmt(#22261,#22256)
+enclosing_stmt(#22261,#22256)
 exprContainers(#22261,#22183)
 literals("TypeName","TypeName",#22261)
 typebind(#22261,#22189)
 #22262=*
 typeexprs(#22262,2,#22259,0,"string")
 hasLocation(#22262,#20375)
-enclosingStmt(#22262,#22256)
+enclosing_stmt(#22262,#22256)
 exprContainers(#22262,#22183)
 literals("string","string",#22262)
 #22263=*
@@ -5977,7 +5977,7 @@ stmt_containers(#22263,#22183)
 #22265=*
 typeexprs(#22265,1,#22263,0,"T1")
 hasLocation(#22265,#20383)
-enclosingStmt(#22265,#22263)
+enclosing_stmt(#22265,#22263)
 exprContainers(#22265,#22183)
 literals("T1","T1",#22265)
 typedecl(#22265,#22191)
@@ -5986,19 +5986,19 @@ typeexprs(#22266,14,#22263,1,"TypeName<""a"">")
 #22267=@"loc,{#10000},11,13,11,25"
 locations_default(#22267,#10000,11,13,11,25)
 hasLocation(#22266,#22267)
-enclosingStmt(#22266,#22263)
+enclosing_stmt(#22266,#22263)
 exprContainers(#22266,#22183)
 #22268=*
 typeexprs(#22268,0,#22266,-1,"TypeName")
 hasLocation(#22268,#20387)
-enclosingStmt(#22268,#22263)
+enclosing_stmt(#22268,#22263)
 exprContainers(#22268,#22183)
 literals("TypeName","TypeName",#22268)
 typebind(#22268,#22189)
 #22269=*
 typeexprs(#22269,3,#22266,0,"""a""")
 hasLocation(#22269,#20391)
-enclosingStmt(#22269,#22263)
+enclosing_stmt(#22269,#22263)
 exprContainers(#22269,#22183)
 literals("a","""a""",#22269)
 #22270=*
@@ -6010,7 +6010,7 @@ stmt_containers(#22270,#22183)
 #22272=*
 typeexprs(#22272,1,#22270,0,"T2")
 hasLocation(#22272,#20399)
-enclosingStmt(#22272,#22270)
+enclosing_stmt(#22272,#22270)
 exprContainers(#22272,#22183)
 literals("T2","T2",#22272)
 typedecl(#22272,#22192)
@@ -6019,19 +6019,19 @@ typeexprs(#22273,14,#22270,1,"TypeName<true>")
 #22274=@"loc,{#10000},12,13,12,26"
 locations_default(#22274,#10000,12,13,12,26)
 hasLocation(#22273,#22274)
-enclosingStmt(#22273,#22270)
+enclosing_stmt(#22273,#22270)
 exprContainers(#22273,#22183)
 #22275=*
 typeexprs(#22275,0,#22273,-1,"TypeName")
 hasLocation(#22275,#20403)
-enclosingStmt(#22275,#22270)
+enclosing_stmt(#22275,#22270)
 exprContainers(#22275,#22183)
 literals("TypeName","TypeName",#22275)
 typebind(#22275,#22189)
 #22276=*
 typeexprs(#22276,5,#22273,0,"true")
 hasLocation(#22276,#20407)
-enclosingStmt(#22276,#22270)
+enclosing_stmt(#22276,#22270)
 exprContainers(#22276,#22183)
 literals("true","true",#22276)
 #22277=*
@@ -6043,7 +6043,7 @@ stmt_containers(#22277,#22183)
 #22279=*
 typeexprs(#22279,1,#22277,0,"T3")
 hasLocation(#22279,#20415)
-enclosingStmt(#22279,#22277)
+enclosing_stmt(#22279,#22277)
 exprContainers(#22279,#22183)
 literals("T3","T3",#22279)
 typedecl(#22279,#22193)
@@ -6052,12 +6052,12 @@ typeexprs(#22280,14,#22277,1,"TypeName<() => void>")
 #22281=@"loc,{#10000},13,13,13,32"
 locations_default(#22281,#10000,13,13,13,32)
 hasLocation(#22280,#22281)
-enclosingStmt(#22280,#22277)
+enclosing_stmt(#22280,#22277)
 exprContainers(#22280,#22183)
 #22282=*
 typeexprs(#22282,0,#22280,-1,"TypeName")
 hasLocation(#22282,#20419)
-enclosingStmt(#22282,#22277)
+enclosing_stmt(#22282,#22277)
 exprContainers(#22282,#22183)
 literals("TypeName","TypeName",#22282)
 typebind(#22282,#22189)
@@ -6066,12 +6066,12 @@ typeexprs(#22283,23,#22280,0,"() => void")
 #22284=@"loc,{#10000},13,22,13,31"
 locations_default(#22284,#10000,13,22,13,31)
 hasLocation(#22283,#22284)
-enclosingStmt(#22283,#22277)
+enclosing_stmt(#22283,#22277)
 exprContainers(#22283,#22183)
 #22285=*
 exprs(#22285,9,#22283,0,"() => void")
 hasLocation(#22285,#22284)
-enclosingStmt(#22285,#22277)
+enclosing_stmt(#22285,#22277)
 exprContainers(#22285,#22183)
 #22286=*
 scopes(#22286,1)
@@ -6094,7 +6094,7 @@ stmt_containers(#22289,#22183)
 #22291=*
 typeexprs(#22291,1,#22289,0,"T4")
 hasLocation(#22291,#20437)
-enclosingStmt(#22291,#22289)
+enclosing_stmt(#22291,#22289)
 exprContainers(#22291,#22183)
 literals("T4","T4",#22291)
 typedecl(#22291,#22194)
@@ -6103,12 +6103,12 @@ typeexprs(#22292,14,#22289,1,"TypeName<string[]>")
 #22293=@"loc,{#10000},14,13,14,30"
 locations_default(#22293,#10000,14,13,14,30)
 hasLocation(#22292,#22293)
-enclosingStmt(#22292,#22289)
+enclosing_stmt(#22292,#22289)
 exprContainers(#22292,#22183)
 #22294=*
 typeexprs(#22294,0,#22292,-1,"TypeName")
 hasLocation(#22294,#20441)
-enclosingStmt(#22294,#22289)
+enclosing_stmt(#22294,#22289)
 exprContainers(#22294,#22183)
 literals("TypeName","TypeName",#22294)
 typebind(#22294,#22189)
@@ -6117,12 +6117,12 @@ typeexprs(#22295,6,#22292,0,"string[]")
 #22296=@"loc,{#10000},14,22,14,29"
 locations_default(#22296,#10000,14,22,14,29)
 hasLocation(#22295,#22296)
-enclosingStmt(#22295,#22289)
+enclosing_stmt(#22295,#22289)
 exprContainers(#22295,#22183)
 #22297=*
 typeexprs(#22297,2,#22295,0,"string")
 hasLocation(#22297,#20445)
-enclosingStmt(#22297,#22289)
+enclosing_stmt(#22297,#22289)
 exprContainers(#22297,#22183)
 literals("string","string",#22297)
 #22298=*
@@ -6134,7 +6134,7 @@ stmt_containers(#22298,#22183)
 #22300=*
 typeexprs(#22300,1,#22298,0,"T10")
 hasLocation(#22300,#20457)
-enclosingStmt(#22300,#22298)
+enclosing_stmt(#22300,#22298)
 exprContainers(#22300,#22183)
 literals("T10","T10",#22300)
 typedecl(#22300,#22195)
@@ -6143,12 +6143,12 @@ typeexprs(#22301,14,#22298,1,"TypeNam ...  void)>")
 #22302=@"loc,{#10000},17,14,17,44"
 locations_default(#22302,#10000,17,14,17,44)
 hasLocation(#22301,#22302)
-enclosingStmt(#22301,#22298)
+enclosing_stmt(#22301,#22298)
 exprContainers(#22301,#22183)
 #22303=*
 typeexprs(#22303,0,#22301,-1,"TypeName")
 hasLocation(#22303,#20461)
-enclosingStmt(#22303,#22298)
+enclosing_stmt(#22303,#22298)
 exprContainers(#22303,#22183)
 literals("TypeName","TypeName",#22303)
 typebind(#22303,#22189)
@@ -6157,12 +6157,12 @@ typeexprs(#22304,7,#22301,0,"string  ... > void)")
 #22305=@"loc,{#10000},17,23,17,43"
 locations_default(#22305,#10000,17,23,17,43)
 hasLocation(#22304,#22305)
-enclosingStmt(#22304,#22298)
+enclosing_stmt(#22304,#22298)
 exprContainers(#22304,#22183)
 #22306=*
 typeexprs(#22306,2,#22304,0,"string")
 hasLocation(#22306,#20465)
-enclosingStmt(#22306,#22298)
+enclosing_stmt(#22306,#22298)
 exprContainers(#22306,#22183)
 literals("string","string",#22306)
 #22307=*
@@ -6170,19 +6170,19 @@ typeexprs(#22307,10,#22304,1,"(() => void)")
 #22308=@"loc,{#10000},17,32,17,43"
 locations_default(#22308,#10000,17,32,17,43)
 hasLocation(#22307,#22308)
-enclosingStmt(#22307,#22298)
+enclosing_stmt(#22307,#22298)
 exprContainers(#22307,#22183)
 #22309=*
 typeexprs(#22309,23,#22307,0,"() => void")
 #22310=@"loc,{#10000},17,33,17,42"
 locations_default(#22310,#10000,17,33,17,42)
 hasLocation(#22309,#22310)
-enclosingStmt(#22309,#22298)
+enclosing_stmt(#22309,#22298)
 exprContainers(#22309,#22183)
 #22311=*
 exprs(#22311,9,#22309,0,"() => void")
 hasLocation(#22311,#22310)
-enclosingStmt(#22311,#22298)
+enclosing_stmt(#22311,#22298)
 exprContainers(#22311,#22183)
 #22312=*
 scopes(#22312,1)
@@ -6205,7 +6205,7 @@ stmt_containers(#22315,#22183)
 #22317=*
 typeexprs(#22317,1,#22315,0,"T12")
 hasLocation(#22317,#20487)
-enclosingStmt(#22317,#22315)
+enclosing_stmt(#22317,#22315)
 exprContainers(#22317,#22183)
 literals("T12","T12",#22317)
 typedecl(#22317,#22196)
@@ -6214,12 +6214,12 @@ typeexprs(#22318,14,#22315,1,"TypeNam ... efined>")
 #22319=@"loc,{#10000},18,14,18,52"
 locations_default(#22319,#10000,18,14,18,52)
 hasLocation(#22318,#22319)
-enclosingStmt(#22318,#22315)
+enclosing_stmt(#22318,#22315)
 exprContainers(#22318,#22183)
 #22320=*
 typeexprs(#22320,0,#22318,-1,"TypeName")
 hasLocation(#22320,#20491)
-enclosingStmt(#22320,#22315)
+enclosing_stmt(#22320,#22315)
 exprContainers(#22320,#22183)
 literals("TypeName","TypeName",#22320)
 typebind(#22320,#22189)
@@ -6228,12 +6228,12 @@ typeexprs(#22321,7,#22318,0,"string  ... defined")
 #22322=@"loc,{#10000},18,23,18,51"
 locations_default(#22322,#10000,18,23,18,51)
 hasLocation(#22321,#22322)
-enclosingStmt(#22321,#22315)
+enclosing_stmt(#22321,#22315)
 exprContainers(#22321,#22183)
 #22323=*
 typeexprs(#22323,2,#22321,0,"string")
 hasLocation(#22323,#20495)
-enclosingStmt(#22323,#22315)
+enclosing_stmt(#22323,#22315)
 exprContainers(#22323,#22183)
 literals("string","string",#22323)
 #22324=*
@@ -6241,18 +6241,18 @@ typeexprs(#22324,6,#22321,1,"string[]")
 #22325=@"loc,{#10000},18,32,18,39"
 locations_default(#22325,#10000,18,32,18,39)
 hasLocation(#22324,#22325)
-enclosingStmt(#22324,#22315)
+enclosing_stmt(#22324,#22315)
 exprContainers(#22324,#22183)
 #22326=*
 typeexprs(#22326,2,#22324,0,"string")
 hasLocation(#22326,#20499)
-enclosingStmt(#22326,#22315)
+enclosing_stmt(#22326,#22315)
 exprContainers(#22326,#22183)
 literals("string","string",#22326)
 #22327=*
 typeexprs(#22327,2,#22321,2,"undefined")
 hasLocation(#22327,#20507)
-enclosingStmt(#22327,#22315)
+enclosing_stmt(#22327,#22315)
 exprContainers(#22327,#22183)
 literals("undefined","undefined",#22327)
 #22328=*
@@ -6264,7 +6264,7 @@ stmt_containers(#22328,#22183)
 #22330=*
 typeexprs(#22330,1,#22328,0,"T11")
 hasLocation(#22330,#20515)
-enclosingStmt(#22330,#22328)
+enclosing_stmt(#22330,#22328)
 exprContainers(#22330,#22183)
 literals("T11","T11",#22330)
 typedecl(#22330,#22197)
@@ -6273,12 +6273,12 @@ typeexprs(#22331,14,#22328,1,"TypeNam ... mber[]>")
 #22332=@"loc,{#10000},19,14,19,42"
 locations_default(#22332,#10000,19,14,19,42)
 hasLocation(#22331,#22332)
-enclosingStmt(#22331,#22328)
+enclosing_stmt(#22331,#22328)
 exprContainers(#22331,#22183)
 #22333=*
 typeexprs(#22333,0,#22331,-1,"TypeName")
 hasLocation(#22333,#20519)
-enclosingStmt(#22333,#22328)
+enclosing_stmt(#22333,#22328)
 exprContainers(#22333,#22183)
 literals("TypeName","TypeName",#22333)
 typebind(#22333,#22189)
@@ -6287,19 +6287,19 @@ typeexprs(#22334,7,#22331,0,"string[] | number[]")
 #22335=@"loc,{#10000},19,23,19,41"
 locations_default(#22335,#10000,19,23,19,41)
 hasLocation(#22334,#22335)
-enclosingStmt(#22334,#22328)
+enclosing_stmt(#22334,#22328)
 exprContainers(#22334,#22183)
 #22336=*
 typeexprs(#22336,6,#22334,0,"string[]")
 #22337=@"loc,{#10000},19,23,19,30"
 locations_default(#22337,#10000,19,23,19,30)
 hasLocation(#22336,#22337)
-enclosingStmt(#22336,#22328)
+enclosing_stmt(#22336,#22328)
 exprContainers(#22336,#22183)
 #22338=*
 typeexprs(#22338,2,#22336,0,"string")
 hasLocation(#22338,#20523)
-enclosingStmt(#22338,#22328)
+enclosing_stmt(#22338,#22328)
 exprContainers(#22338,#22183)
 literals("string","string",#22338)
 #22339=*
@@ -6307,12 +6307,12 @@ typeexprs(#22339,6,#22334,1,"number[]")
 #22340=@"loc,{#10000},19,34,19,41"
 locations_default(#22340,#10000,19,34,19,41)
 hasLocation(#22339,#22340)
-enclosingStmt(#22339,#22328)
+enclosing_stmt(#22339,#22328)
 exprContainers(#22339,#22183)
 #22341=*
 typeexprs(#22341,2,#22339,0,"number")
 hasLocation(#22341,#20531)
-enclosingStmt(#22341,#22328)
+enclosing_stmt(#22341,#22328)
 exprContainers(#22341,#22183)
 literals("number","number",#22341)
 #22342=*
@@ -6324,7 +6324,7 @@ stmt_containers(#22342,#22183)
 #22344=*
 typeexprs(#22344,1,#22342,0,"BoxedValue")
 hasLocation(#22344,#20543)
-enclosingStmt(#22344,#22342)
+enclosing_stmt(#22344,#22342)
 exprContainers(#22344,#22183)
 literals("BoxedValue","BoxedValue",#22344)
 typedecl(#22344,#22198)
@@ -6337,12 +6337,12 @@ local_type_names(#22346,"T",#22345)
 #22347=*
 typeexprs(#22347,22,#22342,2,"T")
 hasLocation(#22347,#20547)
-enclosingStmt(#22347,#22342)
+enclosing_stmt(#22347,#22342)
 exprContainers(#22347,#22183)
 #22348=*
 typeexprs(#22348,1,#22347,0,"T")
 hasLocation(#22348,#20547)
-enclosingStmt(#22348,#22342)
+enclosing_stmt(#22348,#22342)
 exprContainers(#22348,#22183)
 literals("T","T",#22348)
 typedecl(#22348,#22346)
@@ -6351,7 +6351,7 @@ typeexprs(#22349,21,#22342,1,"{ value: T }")
 #22350=@"loc,{#10000},21,24,21,35"
 locations_default(#22350,#10000,21,24,21,35)
 hasLocation(#22349,#22350)
-enclosingStmt(#22349,#22342)
+enclosing_stmt(#22349,#22342)
 exprContainers(#22349,#22183)
 #22351=*
 properties(#22351,#22349,0,8,"value: T")
@@ -6361,14 +6361,14 @@ hasLocation(#22351,#22352)
 #22353=*
 exprs(#22353,0,#22351,0,"value")
 hasLocation(#22353,#20555)
-enclosingStmt(#22353,#22342)
+enclosing_stmt(#22353,#22342)
 exprContainers(#22353,#22183)
 literals("value","value",#22353)
 isAbstractMember(#22351)
 #22354=*
 typeexprs(#22354,0,#22351,2,"T")
 hasLocation(#22354,#20559)
-enclosingStmt(#22354,#22342)
+enclosing_stmt(#22354,#22342)
 exprContainers(#22354,#22183)
 literals("T","T",#22354)
 typebind(#22354,#22346)
@@ -6381,7 +6381,7 @@ stmt_containers(#22355,#22183)
 #22357=*
 typeexprs(#22357,1,#22355,0,"BoxedArray")
 hasLocation(#22357,#20567)
-enclosingStmt(#22357,#22355)
+enclosing_stmt(#22357,#22355)
 exprContainers(#22357,#22183)
 literals("BoxedArray","BoxedArray",#22357)
 typedecl(#22357,#22199)
@@ -6394,12 +6394,12 @@ local_type_names(#22359,"T",#22358)
 #22360=*
 typeexprs(#22360,22,#22355,2,"T")
 hasLocation(#22360,#20571)
-enclosingStmt(#22360,#22355)
+enclosing_stmt(#22360,#22355)
 exprContainers(#22360,#22183)
 #22361=*
 typeexprs(#22361,1,#22360,0,"T")
 hasLocation(#22361,#20571)
-enclosingStmt(#22361,#22355)
+enclosing_stmt(#22361,#22355)
 exprContainers(#22361,#22183)
 literals("T","T",#22361)
 typedecl(#22361,#22359)
@@ -6408,7 +6408,7 @@ typeexprs(#22362,21,#22355,1,"{ array: T[] }")
 #22363=@"loc,{#10000},22,24,22,37"
 locations_default(#22363,#10000,22,24,22,37)
 hasLocation(#22362,#22363)
-enclosingStmt(#22362,#22355)
+enclosing_stmt(#22362,#22355)
 exprContainers(#22362,#22183)
 #22364=*
 properties(#22364,#22362,0,8,"array: T[]")
@@ -6418,7 +6418,7 @@ hasLocation(#22364,#22365)
 #22366=*
 exprs(#22366,0,#22364,0,"array")
 hasLocation(#22366,#20579)
-enclosingStmt(#22366,#22355)
+enclosing_stmt(#22366,#22355)
 exprContainers(#22366,#22183)
 literals("array","array",#22366)
 isAbstractMember(#22364)
@@ -6427,12 +6427,12 @@ typeexprs(#22367,6,#22364,2,"T[]")
 #22368=@"loc,{#10000},22,33,22,35"
 locations_default(#22368,#10000,22,33,22,35)
 hasLocation(#22367,#22368)
-enclosingStmt(#22367,#22355)
+enclosing_stmt(#22367,#22355)
 exprContainers(#22367,#22183)
 #22369=*
 typeexprs(#22369,0,#22367,0,"T")
 hasLocation(#22369,#20583)
-enclosingStmt(#22369,#22355)
+enclosing_stmt(#22369,#22355)
 exprContainers(#22369,#22183)
 literals("T","T",#22369)
 typebind(#22369,#22359)
@@ -6445,7 +6445,7 @@ stmt_containers(#22370,#22183)
 #22372=*
 typeexprs(#22372,1,#22370,0,"Boxed")
 hasLocation(#22372,#20595)
-enclosingStmt(#22372,#22370)
+enclosing_stmt(#22372,#22370)
 exprContainers(#22372,#22183)
 literals("Boxed","Boxed",#22372)
 typedecl(#22372,#22200)
@@ -6458,12 +6458,12 @@ local_type_names(#22374,"T",#22373)
 #22375=*
 typeexprs(#22375,22,#22370,2,"T")
 hasLocation(#22375,#20599)
-enclosingStmt(#22375,#22370)
+enclosing_stmt(#22375,#22370)
 exprContainers(#22375,#22183)
 #22376=*
 typeexprs(#22376,1,#22375,0,"T")
 hasLocation(#22376,#20599)
-enclosingStmt(#22376,#22370)
+enclosing_stmt(#22376,#22370)
 exprContainers(#22376,#22183)
 literals("T","T",#22376)
 typedecl(#22376,#22374)
@@ -6472,12 +6472,12 @@ typeexprs(#22377,28,#22370,1,"T exten ... alue<T>")
 #22378=@"loc,{#10000},23,19,23,73"
 locations_default(#22378,#10000,23,19,23,73)
 hasLocation(#22377,#22378)
-enclosingStmt(#22377,#22370)
+enclosing_stmt(#22377,#22370)
 exprContainers(#22377,#22183)
 #22379=*
 typeexprs(#22379,0,#22377,0,"T")
 hasLocation(#22379,#20605)
-enclosingStmt(#22379,#22370)
+enclosing_stmt(#22379,#22370)
 exprContainers(#22379,#22183)
 literals("T","T",#22379)
 typebind(#22379,#22374)
@@ -6486,12 +6486,12 @@ typeexprs(#22380,6,#22377,1,"any[]")
 #22381=@"loc,{#10000},23,29,23,33"
 locations_default(#22381,#10000,23,29,23,33)
 hasLocation(#22380,#22381)
-enclosingStmt(#22380,#22370)
+enclosing_stmt(#22380,#22370)
 exprContainers(#22380,#22183)
 #22382=*
 typeexprs(#22382,2,#22380,0,"any")
 hasLocation(#22382,#20609)
-enclosingStmt(#22382,#22370)
+enclosing_stmt(#22382,#22370)
 exprContainers(#22382,#22183)
 literals("any","any",#22382)
 #22383=*
@@ -6499,12 +6499,12 @@ typeexprs(#22383,14,#22377,2,"BoxedAr ... umber]>")
 #22384=@"loc,{#10000},23,37,23,57"
 locations_default(#22384,#10000,23,37,23,57)
 hasLocation(#22383,#22384)
-enclosingStmt(#22383,#22370)
+enclosing_stmt(#22383,#22370)
 exprContainers(#22383,#22183)
 #22385=*
 typeexprs(#22385,0,#22383,-1,"BoxedArray")
 hasLocation(#22385,#20617)
-enclosingStmt(#22385,#22370)
+enclosing_stmt(#22385,#22370)
 exprContainers(#22385,#22183)
 literals("BoxedArray","BoxedArray",#22385)
 typebind(#22385,#22199)
@@ -6513,19 +6513,19 @@ typeexprs(#22386,8,#22383,0,"T[number]")
 #22387=@"loc,{#10000},23,48,23,56"
 locations_default(#22387,#10000,23,48,23,56)
 hasLocation(#22386,#22387)
-enclosingStmt(#22386,#22370)
+enclosing_stmt(#22386,#22370)
 exprContainers(#22386,#22183)
 #22388=*
 typeexprs(#22388,0,#22386,0,"T")
 hasLocation(#22388,#20621)
-enclosingStmt(#22388,#22370)
+enclosing_stmt(#22388,#22370)
 exprContainers(#22388,#22183)
 literals("T","T",#22388)
 typebind(#22388,#22374)
 #22389=*
 typeexprs(#22389,2,#22386,1,"number")
 hasLocation(#22389,#20625)
-enclosingStmt(#22389,#22370)
+enclosing_stmt(#22389,#22370)
 exprContainers(#22389,#22183)
 literals("number","number",#22389)
 #22390=*
@@ -6533,19 +6533,19 @@ typeexprs(#22390,14,#22377,3,"BoxedValue<T>")
 #22391=@"loc,{#10000},23,61,23,73"
 locations_default(#22391,#10000,23,61,23,73)
 hasLocation(#22390,#22391)
-enclosingStmt(#22390,#22370)
+enclosing_stmt(#22390,#22370)
 exprContainers(#22390,#22183)
 #22392=*
 typeexprs(#22392,0,#22390,-1,"BoxedValue")
 hasLocation(#22392,#20633)
-enclosingStmt(#22392,#22370)
+enclosing_stmt(#22392,#22370)
 exprContainers(#22392,#22183)
 literals("BoxedValue","BoxedValue",#22392)
 typebind(#22392,#22198)
 #22393=*
 typeexprs(#22393,0,#22390,0,"T")
 hasLocation(#22393,#20637)
-enclosingStmt(#22393,#22370)
+enclosing_stmt(#22393,#22370)
 exprContainers(#22393,#22183)
 literals("T","T",#22393)
 typebind(#22393,#22374)
@@ -6558,7 +6558,7 @@ stmt_containers(#22394,#22183)
 #22396=*
 typeexprs(#22396,1,#22394,0,"T20")
 hasLocation(#22396,#20645)
-enclosingStmt(#22396,#22394)
+enclosing_stmt(#22396,#22394)
 exprContainers(#22396,#22183)
 literals("T20","T20",#22396)
 typedecl(#22396,#22201)
@@ -6567,19 +6567,19 @@ typeexprs(#22397,14,#22394,1,"Boxed<string>")
 #22398=@"loc,{#10000},25,14,25,26"
 locations_default(#22398,#10000,25,14,25,26)
 hasLocation(#22397,#22398)
-enclosingStmt(#22397,#22394)
+enclosing_stmt(#22397,#22394)
 exprContainers(#22397,#22183)
 #22399=*
 typeexprs(#22399,0,#22397,-1,"Boxed")
 hasLocation(#22399,#20649)
-enclosingStmt(#22399,#22394)
+enclosing_stmt(#22399,#22394)
 exprContainers(#22399,#22183)
 literals("Boxed","Boxed",#22399)
 typebind(#22399,#22200)
 #22400=*
 typeexprs(#22400,2,#22397,0,"string")
 hasLocation(#22400,#20653)
-enclosingStmt(#22400,#22394)
+enclosing_stmt(#22400,#22394)
 exprContainers(#22400,#22183)
 literals("string","string",#22400)
 #22401=*
@@ -6591,7 +6591,7 @@ stmt_containers(#22401,#22183)
 #22403=*
 typeexprs(#22403,1,#22401,0,"T21")
 hasLocation(#22403,#20661)
-enclosingStmt(#22403,#22401)
+enclosing_stmt(#22403,#22401)
 exprContainers(#22403,#22183)
 literals("T21","T21",#22403)
 typedecl(#22403,#22202)
@@ -6600,12 +6600,12 @@ typeexprs(#22404,14,#22401,1,"Boxed<number[]>")
 #22405=@"loc,{#10000},26,14,26,28"
 locations_default(#22405,#10000,26,14,26,28)
 hasLocation(#22404,#22405)
-enclosingStmt(#22404,#22401)
+enclosing_stmt(#22404,#22401)
 exprContainers(#22404,#22183)
 #22406=*
 typeexprs(#22406,0,#22404,-1,"Boxed")
 hasLocation(#22406,#20665)
-enclosingStmt(#22406,#22401)
+enclosing_stmt(#22406,#22401)
 exprContainers(#22406,#22183)
 literals("Boxed","Boxed",#22406)
 typebind(#22406,#22200)
@@ -6614,12 +6614,12 @@ typeexprs(#22407,6,#22404,0,"number[]")
 #22408=@"loc,{#10000},26,20,26,27"
 locations_default(#22408,#10000,26,20,26,27)
 hasLocation(#22407,#22408)
-enclosingStmt(#22407,#22401)
+enclosing_stmt(#22407,#22401)
 exprContainers(#22407,#22183)
 #22409=*
 typeexprs(#22409,2,#22407,0,"number")
 hasLocation(#22409,#20669)
-enclosingStmt(#22409,#22401)
+enclosing_stmt(#22409,#22401)
 exprContainers(#22409,#22183)
 literals("number","number",#22409)
 #22410=*
@@ -6631,7 +6631,7 @@ stmt_containers(#22410,#22183)
 #22412=*
 typeexprs(#22412,1,#22410,0,"T22")
 hasLocation(#22412,#20681)
-enclosingStmt(#22412,#22410)
+enclosing_stmt(#22412,#22410)
 exprContainers(#22412,#22183)
 literals("T22","T22",#22412)
 typedecl(#22412,#22203)
@@ -6640,12 +6640,12 @@ typeexprs(#22413,14,#22410,1,"Boxed<s ... mber[]>")
 #22414=@"loc,{#10000},27,14,27,37"
 locations_default(#22414,#10000,27,14,27,37)
 hasLocation(#22413,#22414)
-enclosingStmt(#22413,#22410)
+enclosing_stmt(#22413,#22410)
 exprContainers(#22413,#22183)
 #22415=*
 typeexprs(#22415,0,#22413,-1,"Boxed")
 hasLocation(#22415,#20685)
-enclosingStmt(#22415,#22410)
+enclosing_stmt(#22415,#22410)
 exprContainers(#22415,#22183)
 literals("Boxed","Boxed",#22415)
 typebind(#22415,#22200)
@@ -6654,12 +6654,12 @@ typeexprs(#22416,7,#22413,0,"string | number[]")
 #22417=@"loc,{#10000},27,20,27,36"
 locations_default(#22417,#10000,27,20,27,36)
 hasLocation(#22416,#22417)
-enclosingStmt(#22416,#22410)
+enclosing_stmt(#22416,#22410)
 exprContainers(#22416,#22183)
 #22418=*
 typeexprs(#22418,2,#22416,0,"string")
 hasLocation(#22418,#20689)
-enclosingStmt(#22418,#22410)
+enclosing_stmt(#22418,#22410)
 exprContainers(#22418,#22183)
 literals("string","string",#22418)
 #22419=*
@@ -6667,12 +6667,12 @@ typeexprs(#22419,6,#22416,1,"number[]")
 #22420=@"loc,{#10000},27,29,27,36"
 locations_default(#22420,#10000,27,29,27,36)
 hasLocation(#22419,#22420)
-enclosingStmt(#22419,#22410)
+enclosing_stmt(#22419,#22410)
 exprContainers(#22419,#22183)
 #22421=*
 typeexprs(#22421,2,#22419,0,"number")
 hasLocation(#22421,#20693)
-enclosingStmt(#22421,#22410)
+enclosing_stmt(#22421,#22410)
 exprContainers(#22421,#22183)
 literals("number","number",#22421)
 #22422=*
@@ -6684,7 +6684,7 @@ stmt_containers(#22422,#22183)
 #22424=*
 typeexprs(#22424,1,#22422,0,"Diff")
 hasLocation(#22424,#20705)
-enclosingStmt(#22424,#22422)
+enclosing_stmt(#22424,#22422)
 exprContainers(#22424,#22183)
 literals("Diff","Diff",#22424)
 typedecl(#22424,#22204)
@@ -6699,24 +6699,24 @@ local_type_names(#22427,"U",#22425)
 #22428=*
 typeexprs(#22428,22,#22422,2,"T")
 hasLocation(#22428,#20709)
-enclosingStmt(#22428,#22422)
+enclosing_stmt(#22428,#22422)
 exprContainers(#22428,#22183)
 #22429=*
 typeexprs(#22429,1,#22428,0,"T")
 hasLocation(#22429,#20709)
-enclosingStmt(#22429,#22422)
+enclosing_stmt(#22429,#22422)
 exprContainers(#22429,#22183)
 literals("T","T",#22429)
 typedecl(#22429,#22426)
 #22430=*
 typeexprs(#22430,22,#22422,3,"U")
 hasLocation(#22430,#20713)
-enclosingStmt(#22430,#22422)
+enclosing_stmt(#22430,#22422)
 exprContainers(#22430,#22183)
 #22431=*
 typeexprs(#22431,1,#22430,0,"U")
 hasLocation(#22431,#20713)
-enclosingStmt(#22431,#22422)
+enclosing_stmt(#22431,#22422)
 exprContainers(#22431,#22183)
 literals("U","U",#22431)
 typedecl(#22431,#22427)
@@ -6725,32 +6725,32 @@ typeexprs(#22432,28,#22422,1,"T exten ... ver : T")
 #22433=@"loc,{#10000},29,21,29,43"
 locations_default(#22433,#10000,29,21,29,43)
 hasLocation(#22432,#22433)
-enclosingStmt(#22432,#22422)
+enclosing_stmt(#22432,#22422)
 exprContainers(#22432,#22183)
 #22434=*
 typeexprs(#22434,0,#22432,0,"T")
 hasLocation(#22434,#20719)
-enclosingStmt(#22434,#22422)
+enclosing_stmt(#22434,#22422)
 exprContainers(#22434,#22183)
 literals("T","T",#22434)
 typebind(#22434,#22426)
 #22435=*
 typeexprs(#22435,0,#22432,1,"U")
 hasLocation(#22435,#20723)
-enclosingStmt(#22435,#22422)
+enclosing_stmt(#22435,#22422)
 exprContainers(#22435,#22183)
 literals("U","U",#22435)
 typebind(#22435,#22427)
 #22436=*
 typeexprs(#22436,2,#22432,2,"never")
 hasLocation(#22436,#20727)
-enclosingStmt(#22436,#22422)
+enclosing_stmt(#22436,#22422)
 exprContainers(#22436,#22183)
 literals("never","never",#22436)
 #22437=*
 typeexprs(#22437,0,#22432,3,"T")
 hasLocation(#22437,#20731)
-enclosingStmt(#22437,#22422)
+enclosing_stmt(#22437,#22422)
 exprContainers(#22437,#22183)
 literals("T","T",#22437)
 typebind(#22437,#22426)
@@ -6763,7 +6763,7 @@ stmt_containers(#22438,#22183)
 #22440=*
 typeexprs(#22440,1,#22438,0,"Filter")
 hasLocation(#22440,#20737)
-enclosingStmt(#22440,#22438)
+enclosing_stmt(#22440,#22438)
 exprContainers(#22440,#22183)
 literals("Filter","Filter",#22440)
 typedecl(#22440,#22205)
@@ -6778,24 +6778,24 @@ local_type_names(#22443,"U",#22441)
 #22444=*
 typeexprs(#22444,22,#22438,2,"T")
 hasLocation(#22444,#20741)
-enclosingStmt(#22444,#22438)
+enclosing_stmt(#22444,#22438)
 exprContainers(#22444,#22183)
 #22445=*
 typeexprs(#22445,1,#22444,0,"T")
 hasLocation(#22445,#20741)
-enclosingStmt(#22445,#22438)
+enclosing_stmt(#22445,#22438)
 exprContainers(#22445,#22183)
 literals("T","T",#22445)
 typedecl(#22445,#22442)
 #22446=*
 typeexprs(#22446,22,#22438,3,"U")
 hasLocation(#22446,#20745)
-enclosingStmt(#22446,#22438)
+enclosing_stmt(#22446,#22438)
 exprContainers(#22446,#22183)
 #22447=*
 typeexprs(#22447,1,#22446,0,"U")
 hasLocation(#22447,#20745)
-enclosingStmt(#22447,#22438)
+enclosing_stmt(#22447,#22438)
 exprContainers(#22447,#22183)
 literals("U","U",#22447)
 typedecl(#22447,#22443)
@@ -6804,33 +6804,33 @@ typeexprs(#22448,28,#22438,1,"T exten ... : never")
 #22449=@"loc,{#10000},30,23,30,45"
 locations_default(#22449,#10000,30,23,30,45)
 hasLocation(#22448,#22449)
-enclosingStmt(#22448,#22438)
+enclosing_stmt(#22448,#22438)
 exprContainers(#22448,#22183)
 #22450=*
 typeexprs(#22450,0,#22448,0,"T")
 hasLocation(#22450,#20751)
-enclosingStmt(#22450,#22438)
+enclosing_stmt(#22450,#22438)
 exprContainers(#22450,#22183)
 literals("T","T",#22450)
 typebind(#22450,#22442)
 #22451=*
 typeexprs(#22451,0,#22448,1,"U")
 hasLocation(#22451,#20755)
-enclosingStmt(#22451,#22438)
+enclosing_stmt(#22451,#22438)
 exprContainers(#22451,#22183)
 literals("U","U",#22451)
 typebind(#22451,#22443)
 #22452=*
 typeexprs(#22452,0,#22448,2,"T")
 hasLocation(#22452,#20759)
-enclosingStmt(#22452,#22438)
+enclosing_stmt(#22452,#22438)
 exprContainers(#22452,#22183)
 literals("T","T",#22452)
 typebind(#22452,#22442)
 #22453=*
 typeexprs(#22453,2,#22448,3,"never")
 hasLocation(#22453,#20763)
-enclosingStmt(#22453,#22438)
+enclosing_stmt(#22453,#22438)
 exprContainers(#22453,#22183)
 literals("never","never",#22453)
 #22454=*
@@ -6842,7 +6842,7 @@ stmt_containers(#22454,#22183)
 #22456=*
 typeexprs(#22456,1,#22454,0,"T30")
 hasLocation(#22456,#20769)
-enclosingStmt(#22456,#22454)
+enclosing_stmt(#22456,#22454)
 exprContainers(#22456,#22183)
 literals("T30","T30",#22456)
 typedecl(#22456,#22206)
@@ -6851,12 +6851,12 @@ typeexprs(#22457,14,#22454,1,"Diff<""a ...  | ""f"">")
 #22458=@"loc,{#10000},32,14,32,57"
 locations_default(#22458,#10000,32,14,32,57)
 hasLocation(#22457,#22458)
-enclosingStmt(#22457,#22454)
+enclosing_stmt(#22457,#22454)
 exprContainers(#22457,#22183)
 #22459=*
 typeexprs(#22459,0,#22457,-1,"Diff")
 hasLocation(#22459,#20773)
-enclosingStmt(#22459,#22454)
+enclosing_stmt(#22459,#22454)
 exprContainers(#22459,#22183)
 literals("Diff","Diff",#22459)
 typebind(#22459,#22204)
@@ -6865,30 +6865,30 @@ typeexprs(#22460,7,#22457,0,"""a"" | "" ... "" | ""d""")
 #22461=@"loc,{#10000},32,19,32,39"
 locations_default(#22461,#10000,32,19,32,39)
 hasLocation(#22460,#22461)
-enclosingStmt(#22460,#22454)
+enclosing_stmt(#22460,#22454)
 exprContainers(#22460,#22183)
 #22462=*
 typeexprs(#22462,3,#22460,0,"""a""")
 hasLocation(#22462,#20777)
-enclosingStmt(#22462,#22454)
+enclosing_stmt(#22462,#22454)
 exprContainers(#22462,#22183)
 literals("a","""a""",#22462)
 #22463=*
 typeexprs(#22463,3,#22460,1,"""b""")
 hasLocation(#22463,#20781)
-enclosingStmt(#22463,#22454)
+enclosing_stmt(#22463,#22454)
 exprContainers(#22463,#22183)
 literals("b","""b""",#22463)
 #22464=*
 typeexprs(#22464,3,#22460,2,"""c""")
 hasLocation(#22464,#20785)
-enclosingStmt(#22464,#22454)
+enclosing_stmt(#22464,#22454)
 exprContainers(#22464,#22183)
 literals("c","""c""",#22464)
 #22465=*
 typeexprs(#22465,3,#22460,3,"""d""")
 hasLocation(#22465,#20789)
-enclosingStmt(#22465,#22454)
+enclosing_stmt(#22465,#22454)
 exprContainers(#22465,#22183)
 literals("d","""d""",#22465)
 #22466=*
@@ -6896,24 +6896,24 @@ typeexprs(#22466,7,#22457,1,"""a"" | ""c"" | ""f""")
 #22467=@"loc,{#10000},32,42,32,56"
 locations_default(#22467,#10000,32,42,32,56)
 hasLocation(#22466,#22467)
-enclosingStmt(#22466,#22454)
+enclosing_stmt(#22466,#22454)
 exprContainers(#22466,#22183)
 #22468=*
 typeexprs(#22468,3,#22466,0,"""a""")
 hasLocation(#22468,#20793)
-enclosingStmt(#22468,#22454)
+enclosing_stmt(#22468,#22454)
 exprContainers(#22468,#22183)
 literals("a","""a""",#22468)
 #22469=*
 typeexprs(#22469,3,#22466,1,"""c""")
 hasLocation(#22469,#20797)
-enclosingStmt(#22469,#22454)
+enclosing_stmt(#22469,#22454)
 exprContainers(#22469,#22183)
 literals("c","""c""",#22469)
 #22470=*
 typeexprs(#22470,3,#22466,2,"""f""")
 hasLocation(#22470,#20801)
-enclosingStmt(#22470,#22454)
+enclosing_stmt(#22470,#22454)
 exprContainers(#22470,#22183)
 literals("f","""f""",#22470)
 #22471=*
@@ -6925,7 +6925,7 @@ stmt_containers(#22471,#22183)
 #22473=*
 typeexprs(#22473,1,#22471,0,"T31")
 hasLocation(#22473,#20809)
-enclosingStmt(#22473,#22471)
+enclosing_stmt(#22473,#22471)
 exprContainers(#22473,#22183)
 literals("T31","T31",#22473)
 typedecl(#22473,#22207)
@@ -6934,12 +6934,12 @@ typeexprs(#22474,14,#22471,1,"Filter< ...  | ""f"">")
 #22475=@"loc,{#10000},33,14,33,59"
 locations_default(#22475,#10000,33,14,33,59)
 hasLocation(#22474,#22475)
-enclosingStmt(#22474,#22471)
+enclosing_stmt(#22474,#22471)
 exprContainers(#22474,#22183)
 #22476=*
 typeexprs(#22476,0,#22474,-1,"Filter")
 hasLocation(#22476,#20813)
-enclosingStmt(#22476,#22471)
+enclosing_stmt(#22476,#22471)
 exprContainers(#22476,#22183)
 literals("Filter","Filter",#22476)
 typebind(#22476,#22205)
@@ -6948,30 +6948,30 @@ typeexprs(#22477,7,#22474,0,"""a"" | "" ... "" | ""d""")
 #22478=@"loc,{#10000},33,21,33,41"
 locations_default(#22478,#10000,33,21,33,41)
 hasLocation(#22477,#22478)
-enclosingStmt(#22477,#22471)
+enclosing_stmt(#22477,#22471)
 exprContainers(#22477,#22183)
 #22479=*
 typeexprs(#22479,3,#22477,0,"""a""")
 hasLocation(#22479,#20817)
-enclosingStmt(#22479,#22471)
+enclosing_stmt(#22479,#22471)
 exprContainers(#22479,#22183)
 literals("a","""a""",#22479)
 #22480=*
 typeexprs(#22480,3,#22477,1,"""b""")
 hasLocation(#22480,#20821)
-enclosingStmt(#22480,#22471)
+enclosing_stmt(#22480,#22471)
 exprContainers(#22480,#22183)
 literals("b","""b""",#22480)
 #22481=*
 typeexprs(#22481,3,#22477,2,"""c""")
 hasLocation(#22481,#20825)
-enclosingStmt(#22481,#22471)
+enclosing_stmt(#22481,#22471)
 exprContainers(#22481,#22183)
 literals("c","""c""",#22481)
 #22482=*
 typeexprs(#22482,3,#22477,3,"""d""")
 hasLocation(#22482,#20829)
-enclosingStmt(#22482,#22471)
+enclosing_stmt(#22482,#22471)
 exprContainers(#22482,#22183)
 literals("d","""d""",#22482)
 #22483=*
@@ -6979,24 +6979,24 @@ typeexprs(#22483,7,#22474,1,"""a"" | ""c"" | ""f""")
 #22484=@"loc,{#10000},33,44,33,58"
 locations_default(#22484,#10000,33,44,33,58)
 hasLocation(#22483,#22484)
-enclosingStmt(#22483,#22471)
+enclosing_stmt(#22483,#22471)
 exprContainers(#22483,#22183)
 #22485=*
 typeexprs(#22485,3,#22483,0,"""a""")
 hasLocation(#22485,#20833)
-enclosingStmt(#22485,#22471)
+enclosing_stmt(#22485,#22471)
 exprContainers(#22485,#22183)
 literals("a","""a""",#22485)
 #22486=*
 typeexprs(#22486,3,#22483,1,"""c""")
 hasLocation(#22486,#20837)
-enclosingStmt(#22486,#22471)
+enclosing_stmt(#22486,#22471)
 exprContainers(#22486,#22183)
 literals("c","""c""",#22486)
 #22487=*
 typeexprs(#22487,3,#22483,2,"""f""")
 hasLocation(#22487,#20841)
-enclosingStmt(#22487,#22471)
+enclosing_stmt(#22487,#22471)
 exprContainers(#22487,#22183)
 literals("f","""f""",#22487)
 #22488=*
@@ -7008,7 +7008,7 @@ stmt_containers(#22488,#22183)
 #22490=*
 typeexprs(#22490,1,#22488,0,"T32")
 hasLocation(#22490,#20849)
-enclosingStmt(#22490,#22488)
+enclosing_stmt(#22490,#22488)
 exprContainers(#22490,#22183)
 literals("T32","T32",#22490)
 typedecl(#22490,#22208)
@@ -7017,12 +7017,12 @@ typeexprs(#22491,14,#22488,1,"Diff<st ... nction>")
 #22492=@"loc,{#10000},34,14,34,59"
 locations_default(#22492,#10000,34,14,34,59)
 hasLocation(#22491,#22492)
-enclosingStmt(#22491,#22488)
+enclosing_stmt(#22491,#22488)
 exprContainers(#22491,#22183)
 #22493=*
 typeexprs(#22493,0,#22491,-1,"Diff")
 hasLocation(#22493,#20853)
-enclosingStmt(#22493,#22488)
+enclosing_stmt(#22493,#22488)
 exprContainers(#22493,#22183)
 literals("Diff","Diff",#22493)
 typebind(#22493,#22204)
@@ -7031,18 +7031,18 @@ typeexprs(#22494,7,#22491,0,"string  ... > void)")
 #22495=@"loc,{#10000},34,19,34,48"
 locations_default(#22495,#10000,34,19,34,48)
 hasLocation(#22494,#22495)
-enclosingStmt(#22494,#22488)
+enclosing_stmt(#22494,#22488)
 exprContainers(#22494,#22183)
 #22496=*
 typeexprs(#22496,2,#22494,0,"string")
 hasLocation(#22496,#20857)
-enclosingStmt(#22496,#22488)
+enclosing_stmt(#22496,#22488)
 exprContainers(#22496,#22183)
 literals("string","string",#22496)
 #22497=*
 typeexprs(#22497,2,#22494,1,"number")
 hasLocation(#22497,#20861)
-enclosingStmt(#22497,#22488)
+enclosing_stmt(#22497,#22488)
 exprContainers(#22497,#22183)
 literals("number","number",#22497)
 #22498=*
@@ -7050,19 +7050,19 @@ typeexprs(#22498,10,#22494,2,"(() => void)")
 #22499=@"loc,{#10000},34,37,34,48"
 locations_default(#22499,#10000,34,37,34,48)
 hasLocation(#22498,#22499)
-enclosingStmt(#22498,#22488)
+enclosing_stmt(#22498,#22488)
 exprContainers(#22498,#22183)
 #22500=*
 typeexprs(#22500,23,#22498,0,"() => void")
 #22501=@"loc,{#10000},34,38,34,47"
 locations_default(#22501,#10000,34,38,34,47)
 hasLocation(#22500,#22501)
-enclosingStmt(#22500,#22488)
+enclosing_stmt(#22500,#22488)
 exprContainers(#22500,#22183)
 #22502=*
 exprs(#22502,9,#22500,0,"() => void")
 hasLocation(#22502,#22501)
-enclosingStmt(#22502,#22488)
+enclosing_stmt(#22502,#22488)
 exprContainers(#22502,#22183)
 #22503=*
 scopes(#22503,1)
@@ -7079,7 +7079,7 @@ literals("void","void",#22505)
 #22506=*
 typeexprs(#22506,0,#22491,1,"Function")
 hasLocation(#22506,#20879)
-enclosingStmt(#22506,#22488)
+enclosing_stmt(#22506,#22488)
 exprContainers(#22506,#22183)
 literals("Function","Function",#22506)
 #22507=*
@@ -7091,7 +7091,7 @@ stmt_containers(#22507,#22183)
 #22509=*
 typeexprs(#22509,1,#22507,0,"T33")
 hasLocation(#22509,#20887)
-enclosingStmt(#22509,#22507)
+enclosing_stmt(#22509,#22507)
 exprContainers(#22509,#22183)
 literals("T33","T33",#22509)
 typedecl(#22509,#22209)
@@ -7100,12 +7100,12 @@ typeexprs(#22510,14,#22507,1,"Filter< ... nction>")
 #22511=@"loc,{#10000},35,14,35,61"
 locations_default(#22511,#10000,35,14,35,61)
 hasLocation(#22510,#22511)
-enclosingStmt(#22510,#22507)
+enclosing_stmt(#22510,#22507)
 exprContainers(#22510,#22183)
 #22512=*
 typeexprs(#22512,0,#22510,-1,"Filter")
 hasLocation(#22512,#20891)
-enclosingStmt(#22512,#22507)
+enclosing_stmt(#22512,#22507)
 exprContainers(#22512,#22183)
 literals("Filter","Filter",#22512)
 typebind(#22512,#22205)
@@ -7114,18 +7114,18 @@ typeexprs(#22513,7,#22510,0,"string  ... > void)")
 #22514=@"loc,{#10000},35,21,35,50"
 locations_default(#22514,#10000,35,21,35,50)
 hasLocation(#22513,#22514)
-enclosingStmt(#22513,#22507)
+enclosing_stmt(#22513,#22507)
 exprContainers(#22513,#22183)
 #22515=*
 typeexprs(#22515,2,#22513,0,"string")
 hasLocation(#22515,#20895)
-enclosingStmt(#22515,#22507)
+enclosing_stmt(#22515,#22507)
 exprContainers(#22515,#22183)
 literals("string","string",#22515)
 #22516=*
 typeexprs(#22516,2,#22513,1,"number")
 hasLocation(#22516,#20899)
-enclosingStmt(#22516,#22507)
+enclosing_stmt(#22516,#22507)
 exprContainers(#22516,#22183)
 literals("number","number",#22516)
 #22517=*
@@ -7133,19 +7133,19 @@ typeexprs(#22517,10,#22513,2,"(() => void)")
 #22518=@"loc,{#10000},35,39,35,50"
 locations_default(#22518,#10000,35,39,35,50)
 hasLocation(#22517,#22518)
-enclosingStmt(#22517,#22507)
+enclosing_stmt(#22517,#22507)
 exprContainers(#22517,#22183)
 #22519=*
 typeexprs(#22519,23,#22517,0,"() => void")
 #22520=@"loc,{#10000},35,40,35,49"
 locations_default(#22520,#10000,35,40,35,49)
 hasLocation(#22519,#22520)
-enclosingStmt(#22519,#22507)
+enclosing_stmt(#22519,#22507)
 exprContainers(#22519,#22183)
 #22521=*
 exprs(#22521,9,#22519,0,"() => void")
 hasLocation(#22521,#22520)
-enclosingStmt(#22521,#22507)
+enclosing_stmt(#22521,#22507)
 exprContainers(#22521,#22183)
 #22522=*
 scopes(#22522,1)
@@ -7162,7 +7162,7 @@ literals("void","void",#22524)
 #22525=*
 typeexprs(#22525,0,#22510,1,"Function")
 hasLocation(#22525,#20917)
-enclosingStmt(#22525,#22507)
+enclosing_stmt(#22525,#22507)
 exprContainers(#22525,#22183)
 literals("Function","Function",#22525)
 #22526=*
@@ -7174,7 +7174,7 @@ stmt_containers(#22526,#22183)
 #22528=*
 typeexprs(#22528,1,#22526,0,"NonNullable")
 hasLocation(#22528,#20925)
-enclosingStmt(#22528,#22526)
+enclosing_stmt(#22528,#22526)
 exprContainers(#22528,#22183)
 literals("NonNullable","NonNullable",#22528)
 typedecl(#22528,#22210)
@@ -7187,12 +7187,12 @@ local_type_names(#22530,"T",#22529)
 #22531=*
 typeexprs(#22531,22,#22526,2,"T")
 hasLocation(#22531,#20929)
-enclosingStmt(#22531,#22526)
+enclosing_stmt(#22531,#22526)
 exprContainers(#22531,#22183)
 #22532=*
 typeexprs(#22532,1,#22531,0,"T")
 hasLocation(#22532,#20929)
-enclosingStmt(#22532,#22526)
+enclosing_stmt(#22532,#22526)
 exprContainers(#22532,#22183)
 literals("T","T",#22532)
 typedecl(#22532,#22530)
@@ -7201,19 +7201,19 @@ typeexprs(#22533,14,#22526,1,"Diff<T, ... efined>")
 #22534=@"loc,{#10000},37,25,37,49"
 locations_default(#22534,#10000,37,25,37,49)
 hasLocation(#22533,#22534)
-enclosingStmt(#22533,#22526)
+enclosing_stmt(#22533,#22526)
 exprContainers(#22533,#22183)
 #22535=*
 typeexprs(#22535,0,#22533,-1,"Diff")
 hasLocation(#22535,#20935)
-enclosingStmt(#22535,#22526)
+enclosing_stmt(#22535,#22526)
 exprContainers(#22535,#22183)
 literals("Diff","Diff",#22535)
 typebind(#22535,#22204)
 #22536=*
 typeexprs(#22536,0,#22533,0,"T")
 hasLocation(#22536,#20939)
-enclosingStmt(#22536,#22526)
+enclosing_stmt(#22536,#22526)
 exprContainers(#22536,#22183)
 literals("T","T",#22536)
 typebind(#22536,#22530)
@@ -7222,18 +7222,18 @@ typeexprs(#22537,7,#22533,1,"null | undefined")
 #22538=@"loc,{#10000},37,33,37,48"
 locations_default(#22538,#10000,37,33,37,48)
 hasLocation(#22537,#22538)
-enclosingStmt(#22537,#22526)
+enclosing_stmt(#22537,#22526)
 exprContainers(#22537,#22183)
 #22539=*
 typeexprs(#22539,2,#22537,0,"null")
 hasLocation(#22539,#20943)
-enclosingStmt(#22539,#22526)
+enclosing_stmt(#22539,#22526)
 exprContainers(#22539,#22183)
 literals("null","null",#22539)
 #22540=*
 typeexprs(#22540,2,#22537,1,"undefined")
 hasLocation(#22540,#20947)
-enclosingStmt(#22540,#22526)
+enclosing_stmt(#22540,#22526)
 exprContainers(#22540,#22183)
 literals("undefined","undefined",#22540)
 #22541=*
@@ -7245,7 +7245,7 @@ stmt_containers(#22541,#22183)
 #22543=*
 typeexprs(#22543,1,#22541,0,"T34")
 hasLocation(#22543,#20955)
-enclosingStmt(#22543,#22541)
+enclosing_stmt(#22543,#22541)
 exprContainers(#22543,#22183)
 literals("T34","T34",#22543)
 typedecl(#22543,#22211)
@@ -7254,12 +7254,12 @@ typeexprs(#22544,14,#22541,1,"NonNull ... efined>")
 #22545=@"loc,{#10000},39,14,39,53"
 locations_default(#22545,#10000,39,14,39,53)
 hasLocation(#22544,#22545)
-enclosingStmt(#22544,#22541)
+enclosing_stmt(#22544,#22541)
 exprContainers(#22544,#22183)
 #22546=*
 typeexprs(#22546,0,#22544,-1,"NonNullable")
 hasLocation(#22546,#20959)
-enclosingStmt(#22546,#22541)
+enclosing_stmt(#22546,#22541)
 exprContainers(#22546,#22183)
 literals("NonNullable","NonNullable",#22546)
 typebind(#22546,#22210)
@@ -7268,24 +7268,24 @@ typeexprs(#22547,7,#22544,0,"string  ... defined")
 #22548=@"loc,{#10000},39,26,39,52"
 locations_default(#22548,#10000,39,26,39,52)
 hasLocation(#22547,#22548)
-enclosingStmt(#22547,#22541)
+enclosing_stmt(#22547,#22541)
 exprContainers(#22547,#22183)
 #22549=*
 typeexprs(#22549,2,#22547,0,"string")
 hasLocation(#22549,#20963)
-enclosingStmt(#22549,#22541)
+enclosing_stmt(#22549,#22541)
 exprContainers(#22549,#22183)
 literals("string","string",#22549)
 #22550=*
 typeexprs(#22550,2,#22547,1,"number")
 hasLocation(#22550,#20967)
-enclosingStmt(#22550,#22541)
+enclosing_stmt(#22550,#22541)
 exprContainers(#22550,#22183)
 literals("number","number",#22550)
 #22551=*
 typeexprs(#22551,2,#22547,2,"undefined")
 hasLocation(#22551,#20971)
-enclosingStmt(#22551,#22541)
+enclosing_stmt(#22551,#22541)
 exprContainers(#22551,#22183)
 literals("undefined","undefined",#22551)
 #22552=*
@@ -7297,7 +7297,7 @@ stmt_containers(#22552,#22183)
 #22554=*
 typeexprs(#22554,1,#22552,0,"T35")
 hasLocation(#22554,#20979)
-enclosingStmt(#22554,#22552)
+enclosing_stmt(#22554,#22552)
 exprContainers(#22554,#22183)
 literals("T35","T35",#22554)
 typedecl(#22554,#22212)
@@ -7306,12 +7306,12 @@ typeexprs(#22555,14,#22552,1,"NonNull ... efined>")
 #22556=@"loc,{#10000},40,14,40,62"
 locations_default(#22556,#10000,40,14,40,62)
 hasLocation(#22555,#22556)
-enclosingStmt(#22555,#22552)
+enclosing_stmt(#22555,#22552)
 exprContainers(#22555,#22183)
 #22557=*
 typeexprs(#22557,0,#22555,-1,"NonNullable")
 hasLocation(#22557,#20983)
-enclosingStmt(#22557,#22552)
+enclosing_stmt(#22557,#22552)
 exprContainers(#22557,#22183)
 literals("NonNullable","NonNullable",#22557)
 typebind(#22557,#22210)
@@ -7320,12 +7320,12 @@ typeexprs(#22558,7,#22555,0,"string  ... defined")
 #22559=@"loc,{#10000},40,26,40,61"
 locations_default(#22559,#10000,40,26,40,61)
 hasLocation(#22558,#22559)
-enclosingStmt(#22558,#22552)
+enclosing_stmt(#22558,#22552)
 exprContainers(#22558,#22183)
 #22560=*
 typeexprs(#22560,2,#22558,0,"string")
 hasLocation(#22560,#20987)
-enclosingStmt(#22560,#22552)
+enclosing_stmt(#22560,#22552)
 exprContainers(#22560,#22183)
 literals("string","string",#22560)
 #22561=*
@@ -7333,24 +7333,24 @@ typeexprs(#22561,6,#22558,1,"string[]")
 #22562=@"loc,{#10000},40,35,40,42"
 locations_default(#22562,#10000,40,35,40,42)
 hasLocation(#22561,#22562)
-enclosingStmt(#22561,#22552)
+enclosing_stmt(#22561,#22552)
 exprContainers(#22561,#22183)
 #22563=*
 typeexprs(#22563,2,#22561,0,"string")
 hasLocation(#22563,#20991)
-enclosingStmt(#22563,#22552)
+enclosing_stmt(#22563,#22552)
 exprContainers(#22563,#22183)
 literals("string","string",#22563)
 #22564=*
 typeexprs(#22564,2,#22558,2,"null")
 hasLocation(#22564,#20999)
-enclosingStmt(#22564,#22552)
+enclosing_stmt(#22564,#22552)
 exprContainers(#22564,#22183)
 literals("null","null",#22564)
 #22565=*
 typeexprs(#22565,2,#22558,3,"undefined")
 hasLocation(#22565,#21003)
-enclosingStmt(#22565,#22552)
+enclosing_stmt(#22565,#22552)
 exprContainers(#22565,#22183)
 literals("undefined","undefined",#22565)
 #22566=*
@@ -7441,19 +7441,19 @@ exprs(#22587,47,#22585,0,"x = y")
 #22588=@"loc,{#10000},43,7,43,11"
 locations_default(#22588,#10000,43,7,43,11)
 hasLocation(#22587,#22588)
-enclosingStmt(#22587,#22585)
+enclosing_stmt(#22587,#22585)
 exprContainers(#22587,#22566)
 #22589=*
 exprs(#22589,79,#22587,0,"x")
 hasLocation(#22589,#21045)
-enclosingStmt(#22589,#22585)
+enclosing_stmt(#22589,#22585)
 exprContainers(#22589,#22566)
 literals("x","x",#22589)
 bind(#22589,#22571)
 #22590=*
 exprs(#22590,79,#22587,1,"y")
 hasLocation(#22590,#21049)
-enclosingStmt(#22590,#22585)
+enclosing_stmt(#22590,#22585)
 exprContainers(#22590,#22566)
 literals("y","y",#22590)
 bind(#22590,#22573)
@@ -7569,19 +7569,19 @@ exprs(#22619,47,#22617,0,"x = y")
 #22620=@"loc,{#10000},47,7,47,11"
 locations_default(#22620,#10000,47,7,47,11)
 hasLocation(#22619,#22620)
-enclosingStmt(#22619,#22617)
+enclosing_stmt(#22619,#22617)
 exprContainers(#22619,#22591)
 #22621=*
 exprs(#22621,79,#22619,0,"x")
 hasLocation(#22621,#21099)
-enclosingStmt(#22621,#22617)
+enclosing_stmt(#22621,#22617)
 exprContainers(#22621,#22591)
 literals("x","x",#22621)
 bind(#22621,#22596)
 #22622=*
 exprs(#22622,79,#22619,1,"y")
 hasLocation(#22622,#21103)
-enclosingStmt(#22622,#22617)
+enclosing_stmt(#22622,#22617)
 exprContainers(#22622,#22591)
 literals("y","y",#22622)
 bind(#22622,#22598)
@@ -7596,26 +7596,26 @@ exprs(#22625,64,#22623,0,"s2: string = y")
 #22626=@"loc,{#10000},48,11,48,24"
 locations_default(#22626,#10000,48,11,48,24)
 hasLocation(#22625,#22626)
-enclosingStmt(#22625,#22623)
+enclosing_stmt(#22625,#22623)
 exprContainers(#22625,#22591)
 #22627=*
 exprs(#22627,78,#22625,0,"s2")
 hasLocation(#22627,#21109)
-enclosingStmt(#22627,#22623)
+enclosing_stmt(#22627,#22623)
 exprContainers(#22627,#22591)
 literals("s2","s2",#22627)
 decl(#22627,#22616)
 #22628=*
 exprs(#22628,79,#22625,1,"y")
 hasLocation(#22628,#21117)
-enclosingStmt(#22628,#22623)
+enclosing_stmt(#22628,#22623)
 exprContainers(#22628,#22591)
 literals("y","y",#22628)
 bind(#22628,#22598)
 #22629=*
 typeexprs(#22629,2,#22625,2,"string")
 hasLocation(#22629,#21113)
-enclosingStmt(#22629,#22623)
+enclosing_stmt(#22629,#22623)
 exprContainers(#22629,#22591)
 literals("string","string",#22629)
 #22630=*
@@ -7627,7 +7627,7 @@ stmt_containers(#22630,#22183)
 #22632=*
 typeexprs(#22632,1,#22630,0,"Functio ... tyNames")
 hasLocation(#22632,#21125)
-enclosingStmt(#22632,#22630)
+enclosing_stmt(#22632,#22630)
 exprContainers(#22632,#22183)
 literals("FunctionPropertyNames","FunctionPropertyNames",#22632)
 typedecl(#22632,#22213)
@@ -7640,12 +7640,12 @@ local_type_names(#22634,"T",#22633)
 #22635=*
 typeexprs(#22635,22,#22630,2,"T")
 hasLocation(#22635,#21129)
-enclosingStmt(#22635,#22630)
+enclosing_stmt(#22635,#22630)
 exprContainers(#22635,#22183)
 #22636=*
 typeexprs(#22636,1,#22635,0,"T")
 hasLocation(#22636,#21129)
-enclosingStmt(#22636,#22630)
+enclosing_stmt(#22636,#22630)
 exprContainers(#22636,#22183)
 literals("T","T",#22636)
 typedecl(#22636,#22634)
@@ -7654,14 +7654,14 @@ typeexprs(#22637,8,#22630,1,"{ [K in ... eyof T]")
 #22638=@"loc,{#10000},51,35,51,96"
 locations_default(#22638,#10000,51,35,51,96)
 hasLocation(#22637,#22638)
-enclosingStmt(#22637,#22630)
+enclosing_stmt(#22637,#22630)
 exprContainers(#22637,#22183)
 #22639=*
 typeexprs(#22639,27,#22637,0,"{ [K in ... never }")
 #22640=@"loc,{#10000},51,35,51,87"
 locations_default(#22640,#10000,51,35,51,87)
 hasLocation(#22639,#22640)
-enclosingStmt(#22639,#22630)
+enclosing_stmt(#22639,#22630)
 exprContainers(#22639,#22183)
 #22641=*
 scopes(#22641,13)
@@ -7674,12 +7674,12 @@ typeexprs(#22643,22,#22639,0,"K in keyof T")
 #22644=@"loc,{#10000},51,38,51,49"
 locations_default(#22644,#10000,51,38,51,49)
 hasLocation(#22643,#22644)
-enclosingStmt(#22643,#22630)
+enclosing_stmt(#22643,#22630)
 exprContainers(#22643,#22183)
 #22645=*
 typeexprs(#22645,1,#22643,0,"K")
 hasLocation(#22645,#21139)
-enclosingStmt(#22645,#22630)
+enclosing_stmt(#22645,#22630)
 exprContainers(#22645,#22183)
 literals("K","K",#22645)
 typedecl(#22645,#22642)
@@ -7688,12 +7688,12 @@ typeexprs(#22646,12,#22643,1,"keyof T")
 #22647=@"loc,{#10000},51,43,51,49"
 locations_default(#22647,#10000,51,43,51,49)
 hasLocation(#22646,#22647)
-enclosingStmt(#22646,#22630)
+enclosing_stmt(#22646,#22630)
 exprContainers(#22646,#22183)
 #22648=*
 typeexprs(#22648,0,#22646,0,"T")
 hasLocation(#22648,#21145)
-enclosingStmt(#22648,#22630)
+enclosing_stmt(#22648,#22630)
 exprContainers(#22648,#22183)
 literals("T","T",#22648)
 typebind(#22648,#22634)
@@ -7702,46 +7702,46 @@ typeexprs(#22649,28,#22639,1,"T[K] ex ... : never")
 #22650=@"loc,{#10000},51,53,51,85"
 locations_default(#22650,#10000,51,53,51,85)
 hasLocation(#22649,#22650)
-enclosingStmt(#22649,#22630)
+enclosing_stmt(#22649,#22630)
 exprContainers(#22649,#22183)
 #22651=*
 typeexprs(#22651,8,#22649,0,"T[K]")
 #22652=@"loc,{#10000},51,53,51,56"
 locations_default(#22652,#10000,51,53,51,56)
 hasLocation(#22651,#22652)
-enclosingStmt(#22651,#22630)
+enclosing_stmt(#22651,#22630)
 exprContainers(#22651,#22183)
 #22653=*
 typeexprs(#22653,0,#22651,0,"T")
 hasLocation(#22653,#21151)
-enclosingStmt(#22653,#22630)
+enclosing_stmt(#22653,#22630)
 exprContainers(#22653,#22183)
 literals("T","T",#22653)
 typebind(#22653,#22634)
 #22654=*
 typeexprs(#22654,0,#22651,1,"K")
 hasLocation(#22654,#21155)
-enclosingStmt(#22654,#22630)
+enclosing_stmt(#22654,#22630)
 exprContainers(#22654,#22183)
 literals("K","K",#22654)
 typebind(#22654,#22642)
 #22655=*
 typeexprs(#22655,0,#22649,1,"Function")
 hasLocation(#22655,#21161)
-enclosingStmt(#22655,#22630)
+enclosing_stmt(#22655,#22630)
 exprContainers(#22655,#22183)
 literals("Function","Function",#22655)
 #22656=*
 typeexprs(#22656,0,#22649,2,"K")
 hasLocation(#22656,#21165)
-enclosingStmt(#22656,#22630)
+enclosing_stmt(#22656,#22630)
 exprContainers(#22656,#22183)
 literals("K","K",#22656)
 typebind(#22656,#22642)
 #22657=*
 typeexprs(#22657,2,#22649,3,"never")
 hasLocation(#22657,#21169)
-enclosingStmt(#22657,#22630)
+enclosing_stmt(#22657,#22630)
 exprContainers(#22657,#22183)
 literals("never","never",#22657)
 #22658=*
@@ -7749,12 +7749,12 @@ typeexprs(#22658,12,#22637,1,"keyof T")
 #22659=@"loc,{#10000},51,89,51,95"
 locations_default(#22659,#10000,51,89,51,95)
 hasLocation(#22658,#22659)
-enclosingStmt(#22658,#22630)
+enclosing_stmt(#22658,#22630)
 exprContainers(#22658,#22183)
 #22660=*
 typeexprs(#22660,0,#22658,0,"T")
 hasLocation(#22660,#21177)
-enclosingStmt(#22660,#22630)
+enclosing_stmt(#22660,#22630)
 exprContainers(#22660,#22183)
 literals("T","T",#22660)
 typebind(#22660,#22634)
@@ -7767,7 +7767,7 @@ stmt_containers(#22661,#22183)
 #22663=*
 typeexprs(#22663,1,#22661,0,"FunctionProperties")
 hasLocation(#22663,#21185)
-enclosingStmt(#22663,#22661)
+enclosing_stmt(#22663,#22661)
 exprContainers(#22663,#22183)
 literals("FunctionProperties","FunctionProperties",#22663)
 typedecl(#22663,#22214)
@@ -7780,12 +7780,12 @@ local_type_names(#22665,"T",#22664)
 #22666=*
 typeexprs(#22666,22,#22661,2,"T")
 hasLocation(#22666,#21189)
-enclosingStmt(#22666,#22661)
+enclosing_stmt(#22666,#22661)
 exprContainers(#22666,#22183)
 #22667=*
 typeexprs(#22667,1,#22666,0,"T")
 hasLocation(#22667,#21189)
-enclosingStmt(#22667,#22661)
+enclosing_stmt(#22667,#22661)
 exprContainers(#22667,#22183)
 literals("T","T",#22667)
 typedecl(#22667,#22665)
@@ -7794,18 +7794,18 @@ typeexprs(#22668,14,#22661,1,"Pick<T, ... mes<T>>")
 #22669=@"loc,{#10000},52,32,52,64"
 locations_default(#22669,#10000,52,32,52,64)
 hasLocation(#22668,#22669)
-enclosingStmt(#22668,#22661)
+enclosing_stmt(#22668,#22661)
 exprContainers(#22668,#22183)
 #22670=*
 typeexprs(#22670,0,#22668,-1,"Pick")
 hasLocation(#22670,#21195)
-enclosingStmt(#22670,#22661)
+enclosing_stmt(#22670,#22661)
 exprContainers(#22670,#22183)
 literals("Pick","Pick",#22670)
 #22671=*
 typeexprs(#22671,0,#22668,0,"T")
 hasLocation(#22671,#21199)
-enclosingStmt(#22671,#22661)
+enclosing_stmt(#22671,#22661)
 exprContainers(#22671,#22183)
 literals("T","T",#22671)
 typebind(#22671,#22665)
@@ -7814,19 +7814,19 @@ typeexprs(#22672,14,#22668,1,"Functio ... ames<T>")
 #22673=@"loc,{#10000},52,40,52,63"
 locations_default(#22673,#10000,52,40,52,63)
 hasLocation(#22672,#22673)
-enclosingStmt(#22672,#22661)
+enclosing_stmt(#22672,#22661)
 exprContainers(#22672,#22183)
 #22674=*
 typeexprs(#22674,0,#22672,-1,"Functio ... tyNames")
 hasLocation(#22674,#21203)
-enclosingStmt(#22674,#22661)
+enclosing_stmt(#22674,#22661)
 exprContainers(#22674,#22183)
 literals("FunctionPropertyNames","FunctionPropertyNames",#22674)
 typebind(#22674,#22213)
 #22675=*
 typeexprs(#22675,0,#22672,0,"T")
 hasLocation(#22675,#21207)
-enclosingStmt(#22675,#22661)
+enclosing_stmt(#22675,#22661)
 exprContainers(#22675,#22183)
 literals("T","T",#22675)
 typebind(#22675,#22665)
@@ -7839,7 +7839,7 @@ stmt_containers(#22676,#22183)
 #22678=*
 typeexprs(#22678,1,#22676,0,"NonFunc ... tyNames")
 hasLocation(#22678,#21217)
-enclosingStmt(#22678,#22676)
+enclosing_stmt(#22678,#22676)
 exprContainers(#22678,#22183)
 literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22678)
 typedecl(#22678,#22215)
@@ -7852,12 +7852,12 @@ local_type_names(#22680,"T",#22679)
 #22681=*
 typeexprs(#22681,22,#22676,2,"T")
 hasLocation(#22681,#21221)
-enclosingStmt(#22681,#22676)
+enclosing_stmt(#22681,#22676)
 exprContainers(#22681,#22183)
 #22682=*
 typeexprs(#22682,1,#22681,0,"T")
 hasLocation(#22682,#21221)
-enclosingStmt(#22682,#22676)
+enclosing_stmt(#22682,#22676)
 exprContainers(#22682,#22183)
 literals("T","T",#22682)
 typedecl(#22682,#22680)
@@ -7866,14 +7866,14 @@ typeexprs(#22683,8,#22676,1,"{ [K in ... eyof T]")
 #22684=@"loc,{#10000},54,38,54,99"
 locations_default(#22684,#10000,54,38,54,99)
 hasLocation(#22683,#22684)
-enclosingStmt(#22683,#22676)
+enclosing_stmt(#22683,#22676)
 exprContainers(#22683,#22183)
 #22685=*
 typeexprs(#22685,27,#22683,0,"{ [K in ... r : K }")
 #22686=@"loc,{#10000},54,38,54,90"
 locations_default(#22686,#10000,54,38,54,90)
 hasLocation(#22685,#22686)
-enclosingStmt(#22685,#22676)
+enclosing_stmt(#22685,#22676)
 exprContainers(#22685,#22183)
 #22687=*
 scopes(#22687,13)
@@ -7886,12 +7886,12 @@ typeexprs(#22689,22,#22685,0,"K in keyof T")
 #22690=@"loc,{#10000},54,41,54,52"
 locations_default(#22690,#10000,54,41,54,52)
 hasLocation(#22689,#22690)
-enclosingStmt(#22689,#22676)
+enclosing_stmt(#22689,#22676)
 exprContainers(#22689,#22183)
 #22691=*
 typeexprs(#22691,1,#22689,0,"K")
 hasLocation(#22691,#21231)
-enclosingStmt(#22691,#22676)
+enclosing_stmt(#22691,#22676)
 exprContainers(#22691,#22183)
 literals("K","K",#22691)
 typedecl(#22691,#22688)
@@ -7900,12 +7900,12 @@ typeexprs(#22692,12,#22689,1,"keyof T")
 #22693=@"loc,{#10000},54,46,54,52"
 locations_default(#22693,#10000,54,46,54,52)
 hasLocation(#22692,#22693)
-enclosingStmt(#22692,#22676)
+enclosing_stmt(#22692,#22676)
 exprContainers(#22692,#22183)
 #22694=*
 typeexprs(#22694,0,#22692,0,"T")
 hasLocation(#22694,#21237)
-enclosingStmt(#22694,#22676)
+enclosing_stmt(#22694,#22676)
 exprContainers(#22694,#22183)
 literals("T","T",#22694)
 typebind(#22694,#22680)
@@ -7914,45 +7914,45 @@ typeexprs(#22695,28,#22685,1,"T[K] ex ... ver : K")
 #22696=@"loc,{#10000},54,56,54,88"
 locations_default(#22696,#10000,54,56,54,88)
 hasLocation(#22695,#22696)
-enclosingStmt(#22695,#22676)
+enclosing_stmt(#22695,#22676)
 exprContainers(#22695,#22183)
 #22697=*
 typeexprs(#22697,8,#22695,0,"T[K]")
 #22698=@"loc,{#10000},54,56,54,59"
 locations_default(#22698,#10000,54,56,54,59)
 hasLocation(#22697,#22698)
-enclosingStmt(#22697,#22676)
+enclosing_stmt(#22697,#22676)
 exprContainers(#22697,#22183)
 #22699=*
 typeexprs(#22699,0,#22697,0,"T")
 hasLocation(#22699,#21243)
-enclosingStmt(#22699,#22676)
+enclosing_stmt(#22699,#22676)
 exprContainers(#22699,#22183)
 literals("T","T",#22699)
 typebind(#22699,#22680)
 #22700=*
 typeexprs(#22700,0,#22697,1,"K")
 hasLocation(#22700,#21247)
-enclosingStmt(#22700,#22676)
+enclosing_stmt(#22700,#22676)
 exprContainers(#22700,#22183)
 literals("K","K",#22700)
 typebind(#22700,#22688)
 #22701=*
 typeexprs(#22701,0,#22695,1,"Function")
 hasLocation(#22701,#21253)
-enclosingStmt(#22701,#22676)
+enclosing_stmt(#22701,#22676)
 exprContainers(#22701,#22183)
 literals("Function","Function",#22701)
 #22702=*
 typeexprs(#22702,2,#22695,2,"never")
 hasLocation(#22702,#21257)
-enclosingStmt(#22702,#22676)
+enclosing_stmt(#22702,#22676)
 exprContainers(#22702,#22183)
 literals("never","never",#22702)
 #22703=*
 typeexprs(#22703,0,#22695,3,"K")
 hasLocation(#22703,#21261)
-enclosingStmt(#22703,#22676)
+enclosing_stmt(#22703,#22676)
 exprContainers(#22703,#22183)
 literals("K","K",#22703)
 typebind(#22703,#22688)
@@ -7961,12 +7961,12 @@ typeexprs(#22704,12,#22683,1,"keyof T")
 #22705=@"loc,{#10000},54,92,54,98"
 locations_default(#22705,#10000,54,92,54,98)
 hasLocation(#22704,#22705)
-enclosingStmt(#22704,#22676)
+enclosing_stmt(#22704,#22676)
 exprContainers(#22704,#22183)
 #22706=*
 typeexprs(#22706,0,#22704,0,"T")
 hasLocation(#22706,#21269)
-enclosingStmt(#22706,#22676)
+enclosing_stmt(#22706,#22676)
 exprContainers(#22706,#22183)
 literals("T","T",#22706)
 typebind(#22706,#22680)
@@ -7979,7 +7979,7 @@ stmt_containers(#22707,#22183)
 #22709=*
 typeexprs(#22709,1,#22707,0,"NonFunc ... perties")
 hasLocation(#22709,#21277)
-enclosingStmt(#22709,#22707)
+enclosing_stmt(#22709,#22707)
 exprContainers(#22709,#22183)
 literals("NonFunctionProperties","NonFunctionProperties",#22709)
 typedecl(#22709,#22216)
@@ -7992,12 +7992,12 @@ local_type_names(#22711,"T",#22710)
 #22712=*
 typeexprs(#22712,22,#22707,2,"T")
 hasLocation(#22712,#21281)
-enclosingStmt(#22712,#22707)
+enclosing_stmt(#22712,#22707)
 exprContainers(#22712,#22183)
 #22713=*
 typeexprs(#22713,1,#22712,0,"T")
 hasLocation(#22713,#21281)
-enclosingStmt(#22713,#22707)
+enclosing_stmt(#22713,#22707)
 exprContainers(#22713,#22183)
 literals("T","T",#22713)
 typedecl(#22713,#22711)
@@ -8006,18 +8006,18 @@ typeexprs(#22714,14,#22707,1,"Pick<T, ... mes<T>>")
 #22715=@"loc,{#10000},55,35,55,70"
 locations_default(#22715,#10000,55,35,55,70)
 hasLocation(#22714,#22715)
-enclosingStmt(#22714,#22707)
+enclosing_stmt(#22714,#22707)
 exprContainers(#22714,#22183)
 #22716=*
 typeexprs(#22716,0,#22714,-1,"Pick")
 hasLocation(#22716,#21287)
-enclosingStmt(#22716,#22707)
+enclosing_stmt(#22716,#22707)
 exprContainers(#22716,#22183)
 literals("Pick","Pick",#22716)
 #22717=*
 typeexprs(#22717,0,#22714,0,"T")
 hasLocation(#22717,#21291)
-enclosingStmt(#22717,#22707)
+enclosing_stmt(#22717,#22707)
 exprContainers(#22717,#22183)
 literals("T","T",#22717)
 typebind(#22717,#22711)
@@ -8026,19 +8026,19 @@ typeexprs(#22718,14,#22714,1,"NonFunc ... ames<T>")
 #22719=@"loc,{#10000},55,43,55,69"
 locations_default(#22719,#10000,55,43,55,69)
 hasLocation(#22718,#22719)
-enclosingStmt(#22718,#22707)
+enclosing_stmt(#22718,#22707)
 exprContainers(#22718,#22183)
 #22720=*
 typeexprs(#22720,0,#22718,-1,"NonFunc ... tyNames")
 hasLocation(#22720,#21295)
-enclosingStmt(#22720,#22707)
+enclosing_stmt(#22720,#22707)
 exprContainers(#22720,#22183)
 literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22720)
 typebind(#22720,#22215)
 #22721=*
 typeexprs(#22721,0,#22718,0,"T")
 hasLocation(#22721,#21299)
-enclosingStmt(#22721,#22707)
+enclosing_stmt(#22721,#22707)
 exprContainers(#22721,#22183)
 literals("T","T",#22721)
 typebind(#22721,#22711)
@@ -8051,7 +8051,7 @@ stmt_containers(#22722,#22183)
 #22724=*
 typeexprs(#22724,1,#22722,0,"Part")
 hasLocation(#22724,#21309)
-enclosingStmt(#22724,#22722)
+enclosing_stmt(#22724,#22722)
 exprContainers(#22724,#22183)
 literals("Part","Part",#22724)
 typedecl(#22724,#22217)
@@ -8063,14 +8063,14 @@ hasLocation(#22725,#22726)
 #22727=*
 exprs(#22727,0,#22725,0,"id")
 hasLocation(#22727,#21313)
-enclosingStmt(#22727,#22722)
+enclosing_stmt(#22727,#22722)
 exprContainers(#22727,#22183)
 literals("id","id",#22727)
 isAbstractMember(#22725)
 #22728=*
 typeexprs(#22728,2,#22725,2,"number")
 hasLocation(#22728,#21317)
-enclosingStmt(#22728,#22722)
+enclosing_stmt(#22728,#22722)
 exprContainers(#22728,#22183)
 literals("number","number",#22728)
 #22729=*
@@ -8081,14 +8081,14 @@ hasLocation(#22729,#22730)
 #22731=*
 exprs(#22731,0,#22729,0,"name")
 hasLocation(#22731,#21321)
-enclosingStmt(#22731,#22722)
+enclosing_stmt(#22731,#22722)
 exprContainers(#22731,#22183)
 literals("name","name",#22731)
 isAbstractMember(#22729)
 #22732=*
 typeexprs(#22732,2,#22729,2,"string")
 hasLocation(#22732,#21325)
-enclosingStmt(#22732,#22722)
+enclosing_stmt(#22732,#22722)
 exprContainers(#22732,#22183)
 literals("string","string",#22732)
 #22733=*
@@ -8099,7 +8099,7 @@ hasLocation(#22733,#22734)
 #22735=*
 exprs(#22735,0,#22733,0,"subparts")
 hasLocation(#22735,#21329)
-enclosingStmt(#22735,#22722)
+enclosing_stmt(#22735,#22722)
 exprContainers(#22735,#22183)
 literals("subparts","subparts",#22735)
 isAbstractMember(#22733)
@@ -8108,12 +8108,12 @@ typeexprs(#22736,6,#22733,2,"Part[]")
 #22737=@"loc,{#10000},60,17,60,22"
 locations_default(#22737,#10000,60,17,60,22)
 hasLocation(#22736,#22737)
-enclosingStmt(#22736,#22722)
+enclosing_stmt(#22736,#22722)
 exprContainers(#22736,#22183)
 #22738=*
 typeexprs(#22738,0,#22736,0,"Part")
 hasLocation(#22738,#21333)
-enclosingStmt(#22738,#22722)
+enclosing_stmt(#22738,#22722)
 exprContainers(#22738,#22183)
 literals("Part","Part",#22738)
 typebind(#22738,#22217)
@@ -8125,13 +8125,13 @@ hasLocation(#22739,#22740)
 #22741=*
 exprs(#22741,0,#22739,0,"updatePart")
 hasLocation(#22741,#21341)
-enclosingStmt(#22741,#22722)
+enclosing_stmt(#22741,#22722)
 exprContainers(#22741,#22183)
 literals("updatePart","updatePart",#22741)
 #22742=*
 exprs(#22742,9,#22739,1,"updateP ... : void;")
 hasLocation(#22742,#22740)
-enclosingStmt(#22742,#22722)
+enclosing_stmt(#22742,#22722)
 exprContainers(#22742,#22183)
 #22743=*
 scopes(#22743,1)
@@ -8169,7 +8169,7 @@ stmt_containers(#22749,#22183)
 #22751=*
 typeexprs(#22751,1,#22749,0,"T40")
 hasLocation(#22751,#21363)
-enclosingStmt(#22751,#22749)
+enclosing_stmt(#22751,#22749)
 exprContainers(#22751,#22183)
 literals("T40","T40",#22751)
 typedecl(#22751,#22218)
@@ -8178,19 +8178,19 @@ typeexprs(#22752,14,#22749,1,"Functio ... s<Part>")
 #22753=@"loc,{#10000},64,14,64,40"
 locations_default(#22753,#10000,64,14,64,40)
 hasLocation(#22752,#22753)
-enclosingStmt(#22752,#22749)
+enclosing_stmt(#22752,#22749)
 exprContainers(#22752,#22183)
 #22754=*
 typeexprs(#22754,0,#22752,-1,"Functio ... tyNames")
 hasLocation(#22754,#21367)
-enclosingStmt(#22754,#22749)
+enclosing_stmt(#22754,#22749)
 exprContainers(#22754,#22183)
 literals("FunctionPropertyNames","FunctionPropertyNames",#22754)
 typebind(#22754,#22213)
 #22755=*
 typeexprs(#22755,0,#22752,0,"Part")
 hasLocation(#22755,#21371)
-enclosingStmt(#22755,#22749)
+enclosing_stmt(#22755,#22749)
 exprContainers(#22755,#22183)
 literals("Part","Part",#22755)
 typebind(#22755,#22217)
@@ -8203,7 +8203,7 @@ stmt_containers(#22756,#22183)
 #22758=*
 typeexprs(#22758,1,#22756,0,"T41")
 hasLocation(#22758,#21379)
-enclosingStmt(#22758,#22756)
+enclosing_stmt(#22758,#22756)
 exprContainers(#22758,#22183)
 literals("T41","T41",#22758)
 typedecl(#22758,#22219)
@@ -8212,19 +8212,19 @@ typeexprs(#22759,14,#22756,1,"NonFunc ... s<Part>")
 #22760=@"loc,{#10000},65,14,65,43"
 locations_default(#22760,#10000,65,14,65,43)
 hasLocation(#22759,#22760)
-enclosingStmt(#22759,#22756)
+enclosing_stmt(#22759,#22756)
 exprContainers(#22759,#22183)
 #22761=*
 typeexprs(#22761,0,#22759,-1,"NonFunc ... tyNames")
 hasLocation(#22761,#21383)
-enclosingStmt(#22761,#22756)
+enclosing_stmt(#22761,#22756)
 exprContainers(#22761,#22183)
 literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22761)
 typebind(#22761,#22215)
 #22762=*
 typeexprs(#22762,0,#22759,0,"Part")
 hasLocation(#22762,#21387)
-enclosingStmt(#22762,#22756)
+enclosing_stmt(#22762,#22756)
 exprContainers(#22762,#22183)
 literals("Part","Part",#22762)
 typebind(#22762,#22217)
@@ -8237,7 +8237,7 @@ stmt_containers(#22763,#22183)
 #22765=*
 typeexprs(#22765,1,#22763,0,"T42")
 hasLocation(#22765,#21395)
-enclosingStmt(#22765,#22763)
+enclosing_stmt(#22765,#22763)
 exprContainers(#22765,#22183)
 literals("T42","T42",#22765)
 typedecl(#22765,#22220)
@@ -8246,19 +8246,19 @@ typeexprs(#22766,14,#22763,1,"Functio ... s<Part>")
 #22767=@"loc,{#10000},66,14,66,37"
 locations_default(#22767,#10000,66,14,66,37)
 hasLocation(#22766,#22767)
-enclosingStmt(#22766,#22763)
+enclosing_stmt(#22766,#22763)
 exprContainers(#22766,#22183)
 #22768=*
 typeexprs(#22768,0,#22766,-1,"FunctionProperties")
 hasLocation(#22768,#21399)
-enclosingStmt(#22768,#22763)
+enclosing_stmt(#22768,#22763)
 exprContainers(#22768,#22183)
 literals("FunctionProperties","FunctionProperties",#22768)
 typebind(#22768,#22214)
 #22769=*
 typeexprs(#22769,0,#22766,0,"Part")
 hasLocation(#22769,#21403)
-enclosingStmt(#22769,#22763)
+enclosing_stmt(#22769,#22763)
 exprContainers(#22769,#22183)
 literals("Part","Part",#22769)
 typebind(#22769,#22217)
@@ -8271,7 +8271,7 @@ stmt_containers(#22770,#22183)
 #22772=*
 typeexprs(#22772,1,#22770,0,"T43")
 hasLocation(#22772,#21411)
-enclosingStmt(#22772,#22770)
+enclosing_stmt(#22772,#22770)
 exprContainers(#22772,#22183)
 literals("T43","T43",#22772)
 typedecl(#22772,#22221)
@@ -8280,19 +8280,19 @@ typeexprs(#22773,14,#22770,1,"NonFunc ... s<Part>")
 #22774=@"loc,{#10000},67,14,67,40"
 locations_default(#22774,#10000,67,14,67,40)
 hasLocation(#22773,#22774)
-enclosingStmt(#22773,#22770)
+enclosing_stmt(#22773,#22770)
 exprContainers(#22773,#22183)
 #22775=*
 typeexprs(#22775,0,#22773,-1,"NonFunc ... perties")
 hasLocation(#22775,#21415)
-enclosingStmt(#22775,#22770)
+enclosing_stmt(#22775,#22770)
 exprContainers(#22775,#22183)
 literals("NonFunctionProperties","NonFunctionProperties",#22775)
 typebind(#22775,#22216)
 #22776=*
 typeexprs(#22776,0,#22773,0,"Part")
 hasLocation(#22776,#21419)
-enclosingStmt(#22776,#22770)
+enclosing_stmt(#22776,#22770)
 exprContainers(#22776,#22183)
 literals("Part","Part",#22776)
 typebind(#22776,#22217)
@@ -8305,7 +8305,7 @@ stmt_containers(#22777,#22183)
 #22779=*
 typeexprs(#22779,1,#22777,0,"ReturnType")
 hasLocation(#22779,#21427)
-enclosingStmt(#22779,#22777)
+enclosing_stmt(#22779,#22777)
 exprContainers(#22779,#22183)
 literals("ReturnType","ReturnType",#22779)
 typedecl(#22779,#22222)
@@ -8318,12 +8318,12 @@ local_type_names(#22781,"T",#22780)
 #22782=*
 typeexprs(#22782,22,#22777,2,"T")
 hasLocation(#22782,#21431)
-enclosingStmt(#22782,#22777)
+enclosing_stmt(#22782,#22777)
 exprContainers(#22782,#22183)
 #22783=*
 typeexprs(#22783,1,#22782,0,"T")
 hasLocation(#22783,#21431)
-enclosingStmt(#22783,#22777)
+enclosing_stmt(#22783,#22777)
 exprContainers(#22783,#22183)
 literals("T","T",#22783)
 typedecl(#22783,#22781)
@@ -8332,12 +8332,12 @@ typeexprs(#22784,28,#22777,1,"T exten ... R : any")
 #22785=@"loc,{#10000},69,24,69,70"
 locations_default(#22785,#10000,69,24,69,70)
 hasLocation(#22784,#22785)
-enclosingStmt(#22784,#22777)
+enclosing_stmt(#22784,#22777)
 exprContainers(#22784,#22183)
 #22786=*
 typeexprs(#22786,0,#22784,0,"T")
 hasLocation(#22786,#21437)
-enclosingStmt(#22786,#22777)
+enclosing_stmt(#22786,#22777)
 exprContainers(#22786,#22183)
 literals("T","T",#22786)
 typebind(#22786,#22781)
@@ -8352,12 +8352,12 @@ typeexprs(#22789,23,#22784,1,"(...arg ... infer R")
 #22790=@"loc,{#10000},69,34,69,60"
 locations_default(#22790,#10000,69,34,69,60)
 hasLocation(#22789,#22790)
-enclosingStmt(#22789,#22777)
+enclosing_stmt(#22789,#22777)
 exprContainers(#22789,#22183)
 #22791=*
 exprs(#22791,9,#22789,0,"(...arg ... infer R")
 hasLocation(#22791,#22790)
-enclosingStmt(#22791,#22777)
+enclosing_stmt(#22791,#22777)
 exprContainers(#22791,#22183)
 #22792=*
 scopes(#22792,1)
@@ -8405,14 +8405,14 @@ hasRestParameter(#22791)
 #22803=*
 typeexprs(#22803,0,#22784,2,"R")
 hasLocation(#22803,#21465)
-enclosingStmt(#22803,#22777)
+enclosing_stmt(#22803,#22777)
 exprContainers(#22803,#22183)
 literals("R","R",#22803)
 typebind(#22803,#22788)
 #22804=*
 typeexprs(#22804,2,#22784,3,"any")
 hasLocation(#22804,#21469)
-enclosingStmt(#22804,#22777)
+enclosing_stmt(#22804,#22777)
 exprContainers(#22804,#22183)
 literals("any","any",#22804)
 is_instantiated(#22183)
@@ -8425,7 +8425,7 @@ stmt_containers(#22805,#20001)
 #22807=*
 exprs(#22807,78,#22805,-1,"ConditionalTypes2")
 hasLocation(#22807,#21476)
-enclosingStmt(#22807,#22805)
+enclosing_stmt(#22807,#22805)
 exprContainers(#22807,#20001)
 literals("ConditionalTypes2","ConditionalTypes2",#22807)
 decl(#22807,#22180)
@@ -8475,7 +8475,7 @@ stmt_containers(#22825,#22805)
 #22827=*
 typeexprs(#22827,1,#22825,0,"Unpacked")
 hasLocation(#22827,#21482)
-enclosingStmt(#22827,#22825)
+enclosing_stmt(#22827,#22825)
 exprContainers(#22827,#22805)
 literals("Unpacked","Unpacked",#22827)
 typedecl(#22827,#22809)
@@ -8488,12 +8488,12 @@ local_type_names(#22829,"T",#22828)
 #22830=*
 typeexprs(#22830,22,#22825,2,"T")
 hasLocation(#22830,#21486)
-enclosingStmt(#22830,#22825)
+enclosing_stmt(#22830,#22825)
 exprContainers(#22830,#22805)
 #22831=*
 typeexprs(#22831,1,#22830,0,"T")
 hasLocation(#22831,#21486)
-enclosingStmt(#22831,#22825)
+enclosing_stmt(#22831,#22825)
 exprContainers(#22831,#22805)
 literals("T","T",#22831)
 typedecl(#22831,#22829)
@@ -8502,12 +8502,12 @@ typeexprs(#22832,28,#22825,1,"T exten ... :\n    T")
 #22833=@"loc,{#10000},74,5,77,5"
 locations_default(#22833,#10000,74,5,77,5)
 hasLocation(#22832,#22833)
-enclosingStmt(#22832,#22825)
+enclosing_stmt(#22832,#22825)
 exprContainers(#22832,#22805)
 #22834=*
 typeexprs(#22834,0,#22832,0,"T")
 hasLocation(#22834,#21492)
-enclosingStmt(#22834,#22825)
+enclosing_stmt(#22834,#22825)
 exprContainers(#22834,#22805)
 literals("T","T",#22834)
 typebind(#22834,#22829)
@@ -8522,38 +8522,38 @@ typeexprs(#22837,6,#22832,1,"(infer U)[]")
 #22838=@"loc,{#10000},74,15,74,25"
 locations_default(#22838,#10000,74,15,74,25)
 hasLocation(#22837,#22838)
-enclosingStmt(#22837,#22825)
+enclosing_stmt(#22837,#22825)
 exprContainers(#22837,#22805)
 #22839=*
 typeexprs(#22839,10,#22837,0,"(infer U)")
 #22840=@"loc,{#10000},74,15,74,23"
 locations_default(#22840,#10000,74,15,74,23)
 hasLocation(#22839,#22840)
-enclosingStmt(#22839,#22825)
+enclosing_stmt(#22839,#22825)
 exprContainers(#22839,#22805)
 #22841=*
 typeexprs(#22841,29,#22839,0,"infer U")
 #22842=@"loc,{#10000},74,16,74,22"
 locations_default(#22842,#10000,74,16,74,22)
 hasLocation(#22841,#22842)
-enclosingStmt(#22841,#22825)
+enclosing_stmt(#22841,#22825)
 exprContainers(#22841,#22805)
 #22843=*
 typeexprs(#22843,22,#22841,0,"U")
 hasLocation(#22843,#21500)
-enclosingStmt(#22843,#22825)
+enclosing_stmt(#22843,#22825)
 exprContainers(#22843,#22805)
 #22844=*
 typeexprs(#22844,1,#22843,0,"U")
 hasLocation(#22844,#21500)
-enclosingStmt(#22844,#22825)
+enclosing_stmt(#22844,#22825)
 exprContainers(#22844,#22805)
 literals("U","U",#22844)
 typedecl(#22844,#22836)
 #22845=*
 typeexprs(#22845,0,#22832,2,"U")
 hasLocation(#22845,#21510)
-enclosingStmt(#22845,#22825)
+enclosing_stmt(#22845,#22825)
 exprContainers(#22845,#22805)
 literals("U","U",#22845)
 typebind(#22845,#22836)
@@ -8562,12 +8562,12 @@ typeexprs(#22846,28,#22832,3,"T exten ... :\n    T")
 #22847=@"loc,{#10000},75,5,77,5"
 locations_default(#22847,#10000,75,5,77,5)
 hasLocation(#22846,#22847)
-enclosingStmt(#22846,#22825)
+enclosing_stmt(#22846,#22825)
 exprContainers(#22846,#22805)
 #22848=*
 typeexprs(#22848,0,#22846,0,"T")
 hasLocation(#22848,#21514)
-enclosingStmt(#22848,#22825)
+enclosing_stmt(#22848,#22825)
 exprContainers(#22848,#22805)
 literals("T","T",#22848)
 typebind(#22848,#22829)
@@ -8582,12 +8582,12 @@ typeexprs(#22851,23,#22846,1,"(...arg ... infer U")
 #22852=@"loc,{#10000},75,15,75,41"
 locations_default(#22852,#10000,75,15,75,41)
 hasLocation(#22851,#22852)
-enclosingStmt(#22851,#22825)
+enclosing_stmt(#22851,#22825)
 exprContainers(#22851,#22805)
 #22853=*
 exprs(#22853,9,#22851,0,"(...arg ... infer U")
 hasLocation(#22853,#22852)
-enclosingStmt(#22853,#22825)
+enclosing_stmt(#22853,#22825)
 exprContainers(#22853,#22805)
 #22854=*
 scopes(#22854,1)
@@ -8635,7 +8635,7 @@ hasRestParameter(#22853)
 #22865=*
 typeexprs(#22865,0,#22846,2,"U")
 hasLocation(#22865,#21542)
-enclosingStmt(#22865,#22825)
+enclosing_stmt(#22865,#22825)
 exprContainers(#22865,#22805)
 literals("U","U",#22865)
 typebind(#22865,#22850)
@@ -8644,12 +8644,12 @@ typeexprs(#22866,28,#22846,3,"T exten ... :\n    T")
 #22867=@"loc,{#10000},76,5,77,5"
 locations_default(#22867,#10000,76,5,77,5)
 hasLocation(#22866,#22867)
-enclosingStmt(#22866,#22825)
+enclosing_stmt(#22866,#22825)
 exprContainers(#22866,#22805)
 #22868=*
 typeexprs(#22868,0,#22866,0,"T")
 hasLocation(#22868,#21546)
-enclosingStmt(#22868,#22825)
+enclosing_stmt(#22868,#22825)
 exprContainers(#22868,#22805)
 literals("T","T",#22868)
 typebind(#22868,#22829)
@@ -8664,12 +8664,12 @@ typeexprs(#22871,14,#22866,1,"Promise<infer U>")
 #22872=@"loc,{#10000},76,15,76,30"
 locations_default(#22872,#10000,76,15,76,30)
 hasLocation(#22871,#22872)
-enclosingStmt(#22871,#22825)
+enclosing_stmt(#22871,#22825)
 exprContainers(#22871,#22805)
 #22873=*
 typeexprs(#22873,0,#22871,-1,"Promise")
 hasLocation(#22873,#21550)
-enclosingStmt(#22873,#22825)
+enclosing_stmt(#22873,#22825)
 exprContainers(#22873,#22805)
 literals("Promise","Promise",#22873)
 #22874=*
@@ -8677,31 +8677,31 @@ typeexprs(#22874,29,#22871,0,"infer U")
 #22875=@"loc,{#10000},76,23,76,29"
 locations_default(#22875,#10000,76,23,76,29)
 hasLocation(#22874,#22875)
-enclosingStmt(#22874,#22825)
+enclosing_stmt(#22874,#22825)
 exprContainers(#22874,#22805)
 #22876=*
 typeexprs(#22876,22,#22874,0,"U")
 hasLocation(#22876,#21556)
-enclosingStmt(#22876,#22825)
+enclosing_stmt(#22876,#22825)
 exprContainers(#22876,#22805)
 #22877=*
 typeexprs(#22877,1,#22876,0,"U")
 hasLocation(#22877,#21556)
-enclosingStmt(#22877,#22825)
+enclosing_stmt(#22877,#22825)
 exprContainers(#22877,#22805)
 literals("U","U",#22877)
 typedecl(#22877,#22870)
 #22878=*
 typeexprs(#22878,0,#22866,2,"U")
 hasLocation(#22878,#21562)
-enclosingStmt(#22878,#22825)
+enclosing_stmt(#22878,#22825)
 exprContainers(#22878,#22805)
 literals("U","U",#22878)
 typebind(#22878,#22870)
 #22879=*
 typeexprs(#22879,0,#22866,3,"T")
 hasLocation(#22879,#21566)
-enclosingStmt(#22879,#22825)
+enclosing_stmt(#22879,#22825)
 exprContainers(#22879,#22805)
 literals("T","T",#22879)
 typebind(#22879,#22829)
@@ -8714,7 +8714,7 @@ stmt_containers(#22880,#22805)
 #22882=*
 typeexprs(#22882,1,#22880,0,"T0")
 hasLocation(#22882,#21572)
-enclosingStmt(#22882,#22880)
+enclosing_stmt(#22882,#22880)
 exprContainers(#22882,#22805)
 literals("T0","T0",#22882)
 typedecl(#22882,#22810)
@@ -8723,19 +8723,19 @@ typeexprs(#22883,14,#22880,1,"Unpacked<string>")
 #22884=@"loc,{#10000},79,13,79,28"
 locations_default(#22884,#10000,79,13,79,28)
 hasLocation(#22883,#22884)
-enclosingStmt(#22883,#22880)
+enclosing_stmt(#22883,#22880)
 exprContainers(#22883,#22805)
 #22885=*
 typeexprs(#22885,0,#22883,-1,"Unpacked")
 hasLocation(#22885,#21576)
-enclosingStmt(#22885,#22880)
+enclosing_stmt(#22885,#22880)
 exprContainers(#22885,#22805)
 literals("Unpacked","Unpacked",#22885)
 typebind(#22885,#22809)
 #22886=*
 typeexprs(#22886,2,#22883,0,"string")
 hasLocation(#22886,#21580)
-enclosingStmt(#22886,#22880)
+enclosing_stmt(#22886,#22880)
 exprContainers(#22886,#22805)
 literals("string","string",#22886)
 #22887=*
@@ -8747,7 +8747,7 @@ stmt_containers(#22887,#22805)
 #22889=*
 typeexprs(#22889,1,#22887,0,"T1")
 hasLocation(#22889,#21588)
-enclosingStmt(#22889,#22887)
+enclosing_stmt(#22889,#22887)
 exprContainers(#22889,#22805)
 literals("T1","T1",#22889)
 typedecl(#22889,#22811)
@@ -8756,12 +8756,12 @@ typeexprs(#22890,14,#22887,1,"Unpacked<string[]>")
 #22891=@"loc,{#10000},80,13,80,30"
 locations_default(#22891,#10000,80,13,80,30)
 hasLocation(#22890,#22891)
-enclosingStmt(#22890,#22887)
+enclosing_stmt(#22890,#22887)
 exprContainers(#22890,#22805)
 #22892=*
 typeexprs(#22892,0,#22890,-1,"Unpacked")
 hasLocation(#22892,#21592)
-enclosingStmt(#22892,#22887)
+enclosing_stmt(#22892,#22887)
 exprContainers(#22892,#22805)
 literals("Unpacked","Unpacked",#22892)
 typebind(#22892,#22809)
@@ -8770,12 +8770,12 @@ typeexprs(#22893,6,#22890,0,"string[]")
 #22894=@"loc,{#10000},80,22,80,29"
 locations_default(#22894,#10000,80,22,80,29)
 hasLocation(#22893,#22894)
-enclosingStmt(#22893,#22887)
+enclosing_stmt(#22893,#22887)
 exprContainers(#22893,#22805)
 #22895=*
 typeexprs(#22895,2,#22893,0,"string")
 hasLocation(#22895,#21596)
-enclosingStmt(#22895,#22887)
+enclosing_stmt(#22895,#22887)
 exprContainers(#22895,#22805)
 literals("string","string",#22895)
 #22896=*
@@ -8787,7 +8787,7 @@ stmt_containers(#22896,#22805)
 #22898=*
 typeexprs(#22898,1,#22896,0,"T2")
 hasLocation(#22898,#21608)
-enclosingStmt(#22898,#22896)
+enclosing_stmt(#22898,#22896)
 exprContainers(#22898,#22805)
 literals("T2","T2",#22898)
 typedecl(#22898,#22812)
@@ -8796,12 +8796,12 @@ typeexprs(#22899,14,#22896,1,"Unpacke ... string>")
 #22900=@"loc,{#10000},81,13,81,34"
 locations_default(#22900,#10000,81,13,81,34)
 hasLocation(#22899,#22900)
-enclosingStmt(#22899,#22896)
+enclosing_stmt(#22899,#22896)
 exprContainers(#22899,#22805)
 #22901=*
 typeexprs(#22901,0,#22899,-1,"Unpacked")
 hasLocation(#22901,#21612)
-enclosingStmt(#22901,#22896)
+enclosing_stmt(#22901,#22896)
 exprContainers(#22901,#22805)
 literals("Unpacked","Unpacked",#22901)
 typebind(#22901,#22809)
@@ -8810,12 +8810,12 @@ typeexprs(#22902,23,#22899,0,"() => string")
 #22903=@"loc,{#10000},81,22,81,33"
 locations_default(#22903,#10000,81,22,81,33)
 hasLocation(#22902,#22903)
-enclosingStmt(#22902,#22896)
+enclosing_stmt(#22902,#22896)
 exprContainers(#22902,#22805)
 #22904=*
 exprs(#22904,9,#22902,0,"() => string")
 hasLocation(#22904,#22903)
-enclosingStmt(#22904,#22896)
+enclosing_stmt(#22904,#22896)
 exprContainers(#22904,#22805)
 #22905=*
 scopes(#22905,1)
@@ -8838,7 +8838,7 @@ stmt_containers(#22908,#22805)
 #22910=*
 typeexprs(#22910,1,#22908,0,"T3")
 hasLocation(#22910,#21630)
-enclosingStmt(#22910,#22908)
+enclosing_stmt(#22910,#22908)
 exprContainers(#22910,#22805)
 literals("T3","T3",#22910)
 typedecl(#22910,#22813)
@@ -8847,12 +8847,12 @@ typeexprs(#22911,14,#22908,1,"Unpacke ... tring>>")
 #22912=@"loc,{#10000},82,13,82,37"
 locations_default(#22912,#10000,82,13,82,37)
 hasLocation(#22911,#22912)
-enclosingStmt(#22911,#22908)
+enclosing_stmt(#22911,#22908)
 exprContainers(#22911,#22805)
 #22913=*
 typeexprs(#22913,0,#22911,-1,"Unpacked")
 hasLocation(#22913,#21634)
-enclosingStmt(#22913,#22908)
+enclosing_stmt(#22913,#22908)
 exprContainers(#22913,#22805)
 literals("Unpacked","Unpacked",#22913)
 typebind(#22913,#22809)
@@ -8861,18 +8861,18 @@ typeexprs(#22914,14,#22911,0,"Promise<string>")
 #22915=@"loc,{#10000},82,22,82,36"
 locations_default(#22915,#10000,82,22,82,36)
 hasLocation(#22914,#22915)
-enclosingStmt(#22914,#22908)
+enclosing_stmt(#22914,#22908)
 exprContainers(#22914,#22805)
 #22916=*
 typeexprs(#22916,0,#22914,-1,"Promise")
 hasLocation(#22916,#21638)
-enclosingStmt(#22916,#22908)
+enclosing_stmt(#22916,#22908)
 exprContainers(#22916,#22805)
 literals("Promise","Promise",#22916)
 #22917=*
 typeexprs(#22917,2,#22914,0,"string")
 hasLocation(#22917,#21642)
-enclosingStmt(#22917,#22908)
+enclosing_stmt(#22917,#22908)
 exprContainers(#22917,#22805)
 literals("string","string",#22917)
 #22918=*
@@ -8884,7 +8884,7 @@ stmt_containers(#22918,#22805)
 #22920=*
 typeexprs(#22920,1,#22918,0,"T4")
 hasLocation(#22920,#21652)
-enclosingStmt(#22920,#22918)
+enclosing_stmt(#22920,#22918)
 exprContainers(#22920,#22805)
 literals("T4","T4",#22920)
 typedecl(#22920,#22814)
@@ -8893,12 +8893,12 @@ typeexprs(#22921,14,#22918,1,"Unpacke ... ing>[]>")
 #22922=@"loc,{#10000},83,13,83,39"
 locations_default(#22922,#10000,83,13,83,39)
 hasLocation(#22921,#22922)
-enclosingStmt(#22921,#22918)
+enclosing_stmt(#22921,#22918)
 exprContainers(#22921,#22805)
 #22923=*
 typeexprs(#22923,0,#22921,-1,"Unpacked")
 hasLocation(#22923,#21656)
-enclosingStmt(#22923,#22918)
+enclosing_stmt(#22923,#22918)
 exprContainers(#22923,#22805)
 literals("Unpacked","Unpacked",#22923)
 typebind(#22923,#22809)
@@ -8907,25 +8907,25 @@ typeexprs(#22924,6,#22921,0,"Promise<string>[]")
 #22925=@"loc,{#10000},83,22,83,38"
 locations_default(#22925,#10000,83,22,83,38)
 hasLocation(#22924,#22925)
-enclosingStmt(#22924,#22918)
+enclosing_stmt(#22924,#22918)
 exprContainers(#22924,#22805)
 #22926=*
 typeexprs(#22926,14,#22924,0,"Promise<string>")
 #22927=@"loc,{#10000},83,22,83,36"
 locations_default(#22927,#10000,83,22,83,36)
 hasLocation(#22926,#22927)
-enclosingStmt(#22926,#22918)
+enclosing_stmt(#22926,#22918)
 exprContainers(#22926,#22805)
 #22928=*
 typeexprs(#22928,0,#22926,-1,"Promise")
 hasLocation(#22928,#21660)
-enclosingStmt(#22928,#22918)
+enclosing_stmt(#22928,#22918)
 exprContainers(#22928,#22805)
 literals("Promise","Promise",#22928)
 #22929=*
 typeexprs(#22929,2,#22926,0,"string")
 hasLocation(#22929,#21664)
-enclosingStmt(#22929,#22918)
+enclosing_stmt(#22929,#22918)
 exprContainers(#22929,#22805)
 literals("string","string",#22929)
 #22930=*
@@ -8937,7 +8937,7 @@ stmt_containers(#22930,#22805)
 #22932=*
 typeexprs(#22932,1,#22930,0,"T5")
 hasLocation(#22932,#21678)
-enclosingStmt(#22932,#22930)
+enclosing_stmt(#22932,#22930)
 exprContainers(#22932,#22805)
 literals("T5","T5",#22932)
 typedecl(#22932,#22815)
@@ -8946,12 +8946,12 @@ typeexprs(#22933,14,#22930,1,"Unpacke ... ng>[]>>")
 #22934=@"loc,{#10000},84,13,84,49"
 locations_default(#22934,#10000,84,13,84,49)
 hasLocation(#22933,#22934)
-enclosingStmt(#22933,#22930)
+enclosing_stmt(#22933,#22930)
 exprContainers(#22933,#22805)
 #22935=*
 typeexprs(#22935,0,#22933,-1,"Unpacked")
 hasLocation(#22935,#21682)
-enclosingStmt(#22935,#22930)
+enclosing_stmt(#22935,#22930)
 exprContainers(#22935,#22805)
 literals("Unpacked","Unpacked",#22935)
 typebind(#22935,#22809)
@@ -8960,12 +8960,12 @@ typeexprs(#22936,14,#22933,0,"Unpacke ... ing>[]>")
 #22937=@"loc,{#10000},84,22,84,48"
 locations_default(#22937,#10000,84,22,84,48)
 hasLocation(#22936,#22937)
-enclosingStmt(#22936,#22930)
+enclosing_stmt(#22936,#22930)
 exprContainers(#22936,#22805)
 #22938=*
 typeexprs(#22938,0,#22936,-1,"Unpacked")
 hasLocation(#22938,#21686)
-enclosingStmt(#22938,#22930)
+enclosing_stmt(#22938,#22930)
 exprContainers(#22938,#22805)
 literals("Unpacked","Unpacked",#22938)
 typebind(#22938,#22809)
@@ -8974,25 +8974,25 @@ typeexprs(#22939,6,#22936,0,"Promise<string>[]")
 #22940=@"loc,{#10000},84,31,84,47"
 locations_default(#22940,#10000,84,31,84,47)
 hasLocation(#22939,#22940)
-enclosingStmt(#22939,#22930)
+enclosing_stmt(#22939,#22930)
 exprContainers(#22939,#22805)
 #22941=*
 typeexprs(#22941,14,#22939,0,"Promise<string>")
 #22942=@"loc,{#10000},84,31,84,45"
 locations_default(#22942,#10000,84,31,84,45)
 hasLocation(#22941,#22942)
-enclosingStmt(#22941,#22930)
+enclosing_stmt(#22941,#22930)
 exprContainers(#22941,#22805)
 #22943=*
 typeexprs(#22943,0,#22941,-1,"Promise")
 hasLocation(#22943,#21690)
-enclosingStmt(#22943,#22930)
+enclosing_stmt(#22943,#22930)
 exprContainers(#22943,#22805)
 literals("Promise","Promise",#22943)
 #22944=*
 typeexprs(#22944,2,#22941,0,"string")
 hasLocation(#22944,#21694)
-enclosingStmt(#22944,#22930)
+enclosing_stmt(#22944,#22930)
 exprContainers(#22944,#22805)
 literals("string","string",#22944)
 #22945=*
@@ -9004,7 +9004,7 @@ stmt_containers(#22945,#22805)
 #22947=*
 typeexprs(#22947,1,#22945,0,"Foo")
 hasLocation(#22947,#21710)
-enclosingStmt(#22947,#22945)
+enclosing_stmt(#22947,#22945)
 exprContainers(#22947,#22805)
 literals("Foo","Foo",#22947)
 typedecl(#22947,#22816)
@@ -9017,12 +9017,12 @@ local_type_names(#22949,"T",#22948)
 #22950=*
 typeexprs(#22950,22,#22945,2,"T")
 hasLocation(#22950,#21714)
-enclosingStmt(#22950,#22945)
+enclosing_stmt(#22950,#22945)
 exprContainers(#22950,#22805)
 #22951=*
 typeexprs(#22951,1,#22950,0,"T")
 hasLocation(#22951,#21714)
-enclosingStmt(#22951,#22945)
+enclosing_stmt(#22951,#22945)
 exprContainers(#22951,#22805)
 literals("T","T",#22951)
 typedecl(#22951,#22949)
@@ -9031,12 +9031,12 @@ typeexprs(#22952,28,#22945,1,"T exten ... : never")
 #22953=@"loc,{#10000},86,17,86,64"
 locations_default(#22953,#10000,86,17,86,64)
 hasLocation(#22952,#22953)
-enclosingStmt(#22952,#22945)
+enclosing_stmt(#22952,#22945)
 exprContainers(#22952,#22805)
 #22954=*
 typeexprs(#22954,0,#22952,0,"T")
 hasLocation(#22954,#21720)
-enclosingStmt(#22954,#22945)
+enclosing_stmt(#22954,#22945)
 exprContainers(#22954,#22805)
 literals("T","T",#22954)
 typebind(#22954,#22949)
@@ -9045,7 +9045,7 @@ typeexprs(#22955,21,#22952,1,"{ a: in ... fer U }")
 #22956=@"loc,{#10000},86,27,86,52"
 locations_default(#22956,#10000,86,27,86,52)
 hasLocation(#22955,#22956)
-enclosingStmt(#22955,#22945)
+enclosing_stmt(#22955,#22945)
 exprContainers(#22955,#22805)
 #22957=*
 properties(#22957,#22955,0,8,"a: infer U,")
@@ -9055,7 +9055,7 @@ hasLocation(#22957,#22958)
 #22959=*
 exprs(#22959,0,#22957,0,"a")
 hasLocation(#22959,#21726)
-enclosingStmt(#22959,#22945)
+enclosing_stmt(#22959,#22945)
 exprContainers(#22959,#22805)
 literals("a","a",#22959)
 isAbstractMember(#22957)
@@ -9064,17 +9064,17 @@ typeexprs(#22960,29,#22957,2,"infer U")
 #22961=@"loc,{#10000},86,32,86,38"
 locations_default(#22961,#10000,86,32,86,38)
 hasLocation(#22960,#22961)
-enclosingStmt(#22960,#22945)
+enclosing_stmt(#22960,#22945)
 exprContainers(#22960,#22805)
 #22962=*
 typeexprs(#22962,22,#22960,0,"U")
 hasLocation(#22962,#21732)
-enclosingStmt(#22962,#22945)
+enclosing_stmt(#22962,#22945)
 exprContainers(#22962,#22805)
 #22963=*
 typeexprs(#22963,1,#22962,0,"U")
 hasLocation(#22963,#21732)
-enclosingStmt(#22963,#22945)
+enclosing_stmt(#22963,#22945)
 exprContainers(#22963,#22805)
 literals("U","U",#22963)
 #22964=*
@@ -9085,7 +9085,7 @@ hasLocation(#22964,#22965)
 #22966=*
 exprs(#22966,0,#22964,0,"b")
 hasLocation(#22966,#21736)
-enclosingStmt(#22966,#22945)
+enclosing_stmt(#22966,#22945)
 exprContainers(#22966,#22805)
 literals("b","b",#22966)
 isAbstractMember(#22964)
@@ -9094,29 +9094,29 @@ typeexprs(#22967,29,#22964,2,"infer U")
 #22968=@"loc,{#10000},86,44,86,50"
 locations_default(#22968,#10000,86,44,86,50)
 hasLocation(#22967,#22968)
-enclosingStmt(#22967,#22945)
+enclosing_stmt(#22967,#22945)
 exprContainers(#22967,#22805)
 #22969=*
 typeexprs(#22969,22,#22967,0,"U")
 hasLocation(#22969,#21742)
-enclosingStmt(#22969,#22945)
+enclosing_stmt(#22969,#22945)
 exprContainers(#22969,#22805)
 #22970=*
 typeexprs(#22970,1,#22969,0,"U")
 hasLocation(#22970,#21742)
-enclosingStmt(#22970,#22945)
+enclosing_stmt(#22970,#22945)
 exprContainers(#22970,#22805)
 literals("U","U",#22970)
 #22971=*
 typeexprs(#22971,0,#22952,2,"U")
 hasLocation(#22971,#21748)
-enclosingStmt(#22971,#22945)
+enclosing_stmt(#22971,#22945)
 exprContainers(#22971,#22805)
 literals("U","U",#22971)
 #22972=*
 typeexprs(#22972,2,#22952,3,"never")
 hasLocation(#22972,#21752)
-enclosingStmt(#22972,#22945)
+enclosing_stmt(#22972,#22945)
 exprContainers(#22972,#22805)
 literals("never","never",#22972)
 #22973=*
@@ -9128,7 +9128,7 @@ stmt_containers(#22973,#22805)
 #22975=*
 typeexprs(#22975,1,#22973,0,"T10")
 hasLocation(#22975,#21758)
-enclosingStmt(#22975,#22973)
+enclosing_stmt(#22975,#22973)
 exprContainers(#22975,#22805)
 literals("T10","T10",#22975)
 typedecl(#22975,#22817)
@@ -9137,12 +9137,12 @@ typeexprs(#22976,14,#22973,1,"Foo<{ a ... ring }>")
 #22977=@"loc,{#10000},87,14,87,42"
 locations_default(#22977,#10000,87,14,87,42)
 hasLocation(#22976,#22977)
-enclosingStmt(#22976,#22973)
+enclosing_stmt(#22976,#22973)
 exprContainers(#22976,#22805)
 #22978=*
 typeexprs(#22978,0,#22976,-1,"Foo")
 hasLocation(#22978,#21762)
-enclosingStmt(#22978,#22973)
+enclosing_stmt(#22978,#22973)
 exprContainers(#22978,#22805)
 literals("Foo","Foo",#22978)
 typebind(#22978,#22816)
@@ -9151,7 +9151,7 @@ typeexprs(#22979,21,#22976,0,"{ a: st ... tring }")
 #22980=@"loc,{#10000},87,18,87,41"
 locations_default(#22980,#10000,87,18,87,41)
 hasLocation(#22979,#22980)
-enclosingStmt(#22979,#22973)
+enclosing_stmt(#22979,#22973)
 exprContainers(#22979,#22805)
 #22981=*
 properties(#22981,#22979,0,8,"a: string,")
@@ -9161,14 +9161,14 @@ hasLocation(#22981,#22982)
 #22983=*
 exprs(#22983,0,#22981,0,"a")
 hasLocation(#22983,#21768)
-enclosingStmt(#22983,#22973)
+enclosing_stmt(#22983,#22973)
 exprContainers(#22983,#22805)
 literals("a","a",#22983)
 isAbstractMember(#22981)
 #22984=*
 typeexprs(#22984,2,#22981,2,"string")
 hasLocation(#22984,#21772)
-enclosingStmt(#22984,#22973)
+enclosing_stmt(#22984,#22973)
 exprContainers(#22984,#22805)
 literals("string","string",#22984)
 #22985=*
@@ -9179,14 +9179,14 @@ hasLocation(#22985,#22986)
 #22987=*
 exprs(#22987,0,#22985,0,"b")
 hasLocation(#22987,#21776)
-enclosingStmt(#22987,#22973)
+enclosing_stmt(#22987,#22973)
 exprContainers(#22987,#22805)
 literals("b","b",#22987)
 isAbstractMember(#22985)
 #22988=*
 typeexprs(#22988,2,#22985,2,"string")
 hasLocation(#22988,#21780)
-enclosingStmt(#22988,#22973)
+enclosing_stmt(#22988,#22973)
 exprContainers(#22988,#22805)
 literals("string","string",#22988)
 #22989=*
@@ -9198,7 +9198,7 @@ stmt_containers(#22989,#22805)
 #22991=*
 typeexprs(#22991,1,#22989,0,"T11")
 hasLocation(#22991,#21790)
-enclosingStmt(#22991,#22989)
+enclosing_stmt(#22991,#22989)
 exprContainers(#22991,#22805)
 literals("T11","T11",#22991)
 typedecl(#22991,#22818)
@@ -9207,12 +9207,12 @@ typeexprs(#22992,14,#22989,1,"Foo<{ a ... mber }>")
 #22993=@"loc,{#10000},88,14,88,42"
 locations_default(#22993,#10000,88,14,88,42)
 hasLocation(#22992,#22993)
-enclosingStmt(#22992,#22989)
+enclosing_stmt(#22992,#22989)
 exprContainers(#22992,#22805)
 #22994=*
 typeexprs(#22994,0,#22992,-1,"Foo")
 hasLocation(#22994,#21794)
-enclosingStmt(#22994,#22989)
+enclosing_stmt(#22994,#22989)
 exprContainers(#22994,#22805)
 literals("Foo","Foo",#22994)
 typebind(#22994,#22816)
@@ -9221,7 +9221,7 @@ typeexprs(#22995,21,#22992,0,"{ a: st ... umber }")
 #22996=@"loc,{#10000},88,18,88,41"
 locations_default(#22996,#10000,88,18,88,41)
 hasLocation(#22995,#22996)
-enclosingStmt(#22995,#22989)
+enclosing_stmt(#22995,#22989)
 exprContainers(#22995,#22805)
 #22997=*
 properties(#22997,#22995,0,8,"a: string,")
@@ -9231,14 +9231,14 @@ hasLocation(#22997,#22998)
 #22999=*
 exprs(#22999,0,#22997,0,"a")
 hasLocation(#22999,#21800)
-enclosingStmt(#22999,#22989)
+enclosing_stmt(#22999,#22989)
 exprContainers(#22999,#22805)
 literals("a","a",#22999)
 isAbstractMember(#22997)
 #23000=*
 typeexprs(#23000,2,#22997,2,"string")
 hasLocation(#23000,#21804)
-enclosingStmt(#23000,#22989)
+enclosing_stmt(#23000,#22989)
 exprContainers(#23000,#22805)
 literals("string","string",#23000)
 #23001=*
@@ -9249,14 +9249,14 @@ hasLocation(#23001,#23002)
 #23003=*
 exprs(#23003,0,#23001,0,"b")
 hasLocation(#23003,#21808)
-enclosingStmt(#23003,#22989)
+enclosing_stmt(#23003,#22989)
 exprContainers(#23003,#22805)
 literals("b","b",#23003)
 isAbstractMember(#23001)
 #23004=*
 typeexprs(#23004,2,#23001,2,"number")
 hasLocation(#23004,#21812)
-enclosingStmt(#23004,#22989)
+enclosing_stmt(#23004,#22989)
 exprContainers(#23004,#22805)
 literals("number","number",#23004)
 #23005=*
@@ -9268,7 +9268,7 @@ stmt_containers(#23005,#22805)
 #23007=*
 typeexprs(#23007,1,#23005,0,"Bar")
 hasLocation(#23007,#21822)
-enclosingStmt(#23007,#23005)
+enclosing_stmt(#23007,#23005)
 exprContainers(#23007,#22805)
 literals("Bar","Bar",#23007)
 typedecl(#23007,#22819)
@@ -9281,12 +9281,12 @@ local_type_names(#23009,"T",#23008)
 #23010=*
 typeexprs(#23010,22,#23005,2,"T")
 hasLocation(#23010,#21826)
-enclosingStmt(#23010,#23005)
+enclosing_stmt(#23010,#23005)
 exprContainers(#23010,#22805)
 #23011=*
 typeexprs(#23011,1,#23010,0,"T")
 hasLocation(#23011,#21826)
-enclosingStmt(#23011,#23005)
+enclosing_stmt(#23011,#23005)
 exprContainers(#23011,#22805)
 literals("T","T",#23011)
 typedecl(#23011,#23009)
@@ -9295,12 +9295,12 @@ typeexprs(#23012,28,#23005,1,"T exten ... : never")
 #23013=@"loc,{#10000},90,17,90,90"
 locations_default(#23013,#10000,90,17,90,90)
 hasLocation(#23012,#23013)
-enclosingStmt(#23012,#23005)
+enclosing_stmt(#23012,#23005)
 exprContainers(#23012,#22805)
 #23014=*
 typeexprs(#23014,0,#23012,0,"T")
 hasLocation(#23014,#21832)
-enclosingStmt(#23014,#23005)
+enclosing_stmt(#23014,#23005)
 exprContainers(#23014,#22805)
 literals("T","T",#23014)
 typebind(#23014,#23009)
@@ -9309,7 +9309,7 @@ typeexprs(#23015,21,#23012,1,"{ a: (x ...  void }")
 #23016=@"loc,{#10000},90,27,90,78"
 locations_default(#23016,#10000,90,27,90,78)
 hasLocation(#23015,#23016)
-enclosingStmt(#23015,#23005)
+enclosing_stmt(#23015,#23005)
 exprContainers(#23015,#22805)
 #23017=*
 properties(#23017,#23015,0,8,"a: (x:  ... > void,")
@@ -9319,7 +9319,7 @@ hasLocation(#23017,#23018)
 #23019=*
 exprs(#23019,0,#23017,0,"a")
 hasLocation(#23019,#21838)
-enclosingStmt(#23019,#23005)
+enclosing_stmt(#23019,#23005)
 exprContainers(#23019,#22805)
 literals("a","a",#23019)
 isAbstractMember(#23017)
@@ -9328,12 +9328,12 @@ typeexprs(#23020,23,#23017,2,"(x: infer U) => void")
 #23021=@"loc,{#10000},90,32,90,51"
 locations_default(#23021,#10000,90,32,90,51)
 hasLocation(#23020,#23021)
-enclosingStmt(#23020,#23005)
+enclosing_stmt(#23020,#23005)
 exprContainers(#23020,#22805)
 #23022=*
 exprs(#23022,9,#23020,0,"(x: infer U) => void")
 hasLocation(#23022,#23021)
-enclosingStmt(#23022,#23005)
+enclosing_stmt(#23022,#23005)
 exprContainers(#23022,#22805)
 #23023=*
 scopes(#23023,1)
@@ -9378,7 +9378,7 @@ hasLocation(#23032,#23033)
 #23034=*
 exprs(#23034,0,#23032,0,"b")
 hasLocation(#23034,#21860)
-enclosingStmt(#23034,#23005)
+enclosing_stmt(#23034,#23005)
 exprContainers(#23034,#22805)
 literals("b","b",#23034)
 isAbstractMember(#23032)
@@ -9387,12 +9387,12 @@ typeexprs(#23035,23,#23032,2,"(x: infer U) => void")
 #23036=@"loc,{#10000},90,57,90,76"
 locations_default(#23036,#10000,90,57,90,76)
 hasLocation(#23035,#23036)
-enclosingStmt(#23035,#23005)
+enclosing_stmt(#23035,#23005)
 exprContainers(#23035,#22805)
 #23037=*
 exprs(#23037,9,#23035,0,"(x: infer U) => void")
 hasLocation(#23037,#23036)
-enclosingStmt(#23037,#23005)
+enclosing_stmt(#23037,#23005)
 exprContainers(#23037,#22805)
 #23038=*
 scopes(#23038,1)
@@ -9432,13 +9432,13 @@ literals("U","U",#23046)
 #23047=*
 typeexprs(#23047,0,#23012,2,"U")
 hasLocation(#23047,#21884)
-enclosingStmt(#23047,#23005)
+enclosing_stmt(#23047,#23005)
 exprContainers(#23047,#22805)
 literals("U","U",#23047)
 #23048=*
 typeexprs(#23048,2,#23012,3,"never")
 hasLocation(#23048,#21888)
-enclosingStmt(#23048,#23005)
+enclosing_stmt(#23048,#23005)
 exprContainers(#23048,#22805)
 literals("never","never",#23048)
 #23049=*
@@ -9450,7 +9450,7 @@ stmt_containers(#23049,#22805)
 #23051=*
 typeexprs(#23051,1,#23049,0,"T20")
 hasLocation(#23051,#21894)
-enclosingStmt(#23051,#23049)
+enclosing_stmt(#23051,#23049)
 exprContainers(#23051,#22805)
 literals("T20","T20",#23051)
 typedecl(#23051,#22820)
@@ -9459,12 +9459,12 @@ typeexprs(#23052,14,#23049,1,"Bar<{ a ... void }>")
 #23053=@"loc,{#10000},91,14,91,68"
 locations_default(#23053,#10000,91,14,91,68)
 hasLocation(#23052,#23053)
-enclosingStmt(#23052,#23049)
+enclosing_stmt(#23052,#23049)
 exprContainers(#23052,#22805)
 #23054=*
 typeexprs(#23054,0,#23052,-1,"Bar")
 hasLocation(#23054,#21898)
-enclosingStmt(#23054,#23049)
+enclosing_stmt(#23054,#23049)
 exprContainers(#23054,#22805)
 literals("Bar","Bar",#23054)
 typebind(#23054,#22819)
@@ -9473,7 +9473,7 @@ typeexprs(#23055,21,#23052,0,"{ a: (x ...  void }")
 #23056=@"loc,{#10000},91,18,91,67"
 locations_default(#23056,#10000,91,18,91,67)
 hasLocation(#23055,#23056)
-enclosingStmt(#23055,#23049)
+enclosing_stmt(#23055,#23049)
 exprContainers(#23055,#22805)
 #23057=*
 properties(#23057,#23055,0,8,"a: (x:  ... > void,")
@@ -9483,7 +9483,7 @@ hasLocation(#23057,#23058)
 #23059=*
 exprs(#23059,0,#23057,0,"a")
 hasLocation(#23059,#21904)
-enclosingStmt(#23059,#23049)
+enclosing_stmt(#23059,#23049)
 exprContainers(#23059,#22805)
 literals("a","a",#23059)
 isAbstractMember(#23057)
@@ -9492,12 +9492,12 @@ typeexprs(#23060,23,#23057,2,"(x: string) => void")
 #23061=@"loc,{#10000},91,23,91,41"
 locations_default(#23061,#10000,91,23,91,41)
 hasLocation(#23060,#23061)
-enclosingStmt(#23060,#23049)
+enclosing_stmt(#23060,#23049)
 exprContainers(#23060,#22805)
 #23062=*
 exprs(#23062,9,#23060,0,"(x: string) => void")
 hasLocation(#23062,#23061)
-enclosingStmt(#23062,#23049)
+enclosing_stmt(#23062,#23049)
 exprContainers(#23062,#22805)
 #23063=*
 scopes(#23063,1)
@@ -9532,7 +9532,7 @@ hasLocation(#23069,#23070)
 #23071=*
 exprs(#23071,0,#23069,0,"b")
 hasLocation(#23071,#21924)
-enclosingStmt(#23071,#23049)
+enclosing_stmt(#23071,#23049)
 exprContainers(#23071,#22805)
 literals("b","b",#23071)
 isAbstractMember(#23069)
@@ -9541,12 +9541,12 @@ typeexprs(#23072,23,#23069,2,"(x: string) => void")
 #23073=@"loc,{#10000},91,47,91,65"
 locations_default(#23073,#10000,91,47,91,65)
 hasLocation(#23072,#23073)
-enclosingStmt(#23072,#23049)
+enclosing_stmt(#23072,#23049)
 exprContainers(#23072,#22805)
 #23074=*
 exprs(#23074,9,#23072,0,"(x: string) => void")
 hasLocation(#23074,#23073)
-enclosingStmt(#23074,#23049)
+enclosing_stmt(#23074,#23049)
 exprContainers(#23074,#22805)
 #23075=*
 scopes(#23075,1)
@@ -9582,7 +9582,7 @@ stmt_containers(#23081,#22805)
 #23083=*
 typeexprs(#23083,1,#23081,0,"T21")
 hasLocation(#23083,#21950)
-enclosingStmt(#23083,#23081)
+enclosing_stmt(#23083,#23081)
 exprContainers(#23083,#22805)
 literals("T21","T21",#23083)
 typedecl(#23083,#22821)
@@ -9591,12 +9591,12 @@ typeexprs(#23084,14,#23081,1,"Bar<{ a ... void }>")
 #23085=@"loc,{#10000},92,14,92,68"
 locations_default(#23085,#10000,92,14,92,68)
 hasLocation(#23084,#23085)
-enclosingStmt(#23084,#23081)
+enclosing_stmt(#23084,#23081)
 exprContainers(#23084,#22805)
 #23086=*
 typeexprs(#23086,0,#23084,-1,"Bar")
 hasLocation(#23086,#21954)
-enclosingStmt(#23086,#23081)
+enclosing_stmt(#23086,#23081)
 exprContainers(#23086,#22805)
 literals("Bar","Bar",#23086)
 typebind(#23086,#22819)
@@ -9605,7 +9605,7 @@ typeexprs(#23087,21,#23084,0,"{ a: (x ...  void }")
 #23088=@"loc,{#10000},92,18,92,67"
 locations_default(#23088,#10000,92,18,92,67)
 hasLocation(#23087,#23088)
-enclosingStmt(#23087,#23081)
+enclosing_stmt(#23087,#23081)
 exprContainers(#23087,#22805)
 #23089=*
 properties(#23089,#23087,0,8,"a: (x:  ... > void,")
@@ -9615,7 +9615,7 @@ hasLocation(#23089,#23090)
 #23091=*
 exprs(#23091,0,#23089,0,"a")
 hasLocation(#23091,#21960)
-enclosingStmt(#23091,#23081)
+enclosing_stmt(#23091,#23081)
 exprContainers(#23091,#22805)
 literals("a","a",#23091)
 isAbstractMember(#23089)
@@ -9624,12 +9624,12 @@ typeexprs(#23092,23,#23089,2,"(x: string) => void")
 #23093=@"loc,{#10000},92,23,92,41"
 locations_default(#23093,#10000,92,23,92,41)
 hasLocation(#23092,#23093)
-enclosingStmt(#23092,#23081)
+enclosing_stmt(#23092,#23081)
 exprContainers(#23092,#22805)
 #23094=*
 exprs(#23094,9,#23092,0,"(x: string) => void")
 hasLocation(#23094,#23093)
-enclosingStmt(#23094,#23081)
+enclosing_stmt(#23094,#23081)
 exprContainers(#23094,#22805)
 #23095=*
 scopes(#23095,1)
@@ -9664,7 +9664,7 @@ hasLocation(#23101,#23102)
 #23103=*
 exprs(#23103,0,#23101,0,"b")
 hasLocation(#23103,#21980)
-enclosingStmt(#23103,#23081)
+enclosing_stmt(#23103,#23081)
 exprContainers(#23103,#22805)
 literals("b","b",#23103)
 isAbstractMember(#23101)
@@ -9673,12 +9673,12 @@ typeexprs(#23104,23,#23101,2,"(x: number) => void")
 #23105=@"loc,{#10000},92,47,92,65"
 locations_default(#23105,#10000,92,47,92,65)
 hasLocation(#23104,#23105)
-enclosingStmt(#23104,#23081)
+enclosing_stmt(#23104,#23081)
 exprContainers(#23104,#22805)
 #23106=*
 exprs(#23106,9,#23104,0,"(x: number) => void")
 hasLocation(#23106,#23105)
-enclosingStmt(#23106,#23081)
+enclosing_stmt(#23106,#23081)
 exprContainers(#23106,#22805)
 #23107=*
 scopes(#23107,1)
@@ -9852,7 +9852,7 @@ stmt_containers(#23147,#22805)
 #23149=*
 typeexprs(#23149,1,#23147,0,"T30")
 hasLocation(#23149,#22080)
-enclosingStmt(#23149,#23147)
+enclosing_stmt(#23149,#23147)
 exprContainers(#23149,#22805)
 literals("T30","T30",#23149)
 typedecl(#23149,#22822)
@@ -9861,12 +9861,12 @@ typeexprs(#23150,14,#23147,1,"ReturnT ... of foo>")
 #23151=@"loc,{#10000},97,14,97,35"
 locations_default(#23151,#10000,97,14,97,35)
 hasLocation(#23150,#23151)
-enclosingStmt(#23150,#23147)
+enclosing_stmt(#23150,#23147)
 exprContainers(#23150,#22805)
 #23152=*
 typeexprs(#23152,0,#23150,-1,"ReturnType")
 hasLocation(#23152,#22084)
-enclosingStmt(#23152,#23147)
+enclosing_stmt(#23152,#23147)
 exprContainers(#23152,#22805)
 literals("ReturnType","ReturnType",#23152)
 typebind(#23152,#22824)
@@ -9875,12 +9875,12 @@ typeexprs(#23153,16,#23150,0,"typeof foo")
 #23154=@"loc,{#10000},97,25,97,34"
 locations_default(#23154,#10000,97,25,97,34)
 hasLocation(#23153,#23154)
-enclosingStmt(#23153,#23147)
+enclosing_stmt(#23153,#23147)
 exprContainers(#23153,#22805)
 #23155=*
 typeexprs(#23155,17,#23153,0,"foo")
 hasLocation(#23155,#22090)
-enclosingStmt(#23155,#23147)
+enclosing_stmt(#23155,#23147)
 exprContainers(#23155,#22805)
 literals("foo","foo",#23155)
 bind(#23155,#23116)
@@ -9893,7 +9893,7 @@ stmt_containers(#23156,#22805)
 #23158=*
 typeexprs(#23158,1,#23156,0,"AnyFunction")
 hasLocation(#23158,#22098)
-enclosingStmt(#23158,#23156)
+enclosing_stmt(#23158,#23156)
 exprContainers(#23158,#22805)
 literals("AnyFunction","AnyFunction",#23158)
 typedecl(#23158,#22823)
@@ -9902,12 +9902,12 @@ typeexprs(#23159,23,#23156,1,"(...arg ...  => any")
 #23160=@"loc,{#10000},99,22,99,44"
 locations_default(#23160,#10000,99,22,99,44)
 hasLocation(#23159,#23160)
-enclosingStmt(#23159,#23156)
+enclosing_stmt(#23159,#23156)
 exprContainers(#23159,#22805)
 #23161=*
 exprs(#23161,9,#23159,0,"(...arg ...  => any")
 hasLocation(#23161,#23160)
-enclosingStmt(#23161,#23156)
+enclosing_stmt(#23161,#23156)
 exprContainers(#23161,#22805)
 #23162=*
 scopes(#23162,1)
@@ -9950,7 +9950,7 @@ stmt_containers(#23170,#22805)
 #23172=*
 typeexprs(#23172,1,#23170,0,"ReturnType")
 hasLocation(#23172,#22126)
-enclosingStmt(#23172,#23170)
+enclosing_stmt(#23172,#23170)
 exprContainers(#23172,#22805)
 literals("ReturnType","ReturnType",#23172)
 typedecl(#23172,#22824)
@@ -9965,19 +9965,19 @@ typeexprs(#23175,22,#23170,2,"T exten ... unction")
 #23176=@"loc,{#10000},100,19,100,39"
 locations_default(#23176,#10000,100,19,100,39)
 hasLocation(#23175,#23176)
-enclosingStmt(#23175,#23170)
+enclosing_stmt(#23175,#23170)
 exprContainers(#23175,#22805)
 #23177=*
 typeexprs(#23177,1,#23175,0,"T")
 hasLocation(#23177,#22130)
-enclosingStmt(#23177,#23170)
+enclosing_stmt(#23177,#23170)
 exprContainers(#23177,#22805)
 literals("T","T",#23177)
 typedecl(#23177,#23174)
 #23178=*
 typeexprs(#23178,0,#23175,1,"AnyFunction")
 hasLocation(#23178,#22134)
-enclosingStmt(#23178,#23170)
+enclosing_stmt(#23178,#23170)
 exprContainers(#23178,#22805)
 literals("AnyFunction","AnyFunction",#23178)
 typebind(#23178,#22823)
@@ -9986,12 +9986,12 @@ typeexprs(#23179,28,#23170,1,"T exten ... R : any")
 #23180=@"loc,{#10000},100,44,100,90"
 locations_default(#23180,#10000,100,44,100,90)
 hasLocation(#23179,#23180)
-enclosingStmt(#23179,#23170)
+enclosing_stmt(#23179,#23170)
 exprContainers(#23179,#22805)
 #23181=*
 typeexprs(#23181,0,#23179,0,"T")
 hasLocation(#23181,#22140)
-enclosingStmt(#23181,#23170)
+enclosing_stmt(#23181,#23170)
 exprContainers(#23181,#22805)
 literals("T","T",#23181)
 typebind(#23181,#23174)
@@ -10006,12 +10006,12 @@ typeexprs(#23184,23,#23179,1,"(...arg ... infer R")
 #23185=@"loc,{#10000},100,54,100,80"
 locations_default(#23185,#10000,100,54,100,80)
 hasLocation(#23184,#23185)
-enclosingStmt(#23184,#23170)
+enclosing_stmt(#23184,#23170)
 exprContainers(#23184,#22805)
 #23186=*
 exprs(#23186,9,#23184,0,"(...arg ... infer R")
 hasLocation(#23186,#23185)
-enclosingStmt(#23186,#23170)
+enclosing_stmt(#23186,#23170)
 exprContainers(#23186,#22805)
 #23187=*
 scopes(#23187,1)
@@ -10059,14 +10059,14 @@ hasRestParameter(#23186)
 #23198=*
 typeexprs(#23198,0,#23179,2,"R")
 hasLocation(#23198,#22168)
-enclosingStmt(#23198,#23170)
+enclosing_stmt(#23198,#23170)
 exprContainers(#23198,#22805)
 literals("R","R",#23198)
 typebind(#23198,#23183)
 #23199=*
 typeexprs(#23199,2,#23179,3,"any")
 hasLocation(#23199,#22172)
-enclosingStmt(#23199,#23170)
+enclosing_stmt(#23199,#23170)
 exprContainers(#23199,#22805)
 literals("any","any",#23199)
 is_instantiated(#22805)
diff --git a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
index 65e0a9a87b6..acf3e91b0d2 100644
--- a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
@@ -175,7 +175,7 @@ stmt_containers(#20062,#20001)
 #20063=*
 exprs(#20063,78,#20062,0,"A")
 hasLocation(#20063,#20015)
-enclosingStmt(#20063,#20062)
+enclosing_stmt(#20063,#20062)
 exprContainers(#20063,#20001)
 literals("A","A",#20063)
 decl(#20063,#20060)
@@ -208,12 +208,12 @@ hasLocation(#20070,#20071)
 #20072=*
 exprs(#20072,0,#20070,0,"constru ... tring);")
 hasLocation(#20072,#20071)
-enclosingStmt(#20072,#20062)
+enclosing_stmt(#20072,#20062)
 exprContainers(#20072,#20001)
 literals("constructor","constructor",#20072)
 exprs(#20067,9,#20070,1,"constru ... tring);")
 hasLocation(#20067,#20071)
-enclosingStmt(#20067,#20062)
+enclosing_stmt(#20067,#20062)
 exprContainers(#20067,#20001)
 #20073=*
 scopes(#20073,1)
@@ -244,13 +244,13 @@ hasLocation(#20078,#20079)
 #20080=*
 exprs(#20080,0,#20078,0,"constru ... any) {}")
 hasLocation(#20080,#20079)
-enclosingStmt(#20080,#20062)
+enclosing_stmt(#20080,#20062)
 exprContainers(#20080,#20001)
 literals("constructor","constructor",#20080)
 #20081=*
 exprs(#20081,9,#20078,1,"constru ... any) {}")
 hasLocation(#20081,#20079)
-enclosingStmt(#20081,#20062)
+enclosing_stmt(#20081,#20062)
 exprContainers(#20081,#20001)
 #20082=*
 scopes(#20082,1)
diff --git a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
index d1a9efe99b0..e8022ad43d4 100644
--- a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
@@ -58,7 +58,7 @@ has_declare_keyword(#20017)
 #20018=*
 exprs(#20018,78,#20017,0,"C")
 hasLocation(#20018,#20009)
-enclosingStmt(#20018,#20017)
+enclosing_stmt(#20018,#20017)
 exprContainers(#20018,#20001)
 literals("C","C",#20018)
 #20019=@"var;{C};{#20000}"
@@ -76,13 +76,13 @@ hasLocation(#20021,#20022)
 #20023=*
 exprs(#20023,0,#20021,0,"constructor")
 hasLocation(#20023,#20022)
-enclosingStmt(#20023,#20017)
+enclosing_stmt(#20023,#20017)
 exprContainers(#20023,#20001)
 literals("constructor","constructor",#20023)
 #20024=*
 exprs(#20024,9,#20021,1,"() {}")
 hasLocation(#20024,#20022)
-enclosingStmt(#20024,#20017)
+enclosing_stmt(#20024,#20017)
 exprContainers(#20024,#20001)
 #20025=*
 scopes(#20025,1)
diff --git a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
index 36d916b2905..53be0491633 100644
--- a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
@@ -330,12 +330,12 @@ stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,94,#20118,-2,"@classDecorator")
 hasLocation(#20120,#20003)
-enclosingStmt(#20120,#20118)
+enclosing_stmt(#20120,#20118)
 exprContainers(#20120,#20001)
 #20121=*
 exprs(#20121,79,#20120,0,"classDecorator")
 hasLocation(#20121,#20033)
-enclosingStmt(#20121,#20118)
+enclosing_stmt(#20121,#20118)
 exprContainers(#20121,#20001)
 literals("classDecorator","classDecorator",#20121)
 #20122=@"var;{classDecorator};{#20000}"
@@ -344,7 +344,7 @@ bind(#20121,#20122)
 #20123=*
 exprs(#20123,78,#20118,0,"Class")
 hasLocation(#20123,#20037)
-enclosingStmt(#20123,#20118)
+enclosing_stmt(#20123,#20118)
 exprContainers(#20123,#20001)
 literals("Class","Class",#20123)
 decl(#20123,#20113)
@@ -363,12 +363,12 @@ exprs(#20127,94,#20125,-1,"@methodDecorator")
 #20128=@"loc,{#10000},3,3,3,18"
 locations_default(#20128,#10000,3,3,3,18)
 hasLocation(#20127,#20128)
-enclosingStmt(#20127,#20118)
+enclosing_stmt(#20127,#20118)
 exprContainers(#20127,#20001)
 #20129=*
 exprs(#20129,79,#20127,0,"methodDecorator")
 hasLocation(#20129,#20043)
-enclosingStmt(#20129,#20118)
+enclosing_stmt(#20129,#20118)
 exprContainers(#20129,#20001)
 literals("methodDecorator","methodDecorator",#20129)
 #20130=@"var;{methodDecorator};{#20000}"
@@ -377,13 +377,13 @@ bind(#20129,#20130)
 #20131=*
 exprs(#20131,0,#20125,0,"method")
 hasLocation(#20131,#20045)
-enclosingStmt(#20131,#20118)
+enclosing_stmt(#20131,#20118)
 exprContainers(#20131,#20001)
 literals("method","method",#20131)
 #20132=*
 exprs(#20132,9,#20125,1,"method( ... field }")
 hasLocation(#20132,#20126)
-enclosingStmt(#20132,#20118)
+enclosing_stmt(#20132,#20118)
 exprContainers(#20132,#20001)
 #20133=*
 scopes(#20133,1)
@@ -414,17 +414,17 @@ exprs(#20140,14,#20138,0,"this.field")
 #20141=@"loc,{#10000},4,29,4,38"
 locations_default(#20141,#10000,4,29,4,38)
 hasLocation(#20140,#20141)
-enclosingStmt(#20140,#20138)
+enclosing_stmt(#20140,#20138)
 exprContainers(#20140,#20132)
 #20142=*
 exprs(#20142,6,#20140,0,"this")
 hasLocation(#20142,#20059)
-enclosingStmt(#20142,#20138)
+enclosing_stmt(#20142,#20138)
 exprContainers(#20142,#20132)
 #20143=*
 exprs(#20143,0,#20140,1,"field")
 hasLocation(#20143,#20063)
-enclosingStmt(#20143,#20138)
+enclosing_stmt(#20143,#20138)
 exprContainers(#20143,#20132)
 literals("field","field",#20143)
 isMethod(#20125)
@@ -438,12 +438,12 @@ exprs(#20146,94,#20144,-1,"@fieldDecorator")
 #20147=@"loc,{#10000},6,3,6,17"
 locations_default(#20147,#10000,6,3,6,17)
 hasLocation(#20146,#20147)
-enclosingStmt(#20146,#20118)
+enclosing_stmt(#20146,#20118)
 exprContainers(#20146,#20001)
 #20148=*
 exprs(#20148,79,#20146,0,"fieldDecorator")
 hasLocation(#20148,#20069)
-enclosingStmt(#20148,#20118)
+enclosing_stmt(#20148,#20118)
 exprContainers(#20148,#20001)
 literals("fieldDecorator","fieldDecorator",#20148)
 #20149=@"var;{fieldDecorator};{#20000}"
@@ -458,7 +458,7 @@ literals("field","field",#20151)
 #20152=*
 typeexprs(#20152,2,#20144,2,"number")
 hasLocation(#20152,#20075)
-enclosingStmt(#20152,#20118)
+enclosing_stmt(#20152,#20118)
 exprContainers(#20152,#20001)
 literals("number","number",#20152)
 #20153=*
@@ -469,12 +469,12 @@ hasLocation(#20153,#20154)
 #20155=*
 exprs(#20155,0,#20153,0,"constructor")
 hasLocation(#20155,#20154)
-enclosingStmt(#20155,#20118)
+enclosing_stmt(#20155,#20118)
 exprContainers(#20155,#20001)
 literals("constructor","constructor",#20155)
 exprs(#20150,9,#20153,1,"() {}")
 hasLocation(#20150,#20154)
-enclosingStmt(#20150,#20118)
+enclosing_stmt(#20150,#20118)
 exprContainers(#20150,#20001)
 #20156=*
 scopes(#20156,1)
@@ -526,12 +526,12 @@ stmt_containers(#20167,#20001)
 #20169=*
 exprs(#20169,94,#20167,-2,"@classDecorator2")
 hasLocation(#20169,#20027)
-enclosingStmt(#20169,#20167)
+enclosing_stmt(#20169,#20167)
 exprContainers(#20169,#20001)
 #20170=*
 exprs(#20170,79,#20169,0,"classDecorator2")
 hasLocation(#20170,#20098)
-enclosingStmt(#20170,#20167)
+enclosing_stmt(#20170,#20167)
 exprContainers(#20170,#20001)
 literals("classDecorator2","classDecorator2",#20170)
 #20171=@"var;{classDecorator2};{#20000}"
@@ -540,7 +540,7 @@ bind(#20170,#20171)
 #20172=*
 exprs(#20172,78,#20167,0,"Class2")
 hasLocation(#20172,#20104)
-enclosingStmt(#20172,#20167)
+enclosing_stmt(#20172,#20167)
 exprContainers(#20172,#20001)
 literals("Class2","Class2",#20172)
 decl(#20172,#20115)
@@ -557,13 +557,13 @@ hasLocation(#20174,#20175)
 #20176=*
 exprs(#20176,0,#20174,0,"constructor")
 hasLocation(#20176,#20175)
-enclosingStmt(#20176,#20167)
+enclosing_stmt(#20176,#20167)
 exprContainers(#20176,#20001)
 literals("constructor","constructor",#20176)
 #20177=*
 exprs(#20177,9,#20174,1,"() {}")
 hasLocation(#20177,#20175)
-enclosingStmt(#20177,#20167)
+enclosing_stmt(#20177,#20167)
 exprContainers(#20177,#20001)
 #20178=*
 scopes(#20178,1)
diff --git a/javascript/extractor/tests/ts/output/trap/enum.ts.trap b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
index ea6ccdf2938..ed1177229cc 100644
--- a/javascript/extractor/tests/ts/output/trap/enum.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
@@ -578,7 +578,7 @@ stmt_containers(#20221,#20001)
 #20222=*
 exprs(#20222,78,#20221,0,"Color")
 hasLocation(#20222,#20041)
-enclosingStmt(#20222,#20221)
+enclosing_stmt(#20222,#20221)
 exprContainers(#20222,#20001)
 literals("Color","Color",#20222)
 decl(#20222,#20203)
@@ -608,7 +608,7 @@ hasLocation(#20230,#20231)
 #20232=*
 exprs(#20232,78,#20230,0,"red")
 hasLocation(#20232,#20045)
-enclosingStmt(#20232,#20221)
+enclosing_stmt(#20232,#20221)
 exprContainers(#20232,#20001)
 literals("red","red",#20232)
 decl(#20232,#20224)
@@ -616,7 +616,7 @@ typedecl(#20232,#20225)
 #20233=*
 exprs(#20233,3,#20230,1,"1")
 hasLocation(#20233,#20049)
-enclosingStmt(#20233,#20221)
+enclosing_stmt(#20233,#20221)
 exprContainers(#20233,#20001)
 literals("1","1",#20233)
 #20234=*
@@ -625,7 +625,7 @@ hasLocation(#20234,#20053)
 #20235=*
 exprs(#20235,78,#20234,0,"green")
 hasLocation(#20235,#20053)
-enclosingStmt(#20235,#20221)
+enclosing_stmt(#20235,#20221)
 exprContainers(#20235,#20001)
 literals("green","green",#20235)
 decl(#20235,#20226)
@@ -636,7 +636,7 @@ hasLocation(#20236,#20057)
 #20237=*
 exprs(#20237,78,#20236,0,"blue")
 hasLocation(#20237,#20057)
-enclosingStmt(#20237,#20221)
+enclosing_stmt(#20237,#20221)
 exprContainers(#20237,#20001)
 literals("blue","blue",#20237)
 decl(#20237,#20228)
@@ -648,7 +648,7 @@ stmt_containers(#20238,#20001)
 #20239=*
 exprs(#20239,78,#20238,0,"DeclaredEnum")
 hasLocation(#20239,#20065)
-enclosingStmt(#20239,#20238)
+enclosing_stmt(#20239,#20238)
 exprContainers(#20239,#20001)
 literals("DeclaredEnum","DeclaredEnum",#20239)
 decl(#20239,#20204)
@@ -672,7 +672,7 @@ hasLocation(#20245,#20069)
 #20246=*
 exprs(#20246,78,#20245,0,"a")
 hasLocation(#20246,#20069)
-enclosingStmt(#20246,#20238)
+enclosing_stmt(#20246,#20238)
 exprContainers(#20246,#20001)
 literals("a","a",#20246)
 decl(#20246,#20241)
@@ -683,7 +683,7 @@ hasLocation(#20247,#20073)
 #20248=*
 exprs(#20248,78,#20247,0,"b")
 hasLocation(#20248,#20073)
-enclosingStmt(#20248,#20238)
+enclosing_stmt(#20248,#20238)
 exprContainers(#20248,#20001)
 literals("b","b",#20248)
 decl(#20248,#20243)
@@ -696,7 +696,7 @@ stmt_containers(#20249,#20001)
 #20250=*
 exprs(#20250,78,#20249,0,"ConstEnum")
 hasLocation(#20250,#20081)
-enclosingStmt(#20250,#20249)
+enclosing_stmt(#20250,#20249)
 exprContainers(#20250,#20001)
 literals("ConstEnum","ConstEnum",#20250)
 decl(#20250,#20205)
@@ -722,7 +722,7 @@ hasLocation(#20256,#20257)
 #20258=*
 exprs(#20258,78,#20256,0,"a")
 hasLocation(#20258,#20085)
-enclosingStmt(#20258,#20249)
+enclosing_stmt(#20258,#20249)
 exprContainers(#20258,#20001)
 literals("a","a",#20258)
 decl(#20258,#20252)
@@ -732,18 +732,18 @@ exprs(#20259,34,#20256,1,"1+2")
 #20260=@"loc,{#10000},4,28,4,30"
 locations_default(#20260,#10000,4,28,4,30)
 hasLocation(#20259,#20260)
-enclosingStmt(#20259,#20249)
+enclosing_stmt(#20259,#20249)
 exprContainers(#20259,#20001)
 #20261=*
 exprs(#20261,3,#20259,0,"1")
 hasLocation(#20261,#20089)
-enclosingStmt(#20261,#20249)
+enclosing_stmt(#20261,#20249)
 exprContainers(#20261,#20001)
 literals("1","1",#20261)
 #20262=*
 exprs(#20262,3,#20259,1,"2")
 hasLocation(#20262,#20093)
-enclosingStmt(#20262,#20249)
+enclosing_stmt(#20262,#20249)
 exprContainers(#20262,#20001)
 literals("2","2",#20262)
 #20263=*
@@ -752,7 +752,7 @@ hasLocation(#20263,#20097)
 #20264=*
 exprs(#20264,78,#20263,0,"b")
 hasLocation(#20264,#20097)
-enclosingStmt(#20264,#20249)
+enclosing_stmt(#20264,#20249)
 exprContainers(#20264,#20001)
 literals("b","b",#20264)
 decl(#20264,#20254)
@@ -765,7 +765,7 @@ stmt_containers(#20265,#20001)
 #20266=*
 exprs(#20266,78,#20265,0,"DeclaredConstEnum")
 hasLocation(#20266,#20107)
-enclosingStmt(#20266,#20265)
+enclosing_stmt(#20266,#20265)
 exprContainers(#20266,#20001)
 literals("DeclaredConstEnum","DeclaredConstEnum",#20266)
 decl(#20266,#20206)
@@ -789,7 +789,7 @@ hasLocation(#20272,#20111)
 #20273=*
 exprs(#20273,78,#20272,0,"a")
 hasLocation(#20273,#20111)
-enclosingStmt(#20273,#20265)
+enclosing_stmt(#20273,#20265)
 exprContainers(#20273,#20001)
 literals("a","a",#20273)
 decl(#20273,#20268)
@@ -800,7 +800,7 @@ hasLocation(#20274,#20115)
 #20275=*
 exprs(#20275,78,#20274,0,"b")
 hasLocation(#20275,#20115)
-enclosingStmt(#20275,#20265)
+enclosing_stmt(#20275,#20265)
 exprContainers(#20275,#20001)
 literals("b","b",#20275)
 decl(#20275,#20270)
@@ -847,7 +847,7 @@ stmt_containers(#20284,#20276)
 #20286=*
 exprs(#20286,79,#20284,0,"x")
 hasLocation(#20286,#20133)
-enclosingStmt(#20286,#20284)
+enclosing_stmt(#20286,#20284)
 exprContainers(#20286,#20276)
 literals("x","x",#20286)
 bind(#20286,#20279)
@@ -860,7 +860,7 @@ stmt_containers(#20287,#20001)
 #20289=*
 exprs(#20289,78,#20287,0,"ComplexInitializer")
 hasLocation(#20289,#20141)
-enclosingStmt(#20289,#20287)
+enclosing_stmt(#20289,#20287)
 exprContainers(#20289,#20001)
 literals("ComplexInitializer","ComplexInitializer",#20289)
 decl(#20289,#20207)
@@ -882,7 +882,7 @@ hasLocation(#20293,#20294)
 #20295=*
 exprs(#20295,78,#20293,0,"a")
 hasLocation(#20295,#20145)
-enclosingStmt(#20295,#20287)
+enclosing_stmt(#20295,#20287)
 exprContainers(#20295,#20001)
 literals("a","a",#20295)
 decl(#20295,#20291)
@@ -892,12 +892,12 @@ exprs(#20296,13,#20293,1,"foo(1 + 2)")
 #20297=@"loc,{#10000},10,7,10,16"
 locations_default(#20297,#10000,10,7,10,16)
 hasLocation(#20296,#20297)
-enclosingStmt(#20296,#20287)
+enclosing_stmt(#20296,#20287)
 exprContainers(#20296,#20001)
 #20298=*
 exprs(#20298,79,#20296,-1,"foo")
 hasLocation(#20298,#20149)
-enclosingStmt(#20298,#20287)
+enclosing_stmt(#20298,#20287)
 exprContainers(#20298,#20001)
 literals("foo","foo",#20298)
 bind(#20298,#20201)
@@ -906,18 +906,18 @@ exprs(#20299,34,#20296,0,"1 + 2")
 #20300=@"loc,{#10000},10,11,10,15"
 locations_default(#20300,#10000,10,11,10,15)
 hasLocation(#20299,#20300)
-enclosingStmt(#20299,#20287)
+enclosing_stmt(#20299,#20287)
 exprContainers(#20299,#20001)
 #20301=*
 exprs(#20301,3,#20299,0,"1")
 hasLocation(#20301,#20153)
-enclosingStmt(#20301,#20287)
+enclosing_stmt(#20301,#20287)
 exprContainers(#20301,#20001)
 literals("1","1",#20301)
 #20302=*
 exprs(#20302,3,#20299,1,"2")
 hasLocation(#20302,#20157)
-enclosingStmt(#20302,#20287)
+enclosing_stmt(#20302,#20287)
 exprContainers(#20302,#20001)
 literals("2","2",#20302)
 #20303=*
@@ -929,7 +929,7 @@ stmt_containers(#20303,#20001)
 #20305=*
 exprs(#20305,78,#20303,0,"StringL ... mMember")
 hasLocation(#20305,#20164)
-enclosingStmt(#20305,#20303)
+enclosing_stmt(#20305,#20303)
 exprContainers(#20305,#20001)
 literals("StringLiteralEnumMember","StringLiteralEnumMember",#20305)
 decl(#20305,#20208)
@@ -955,7 +955,7 @@ hasLocation(#20311,#20312)
 #20313=*
 exprs(#20313,78,#20311,0,"""a""")
 hasLocation(#20313,#20168)
-enclosingStmt(#20313,#20303)
+enclosing_stmt(#20313,#20303)
 exprContainers(#20313,#20001)
 literals("a","a",#20313)
 decl(#20313,#20307)
@@ -963,7 +963,7 @@ typedecl(#20313,#20308)
 #20314=*
 exprs(#20314,3,#20311,1,"2")
 hasLocation(#20314,#20172)
-enclosingStmt(#20314,#20303)
+enclosing_stmt(#20314,#20303)
 exprContainers(#20314,#20001)
 literals("2","2",#20314)
 #20315=*
@@ -974,7 +974,7 @@ hasLocation(#20315,#20316)
 #20317=*
 exprs(#20317,78,#20315,0,"b")
 hasLocation(#20317,#20176)
-enclosingStmt(#20317,#20303)
+enclosing_stmt(#20317,#20303)
 exprContainers(#20317,#20001)
 literals("b","b",#20317)
 decl(#20317,#20309)
@@ -982,7 +982,7 @@ typedecl(#20317,#20310)
 #20318=*
 exprs(#20318,79,#20315,1,"a")
 hasLocation(#20318,#20180)
-enclosingStmt(#20318,#20303)
+enclosing_stmt(#20318,#20303)
 exprContainers(#20318,#20001)
 literals("a","a",#20318)
 bind(#20318,#20307)
@@ -995,19 +995,19 @@ exprs(#20320,64,#20319,0,"x : Str ... r.a = 2")
 #20321=@"loc,{#10000},18,5,18,37"
 locations_default(#20321,#10000,18,5,18,37)
 hasLocation(#20320,#20321)
-enclosingStmt(#20320,#20319)
+enclosing_stmt(#20320,#20319)
 exprContainers(#20320,#20001)
 #20322=*
 exprs(#20322,78,#20320,0,"x")
 hasLocation(#20322,#20185)
-enclosingStmt(#20322,#20319)
+enclosing_stmt(#20322,#20319)
 exprContainers(#20322,#20001)
 literals("x","x",#20322)
 decl(#20322,#20202)
 #20323=*
 exprs(#20323,3,#20320,1,"2")
 hasLocation(#20323,#20197)
-enclosingStmt(#20323,#20319)
+enclosing_stmt(#20323,#20319)
 exprContainers(#20323,#20001)
 literals("2","2",#20323)
 #20324=*
@@ -1015,19 +1015,19 @@ typeexprs(#20324,13,#20320,2,"StringL ... ember.a")
 #20325=@"loc,{#10000},18,9,18,33"
 locations_default(#20325,#10000,18,9,18,33)
 hasLocation(#20324,#20325)
-enclosingStmt(#20324,#20319)
+enclosing_stmt(#20324,#20319)
 exprContainers(#20324,#20001)
 #20326=*
 typeexprs(#20326,25,#20324,0,"StringL ... mMember")
 hasLocation(#20326,#20189)
-enclosingStmt(#20326,#20319)
+enclosing_stmt(#20326,#20319)
 exprContainers(#20326,#20001)
 literals("StringLiteralEnumMember","StringLiteralEnumMember",#20326)
 namespacebind(#20326,#20220)
 #20327=*
 typeexprs(#20327,15,#20324,1,"a")
 hasLocation(#20327,#20193)
-enclosingStmt(#20327,#20319)
+enclosing_stmt(#20327,#20319)
 exprContainers(#20327,#20001)
 literals("a","a",#20327)
 #20328=*
diff --git a/javascript/extractor/tests/ts/output/trap/export.ts.trap b/javascript/extractor/tests/ts/output/trap/export.ts.trap
index 8ef81f3194f..3979f172c86 100644
--- a/javascript/extractor/tests/ts/output/trap/export.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export.ts.trap
@@ -178,19 +178,19 @@ exprs(#20063,64,#20061,0,"foo = 42")
 #20064=@"loc,{#10000},1,14,1,21"
 locations_default(#20064,#10000,1,14,1,21)
 hasLocation(#20063,#20064)
-enclosingStmt(#20063,#20061)
+enclosing_stmt(#20063,#20061)
 exprContainers(#20063,#20001)
 #20065=*
 exprs(#20065,78,#20063,0,"foo")
 hasLocation(#20065,#20017)
-enclosingStmt(#20065,#20061)
+enclosing_stmt(#20065,#20061)
 exprContainers(#20065,#20001)
 literals("foo","foo",#20065)
 decl(#20065,#20056)
 #20066=*
 exprs(#20066,3,#20063,1,"42")
 hasLocation(#20066,#20021)
-enclosingStmt(#20066,#20061)
+enclosing_stmt(#20066,#20061)
 exprContainers(#20066,#20001)
 literals("42","42",#20066)
 #20067=*
@@ -206,7 +206,7 @@ stmt_containers(#20068,#20001)
 #20070=*
 exprs(#20070,78,#20068,0,"C")
 hasLocation(#20070,#20029)
-enclosingStmt(#20070,#20068)
+enclosing_stmt(#20070,#20068)
 exprContainers(#20070,#20001)
 literals("C","C",#20070)
 decl(#20070,#20057)
@@ -223,13 +223,13 @@ hasLocation(#20072,#20073)
 #20074=*
 exprs(#20074,0,#20072,0,"constructor")
 hasLocation(#20074,#20073)
-enclosingStmt(#20074,#20068)
+enclosing_stmt(#20074,#20068)
 exprContainers(#20074,#20001)
 literals("constructor","constructor",#20074)
 #20075=*
 exprs(#20075,9,#20072,1,"() {}")
 hasLocation(#20075,#20073)
-enclosingStmt(#20075,#20068)
+enclosing_stmt(#20075,#20068)
 exprContainers(#20075,#20001)
 #20076=*
 scopes(#20076,1)
diff --git a/javascript/extractor/tests/ts/output/trap/export2.ts.trap b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
index b4b5337dd37..0fb11d84633 100644
--- a/javascript/extractor/tests/ts/output/trap/export2.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
@@ -58,7 +58,7 @@ stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,3,#20016,0,"42")
 hasLocation(#20017,#20009)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 literals("42","42",#20017)
 #20018=*
diff --git a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
index a9bfa37198a..52df66b2665 100644
--- a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
@@ -130,7 +130,7 @@ stmt_containers(#20041,#20001)
 #20042=*
 exprs(#20042,0,#20041,0,"bar")
 hasLocation(#20042,#20027)
-enclosingStmt(#20042,#20041)
+enclosing_stmt(#20042,#20041)
 exprContainers(#20042,#20001)
 literals("bar","bar",#20042)
 #20043=*
diff --git a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
index 93d9083684e..c1a29d83f43 100644
--- a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
@@ -58,7 +58,7 @@ stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,3,#20016,0,"42")
 hasLocation(#20017,#20009)
-enclosingStmt(#20017,#20016)
+enclosing_stmt(#20017,#20016)
 exprContainers(#20017,#20001)
 literals("42","42",#20017)
 #20018=*
diff --git a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
index 2ea22247934..258b4c7d038 100644
--- a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
@@ -69,13 +69,13 @@ hasLocation(#20019,#20020)
 #20021=*
 exprs(#20021,0,#20019,0,"constructor")
 hasLocation(#20021,#20020)
-enclosingStmt(#20021,#20017)
+enclosing_stmt(#20021,#20017)
 exprContainers(#20021,#20001)
 literals("constructor","constructor",#20021)
 #20022=*
 exprs(#20022,9,#20019,1,"() {}")
 hasLocation(#20022,#20020)
-enclosingStmt(#20022,#20017)
+enclosing_stmt(#20022,#20017)
 exprContainers(#20022,#20001)
 #20023=*
 scopes(#20023,1)
diff --git a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
index 00e42424646..b1fec31f0d7 100644
--- a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
@@ -219,24 +219,24 @@ stmt_containers(#20074,#20063)
 #20076=*
 exprs(#20076,64,#20074,0,"x")
 hasLocation(#20076,#20027)
-enclosingStmt(#20076,#20074)
+enclosing_stmt(#20076,#20074)
 exprContainers(#20076,#20063)
 #20077=*
 exprs(#20077,78,#20076,0,"x")
 hasLocation(#20077,#20027)
-enclosingStmt(#20077,#20074)
+enclosing_stmt(#20077,#20074)
 exprContainers(#20077,#20063)
 literals("x","x",#20077)
 decl(#20077,#20072)
 #20078=*
 exprs(#20078,64,#20074,1,"y")
 hasLocation(#20078,#20031)
-enclosingStmt(#20078,#20074)
+enclosing_stmt(#20078,#20074)
 exprContainers(#20078,#20063)
 #20079=*
 exprs(#20079,78,#20078,0,"y")
 hasLocation(#20079,#20031)
-enclosingStmt(#20079,#20074)
+enclosing_stmt(#20079,#20074)
 exprContainers(#20079,#20063)
 literals("y","y",#20079)
 decl(#20079,#20073)
@@ -251,19 +251,19 @@ exprs(#20082,10,#20080,0,"x, y")
 #20083=@"loc,{#10000},3,3,3,6"
 locations_default(#20083,#10000,3,3,3,6)
 hasLocation(#20082,#20083)
-enclosingStmt(#20082,#20080)
+enclosing_stmt(#20082,#20080)
 exprContainers(#20082,#20063)
 #20084=*
 exprs(#20084,79,#20082,0,"x")
 hasLocation(#20084,#20035)
-enclosingStmt(#20084,#20080)
+enclosing_stmt(#20084,#20080)
 exprContainers(#20084,#20063)
 literals("x","x",#20084)
 bind(#20084,#20072)
 #20085=*
 exprs(#20085,79,#20082,1,"y")
 hasLocation(#20085,#20039)
-enclosingStmt(#20085,#20080)
+enclosing_stmt(#20085,#20080)
 exprContainers(#20085,#20063)
 literals("y","y",#20085)
 bind(#20085,#20073)
@@ -278,26 +278,26 @@ exprs(#20088,47,#20086,0,"[x, y] = z")
 #20089=@"loc,{#10000},4,3,4,12"
 locations_default(#20089,#10000,4,3,4,12)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20063)
 #20090=*
 exprs(#20090,67,#20088,0,"[x, y]")
 #20091=@"loc,{#10000},4,3,4,8"
 locations_default(#20091,#10000,4,3,4,8)
 hasLocation(#20090,#20091)
-enclosingStmt(#20090,#20086)
+enclosing_stmt(#20090,#20086)
 exprContainers(#20090,#20063)
 #20092=*
 exprs(#20092,79,#20090,0,"x")
 hasLocation(#20092,#20045)
-enclosingStmt(#20092,#20086)
+enclosing_stmt(#20092,#20086)
 exprContainers(#20092,#20063)
 literals("x","x",#20092)
 bind(#20092,#20072)
 #20093=*
 exprs(#20093,79,#20090,1,"y")
 hasLocation(#20093,#20049)
-enclosingStmt(#20093,#20086)
+enclosing_stmt(#20093,#20086)
 exprContainers(#20093,#20063)
 literals("y","y",#20093)
 bind(#20093,#20073)
@@ -305,7 +305,7 @@ arraySize(#20090,2)
 #20094=*
 exprs(#20094,79,#20088,1,"z")
 hasLocation(#20094,#20055)
-enclosingStmt(#20094,#20086)
+enclosing_stmt(#20094,#20086)
 exprContainers(#20094,#20063)
 literals("z","z",#20094)
 bind(#20094,#20066)
diff --git a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
index 8d0af661b21..dad534d50f8 100644
--- a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
@@ -238,7 +238,7 @@ has_declare_keyword(#20082)
 #20084=*
 exprs(#20084,4,#20082,-1,"""X""")
 hasLocation(#20084,#20025)
-enclosingStmt(#20084,#20082)
+enclosing_stmt(#20084,#20082)
 exprContainers(#20084,#20001)
 literals("X","""X""",#20084)
 #20085=*
@@ -264,7 +264,7 @@ stmt_containers(#20090,#20082)
 #20092=*
 exprs(#20092,78,#20090,-1,"M")
 hasLocation(#20092,#20031)
-enclosingStmt(#20092,#20090)
+enclosing_stmt(#20092,#20090)
 exprContainers(#20092,#20082)
 literals("M","M",#20092)
 namespacedecl(#20092,#20088)
@@ -289,7 +289,7 @@ stmt_containers(#20097,#20090)
 #20099=*
 typeexprs(#20099,1,#20097,0,"I")
 hasLocation(#20099,#20039)
-enclosingStmt(#20099,#20097)
+enclosing_stmt(#20099,#20097)
 exprContainers(#20099,#20090)
 literals("I","I",#20099)
 typedecl(#20099,#20094)
@@ -302,7 +302,7 @@ stmt_containers(#20100,#20082)
 #20102=*
 typeexprs(#20102,1,#20100,0,"M")
 hasLocation(#20102,#20049)
-enclosingStmt(#20102,#20100)
+enclosing_stmt(#20102,#20100)
 exprContainers(#20102,#20082)
 literals("M","M",#20102)
 typedecl(#20102,#20089)
@@ -314,13 +314,13 @@ hasLocation(#20103,#20104)
 #20105=*
 exprs(#20105,0,#20103,0,"method")
 hasLocation(#20105,#20053)
-enclosingStmt(#20105,#20100)
+enclosing_stmt(#20105,#20100)
 exprContainers(#20105,#20082)
 literals("method","method",#20105)
 #20106=*
 exprs(#20106,9,#20103,1,"method(): M.I;")
 hasLocation(#20106,#20104)
-enclosingStmt(#20106,#20100)
+enclosing_stmt(#20106,#20100)
 exprContainers(#20106,#20082)
 #20107=*
 scopes(#20107,1)
@@ -357,7 +357,7 @@ stmt_containers(#20113,#20082)
 #20115=*
 exprs(#20115,103,#20113,0,"M")
 hasLocation(#20115,#20075)
-enclosingStmt(#20115,#20113)
+enclosing_stmt(#20115,#20113)
 exprContainers(#20115,#20082)
 literals("M","M",#20115)
 typebind(#20115,#20089)
diff --git a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
index 97426ab0e8e..610dc2fa4ac 100644
--- a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
@@ -598,12 +598,12 @@ exprs(#20225,64,#20224,0,"A : any")
 #20226=@"loc,{#10000},1,13,1,19"
 locations_default(#20226,#10000,1,13,1,19)
 hasLocation(#20225,#20226)
-enclosingStmt(#20225,#20224)
+enclosing_stmt(#20225,#20224)
 exprContainers(#20225,#20001)
 #20227=*
 exprs(#20227,78,#20225,0,"A")
 hasLocation(#20227,#20037)
-enclosingStmt(#20227,#20224)
+enclosing_stmt(#20227,#20224)
 exprContainers(#20227,#20001)
 literals("A","A",#20227)
 #20228=@"var;{A};{#20000}"
@@ -612,7 +612,7 @@ decl(#20227,#20228)
 #20229=*
 typeexprs(#20229,2,#20225,2,"any")
 hasLocation(#20229,#20041)
-enclosingStmt(#20229,#20224)
+enclosing_stmt(#20229,#20224)
 exprContainers(#20229,#20001)
 literals("any","any",#20229)
 #20230=*
@@ -625,12 +625,12 @@ exprs(#20231,64,#20230,0,"B : any")
 #20232=@"loc,{#10000},2,13,2,19"
 locations_default(#20232,#10000,2,13,2,19)
 hasLocation(#20231,#20232)
-enclosingStmt(#20231,#20230)
+enclosing_stmt(#20231,#20230)
 exprContainers(#20231,#20001)
 #20233=*
 exprs(#20233,78,#20231,0,"B")
 hasLocation(#20233,#20049)
-enclosingStmt(#20233,#20230)
+enclosing_stmt(#20233,#20230)
 exprContainers(#20233,#20001)
 literals("B","B",#20233)
 #20234=@"var;{B};{#20000}"
@@ -639,7 +639,7 @@ decl(#20233,#20234)
 #20235=*
 typeexprs(#20235,2,#20231,2,"any")
 hasLocation(#20235,#20053)
-enclosingStmt(#20235,#20230)
+enclosing_stmt(#20235,#20230)
 exprContainers(#20235,#20001)
 literals("any","any",#20235)
 #20236=*
@@ -652,19 +652,19 @@ exprs(#20237,64,#20236,0,"C : any")
 #20238=@"loc,{#10000},3,13,3,19"
 locations_default(#20238,#10000,3,13,3,19)
 hasLocation(#20237,#20238)
-enclosingStmt(#20237,#20236)
+enclosing_stmt(#20237,#20236)
 exprContainers(#20237,#20001)
 #20239=*
 exprs(#20239,78,#20237,0,"C")
 hasLocation(#20239,#20061)
-enclosingStmt(#20239,#20236)
+enclosing_stmt(#20239,#20236)
 exprContainers(#20239,#20001)
 literals("C","C",#20239)
 decl(#20239,#20222)
 #20240=*
 typeexprs(#20240,2,#20237,2,"any")
 hasLocation(#20240,#20065)
-enclosingStmt(#20240,#20236)
+enclosing_stmt(#20240,#20236)
 exprContainers(#20240,#20001)
 literals("any","any",#20240)
 #20241=*
@@ -676,7 +676,7 @@ stmt_containers(#20241,#20001)
 #20243=*
 exprs(#20243,78,#20241,0,"C")
 hasLocation(#20243,#20071)
-enclosingStmt(#20243,#20241)
+enclosing_stmt(#20243,#20241)
 exprContainers(#20243,#20001)
 literals("C","C",#20243)
 decl(#20243,#20222)
@@ -693,13 +693,13 @@ hasLocation(#20245,#20246)
 #20247=*
 exprs(#20247,0,#20245,0,"m1")
 hasLocation(#20247,#20075)
-enclosingStmt(#20247,#20241)
+enclosing_stmt(#20247,#20241)
 exprContainers(#20247,#20001)
 literals("m1","m1",#20247)
 #20248=*
 exprs(#20248,9,#20245,1,"m1(none) {}")
 hasLocation(#20248,#20246)
-enclosingStmt(#20248,#20241)
+enclosing_stmt(#20248,#20241)
 exprContainers(#20248,#20001)
 #20249=*
 scopes(#20249,1)
@@ -731,13 +731,13 @@ hasLocation(#20255,#20256)
 #20257=*
 exprs(#20257,0,#20255,0,"m2")
 hasLocation(#20257,#20087)
-enclosingStmt(#20257,#20241)
+enclosing_stmt(#20257,#20241)
 exprContainers(#20257,#20001)
 literals("m2","m2",#20257)
 #20258=*
 exprs(#20258,9,#20255,1,"m2(@A a) {}")
 hasLocation(#20258,#20256)
-enclosingStmt(#20258,#20241)
+enclosing_stmt(#20258,#20241)
 exprContainers(#20258,#20001)
 #20259=*
 scopes(#20259,1)
@@ -785,13 +785,13 @@ hasLocation(#20269,#20270)
 #20271=*
 exprs(#20271,0,#20269,0,"m3")
 hasLocation(#20271,#20103)
-enclosingStmt(#20271,#20241)
+enclosing_stmt(#20271,#20241)
 exprContainers(#20271,#20001)
 literals("m3","m3",#20271)
 #20272=*
 exprs(#20272,9,#20269,1,"m3(@A @B ab) {}")
 hasLocation(#20272,#20270)
-enclosingStmt(#20272,#20241)
+enclosing_stmt(#20272,#20241)
 exprContainers(#20272,#20001)
 #20273=*
 scopes(#20273,1)
@@ -853,13 +853,13 @@ hasLocation(#20287,#20288)
 #20289=*
 exprs(#20289,0,#20287,0,"m4")
 hasLocation(#20289,#20123)
-enclosingStmt(#20289,#20241)
+enclosing_stmt(#20289,#20241)
 exprContainers(#20289,#20001)
 literals("m4","m4",#20289)
 #20290=*
 exprs(#20290,9,#20287,1,"m4(none, @A a) {}")
 hasLocation(#20290,#20288)
-enclosingStmt(#20290,#20241)
+enclosing_stmt(#20290,#20241)
 exprContainers(#20290,#20001)
 #20291=*
 scopes(#20291,1)
@@ -915,13 +915,13 @@ hasLocation(#20303,#20304)
 #20305=*
 exprs(#20305,0,#20303,0,"m5")
 hasLocation(#20305,#20143)
-enclosingStmt(#20305,#20241)
+enclosing_stmt(#20305,#20241)
 exprContainers(#20305,#20001)
 literals("m5","m5",#20305)
 #20306=*
 exprs(#20306,9,#20303,1,"m5(none ...  ab) {}")
 hasLocation(#20306,#20304)
-enclosingStmt(#20306,#20241)
+enclosing_stmt(#20306,#20241)
 exprContainers(#20306,#20001)
 #20307=*
 scopes(#20307,1)
@@ -991,13 +991,13 @@ hasLocation(#20323,#20324)
 #20325=*
 exprs(#20325,0,#20323,0,"m6")
 hasLocation(#20325,#20167)
-enclosingStmt(#20325,#20241)
+enclosing_stmt(#20325,#20241)
 exprContainers(#20325,#20001)
 literals("m6","m6",#20325)
 #20326=*
 exprs(#20326,9,#20323,1,"m6(@A a, @B b) {}")
 hasLocation(#20326,#20324)
-enclosingStmt(#20326,#20241)
+enclosing_stmt(#20326,#20241)
 exprContainers(#20326,#20001)
 #20327=*
 scopes(#20327,1)
@@ -1069,13 +1069,13 @@ hasLocation(#20343,#20344)
 #20345=*
 exprs(#20345,0,#20343,0,"m7")
 hasLocation(#20345,#20191)
-enclosingStmt(#20345,#20241)
+enclosing_stmt(#20345,#20241)
 exprContainers(#20345,#20001)
 literals("m7","m7",#20345)
 #20346=*
 exprs(#20346,9,#20343,1,"m7(@A a ...  bc) {}")
 hasLocation(#20346,#20344)
-enclosingStmt(#20346,#20241)
+enclosing_stmt(#20346,#20241)
 exprContainers(#20346,#20001)
 #20347=*
 scopes(#20347,1)
@@ -1161,13 +1161,13 @@ hasLocation(#20367,#20368)
 #20369=*
 exprs(#20369,0,#20367,0,"constructor")
 hasLocation(#20369,#20368)
-enclosingStmt(#20369,#20241)
+enclosing_stmt(#20369,#20241)
 exprContainers(#20369,#20001)
 literals("constructor","constructor",#20369)
 #20370=*
 exprs(#20370,9,#20367,1,"() {}")
 hasLocation(#20370,#20368)
-enclosingStmt(#20370,#20241)
+enclosing_stmt(#20370,#20241)
 exprContainers(#20370,#20001)
 #20371=*
 scopes(#20371,1)
diff --git a/javascript/extractor/tests/ts/output/trap/hello.ts.trap b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
index ec43d8b5c8a..0e1d4dbcc55 100644
--- a/javascript/extractor/tests/ts/output/trap/hello.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
@@ -219,19 +219,19 @@ exprs(#20075,34,#20073,0,"""Hello, ... n + ""!""")
 #20076=@"loc,{#10000},2,12,2,35"
 locations_default(#20076,#10000,2,12,2,35)
 hasLocation(#20075,#20076)
-enclosingStmt(#20075,#20073)
+enclosing_stmt(#20075,#20073)
 exprContainers(#20075,#20063)
 #20077=*
 exprs(#20077,34,#20075,0,"""Hello, "" + person")
 #20078=@"loc,{#10000},2,12,2,29"
 locations_default(#20078,#10000,2,12,2,29)
 hasLocation(#20077,#20078)
-enclosingStmt(#20077,#20073)
+enclosing_stmt(#20077,#20073)
 exprContainers(#20077,#20063)
 #20079=*
 exprs(#20079,4,#20077,0,"""Hello, """)
 hasLocation(#20079,#20031)
-enclosingStmt(#20079,#20073)
+enclosing_stmt(#20079,#20073)
 exprContainers(#20079,#20063)
 literals("Hello, ","""Hello, """,#20079)
 #20080=*
@@ -243,14 +243,14 @@ regexpConstValue(#20080,"Hello, ")
 #20082=*
 exprs(#20082,79,#20077,1,"person")
 hasLocation(#20082,#20035)
-enclosingStmt(#20082,#20073)
+enclosing_stmt(#20082,#20073)
 exprContainers(#20082,#20063)
 literals("person","person",#20082)
 bind(#20082,#20067)
 #20083=*
 exprs(#20083,4,#20075,1,"""!""")
 hasLocation(#20083,#20039)
-enclosingStmt(#20083,#20073)
+enclosing_stmt(#20083,#20073)
 exprContainers(#20083,#20063)
 literals("!","""!""",#20083)
 #20084=*
@@ -268,12 +268,12 @@ exprs(#20087,13,#20086,0,"alert(g ... orld""))")
 #20088=@"loc,{#10000},5,1,5,23"
 locations_default(#20088,#10000,5,1,5,23)
 hasLocation(#20087,#20088)
-enclosingStmt(#20087,#20086)
+enclosing_stmt(#20087,#20086)
 exprContainers(#20087,#20001)
 #20089=*
 exprs(#20089,79,#20087,-1,"alert")
 hasLocation(#20089,#20044)
-enclosingStmt(#20089,#20086)
+enclosing_stmt(#20089,#20086)
 exprContainers(#20089,#20001)
 literals("alert","alert",#20089)
 #20090=@"var;{alert};{#20000}"
@@ -284,19 +284,19 @@ exprs(#20091,13,#20087,0,"greeter(""world"")")
 #20092=@"loc,{#10000},5,7,5,22"
 locations_default(#20092,#10000,5,7,5,22)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20086)
+enclosing_stmt(#20091,#20086)
 exprContainers(#20091,#20001)
 #20093=*
 exprs(#20093,79,#20091,-1,"greeter")
 hasLocation(#20093,#20048)
-enclosingStmt(#20093,#20086)
+enclosing_stmt(#20093,#20086)
 exprContainers(#20093,#20001)
 literals("greeter","greeter",#20093)
 bind(#20093,#20062)
 #20094=*
 exprs(#20094,4,#20091,0,"""world""")
 hasLocation(#20094,#20052)
-enclosingStmt(#20094,#20086)
+enclosing_stmt(#20094,#20086)
 exprContainers(#20094,#20001)
 literals("world","""world""",#20094)
 #20095=*
diff --git a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
index cd71310ee3a..a986146ac06 100644
--- a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
@@ -143,7 +143,7 @@ stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,4,#20048,-1,"'somewhere'")
 hasLocation(#20049,#20019)
-enclosingStmt(#20049,#20048)
+enclosing_stmt(#20049,#20048)
 exprContainers(#20049,#20001)
 literals("somewhere","'somewhere'",#20049)
 #20050=*
@@ -157,12 +157,12 @@ exprs(#20052,85,#20048,0,"* as Something")
 #20053=@"loc,{#10000},1,8,1,21"
 locations_default(#20053,#10000,1,8,1,21)
 hasLocation(#20052,#20053)
-enclosingStmt(#20052,#20048)
+enclosing_stmt(#20052,#20048)
 exprContainers(#20052,#20001)
 #20054=*
 exprs(#20054,78,#20052,1,"Something")
 hasLocation(#20054,#20015)
-enclosingStmt(#20054,#20048)
+enclosing_stmt(#20054,#20048)
 exprContainers(#20054,#20001)
 literals("Something","Something",#20054)
 decl(#20054,#20042)
@@ -181,7 +181,7 @@ stmt_containers(#20056,#20001)
 #20058=*
 exprs(#20058,78,#20056,0,"importExport")
 hasLocation(#20058,#20027)
-enclosingStmt(#20058,#20056)
+enclosing_stmt(#20058,#20056)
 exprContainers(#20058,#20001)
 literals("importExport","importExport",#20058)
 decl(#20058,#20043)
@@ -192,12 +192,12 @@ exprs(#20059,14,#20056,1,"Something.thingy")
 #20060=@"loc,{#10000},3,30,3,45"
 locations_default(#20060,#10000,3,30,3,45)
 hasLocation(#20059,#20060)
-enclosingStmt(#20059,#20056)
+enclosing_stmt(#20059,#20056)
 exprContainers(#20059,#20001)
 #20061=*
 exprs(#20061,103,#20059,0,"Something")
 hasLocation(#20061,#20031)
-enclosingStmt(#20061,#20056)
+enclosing_stmt(#20061,#20056)
 exprContainers(#20061,#20001)
 literals("Something","Something",#20061)
 namespacebind(#20061,#20046)
@@ -205,7 +205,7 @@ bind(#20061,#20042)
 #20062=*
 exprs(#20062,0,#20059,1,"thingy")
 hasLocation(#20062,#20035)
-enclosingStmt(#20062,#20056)
+enclosing_stmt(#20062,#20056)
 exprContainers(#20062,#20001)
 literals("thingy","thingy",#20062)
 #20063=*
diff --git a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
index 2dcc27f5a5f..3e15914c5ed 100644
--- a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
@@ -87,7 +87,7 @@ stmt_containers(#20027,#20001)
 #20028=*
 exprs(#20028,78,#20027,0,"x")
 hasLocation(#20028,#20007)
-enclosingStmt(#20028,#20027)
+enclosing_stmt(#20028,#20027)
 exprContainers(#20028,#20001)
 literals("x","x",#20028)
 decl(#20028,#20024)
@@ -98,12 +98,12 @@ exprs(#20029,98,#20027,1,"require ... ssign"")")
 #20030=@"loc,{#10000},1,12,1,36"
 locations_default(#20030,#10000,1,12,1,36)
 hasLocation(#20029,#20030)
-enclosingStmt(#20029,#20027)
+enclosing_stmt(#20029,#20027)
 exprContainers(#20029,#20001)
 #20031=*
 exprs(#20031,4,#20029,0,"""./exportassign""")
 hasLocation(#20031,#20015)
-enclosingStmt(#20031,#20027)
+enclosing_stmt(#20031,#20027)
 exprContainers(#20031,#20001)
 literals("./exportassign","""./exportassign""",#20031)
 #20032=*
diff --git a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
index e91435a4a40..a205b71a500 100644
--- a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
@@ -270,7 +270,7 @@ stmt_containers(#20095,#20001)
 #20097=*
 typeexprs(#20097,1,#20095,0,"MyInterface")
 hasLocation(#20097,#20027)
-enclosingStmt(#20097,#20095)
+enclosing_stmt(#20097,#20095)
 exprContainers(#20097,#20001)
 literals("MyInterface","MyInterface",#20097)
 typedecl(#20097,#20094)
@@ -282,13 +282,13 @@ hasLocation(#20098,#20099)
 #20100=*
 exprs(#20100,0,#20098,0,"foo")
 hasLocation(#20100,#20031)
-enclosingStmt(#20100,#20095)
+enclosing_stmt(#20100,#20095)
 exprContainers(#20100,#20001)
 literals("foo","foo",#20100)
 #20101=*
 exprs(#20101,9,#20098,1,"foo();")
 hasLocation(#20101,#20099)
-enclosingStmt(#20101,#20095)
+enclosing_stmt(#20101,#20095)
 exprContainers(#20101,#20001)
 #20102=*
 scopes(#20102,1)
@@ -307,13 +307,13 @@ hasLocation(#20104,#20105)
 #20106=*
 exprs(#20106,0,#20104,0,"bar")
 hasLocation(#20106,#20039)
-enclosingStmt(#20106,#20095)
+enclosing_stmt(#20106,#20095)
 exprContainers(#20106,#20001)
 literals("bar","bar",#20106)
 #20107=*
 exprs(#20107,9,#20104,1,"bar(x:  ... string;")
 hasLocation(#20107,#20105)
-enclosingStmt(#20107,#20095)
+enclosing_stmt(#20107,#20095)
 exprContainers(#20107,#20001)
 #20108=*
 scopes(#20108,1)
@@ -350,14 +350,14 @@ hasLocation(#20114,#20115)
 #20116=*
 exprs(#20116,0,#20114,0,"field")
 hasLocation(#20116,#20057)
-enclosingStmt(#20116,#20095)
+enclosing_stmt(#20116,#20095)
 exprContainers(#20116,#20001)
 literals("field","field",#20116)
 isAbstractMember(#20114)
 #20117=*
 typeexprs(#20117,2,#20114,2,"number")
 hasLocation(#20117,#20061)
-enclosingStmt(#20117,#20095)
+enclosing_stmt(#20117,#20095)
 exprContainers(#20117,#20001)
 literals("number","number",#20117)
 #20118=*
@@ -369,7 +369,7 @@ stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,78,#20118,-1,"Foo")
 hasLocation(#20120,#20068)
-enclosingStmt(#20120,#20118)
+enclosing_stmt(#20120,#20118)
 exprContainers(#20120,#20001)
 literals("Foo","Foo",#20120)
 namespacedecl(#20120,#20093)
@@ -394,7 +394,7 @@ stmt_containers(#20125,#20118)
 #20127=*
 typeexprs(#20127,1,#20125,0,"I")
 hasLocation(#20127,#20076)
-enclosingStmt(#20127,#20125)
+enclosing_stmt(#20127,#20125)
 exprContainers(#20127,#20118)
 literals("I","I",#20127)
 typedecl(#20127,#20122)
@@ -406,13 +406,13 @@ hasLocation(#20128,#20129)
 #20130=*
 exprs(#20130,0,#20128,0,"bar")
 hasLocation(#20130,#20080)
-enclosingStmt(#20130,#20125)
+enclosing_stmt(#20130,#20125)
 exprContainers(#20130,#20118)
 literals("bar","bar",#20130)
 #20131=*
 exprs(#20131,9,#20128,1,"bar();")
 hasLocation(#20131,#20129)
-enclosingStmt(#20131,#20125)
+enclosing_stmt(#20131,#20125)
 exprContainers(#20131,#20118)
 #20132=*
 scopes(#20132,1)
diff --git a/javascript/extractor/tests/ts/output/trap/let.ts.trap b/javascript/extractor/tests/ts/output/trap/let.ts.trap
index 1866cc57c26..fb603ef4fc3 100644
--- a/javascript/extractor/tests/ts/output/trap/let.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/let.ts.trap
@@ -127,19 +127,19 @@ exprs(#20045,64,#20044,0,"varX = 5")
 #20046=@"loc,{#10000},1,5,1,12"
 locations_default(#20046,#10000,1,5,1,12)
 hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20044)
+enclosing_stmt(#20045,#20044)
 exprContainers(#20045,#20001)
 #20047=*
 exprs(#20047,78,#20045,0,"varX")
 hasLocation(#20047,#20011)
-enclosingStmt(#20047,#20044)
+enclosing_stmt(#20047,#20044)
 exprContainers(#20047,#20001)
 literals("varX","varX",#20047)
 decl(#20047,#20041)
 #20048=*
 exprs(#20048,3,#20045,1,"5")
 hasLocation(#20048,#20015)
-enclosingStmt(#20048,#20044)
+enclosing_stmt(#20048,#20044)
 exprContainers(#20048,#20001)
 literals("5","5",#20048)
 #20049=*
@@ -151,19 +151,19 @@ exprs(#20050,64,#20049,0,"letX = 6")
 #20051=@"loc,{#10000},2,5,2,12"
 locations_default(#20051,#10000,2,5,2,12)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20049)
+enclosing_stmt(#20050,#20049)
 exprContainers(#20050,#20001)
 #20052=*
 exprs(#20052,78,#20050,0,"letX")
 hasLocation(#20052,#20021)
-enclosingStmt(#20052,#20049)
+enclosing_stmt(#20052,#20049)
 exprContainers(#20052,#20001)
 literals("letX","letX",#20052)
 decl(#20052,#20042)
 #20053=*
 exprs(#20053,3,#20050,1,"6")
 hasLocation(#20053,#20025)
-enclosingStmt(#20053,#20049)
+enclosing_stmt(#20053,#20049)
 exprContainers(#20053,#20001)
 literals("6","6",#20053)
 #20054=*
@@ -175,19 +175,19 @@ exprs(#20055,64,#20054,0,"constX = 7")
 #20056=@"loc,{#10000},3,7,3,16"
 locations_default(#20056,#10000,3,7,3,16)
 hasLocation(#20055,#20056)
-enclosingStmt(#20055,#20054)
+enclosing_stmt(#20055,#20054)
 exprContainers(#20055,#20001)
 #20057=*
 exprs(#20057,78,#20055,0,"constX")
 hasLocation(#20057,#20031)
-enclosingStmt(#20057,#20054)
+enclosing_stmt(#20057,#20054)
 exprContainers(#20057,#20001)
 literals("constX","constX",#20057)
 decl(#20057,#20043)
 #20058=*
 exprs(#20058,3,#20055,1,"7")
 hasLocation(#20058,#20035)
-enclosingStmt(#20058,#20054)
+enclosing_stmt(#20058,#20054)
 exprContainers(#20058,#20001)
 literals("7","7",#20058)
 #20059=*
diff --git a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
index 84eaa23ffff..577dd9cac0a 100644
--- a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
@@ -222,19 +222,19 @@ exprs(#20076,45,#20074,0,"x || y")
 #20077=@"loc,{#10000},2,7,2,12"
 locations_default(#20077,#10000,2,7,2,12)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20074)
+enclosing_stmt(#20076,#20074)
 exprContainers(#20076,#20063)
 #20078=*
 exprs(#20078,79,#20076,0,"x")
 hasLocation(#20078,#20031)
-enclosingStmt(#20078,#20074)
+enclosing_stmt(#20078,#20074)
 exprContainers(#20078,#20063)
 literals("x","x",#20078)
 bind(#20078,#20067)
 #20079=*
 exprs(#20079,79,#20076,1,"y")
 hasLocation(#20079,#20035)
-enclosingStmt(#20079,#20074)
+enclosing_stmt(#20079,#20074)
 exprContainers(#20079,#20063)
 literals("y","y",#20079)
 bind(#20079,#20069)
@@ -255,19 +255,19 @@ exprs(#20084,44,#20082,0,"x && y")
 #20085=@"loc,{#10000},3,7,3,12"
 locations_default(#20085,#10000,3,7,3,12)
 hasLocation(#20084,#20085)
-enclosingStmt(#20084,#20082)
+enclosing_stmt(#20084,#20082)
 exprContainers(#20084,#20063)
 #20086=*
 exprs(#20086,79,#20084,0,"x")
 hasLocation(#20086,#20047)
-enclosingStmt(#20086,#20082)
+enclosing_stmt(#20086,#20082)
 exprContainers(#20086,#20063)
 literals("x","x",#20086)
 bind(#20086,#20067)
 #20087=*
 exprs(#20087,79,#20084,1,"y")
 hasLocation(#20087,#20051)
-enclosingStmt(#20087,#20082)
+enclosing_stmt(#20087,#20082)
 exprContainers(#20087,#20063)
 literals("y","y",#20087)
 bind(#20087,#20069)
diff --git a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
index 6fd04072b05..b7ae11e9ad5 100644
--- a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
@@ -700,7 +700,7 @@ stmt_containers(#20265,#20001)
 #20267=*
 exprs(#20267,78,#20265,-1,"MappedTypeModifiers")
 hasLocation(#20267,#20037)
-enclosingStmt(#20267,#20265)
+enclosing_stmt(#20267,#20265)
 exprContainers(#20267,#20001)
 literals("MappedTypeModifiers","MappedTypeModifiers",#20267)
 namespacedecl(#20267,#20264)
@@ -729,7 +729,7 @@ stmt_containers(#20275,#20265)
 #20277=*
 typeexprs(#20277,1,#20275,0,"MutableRequired")
 hasLocation(#20277,#20043)
-enclosingStmt(#20277,#20275)
+enclosing_stmt(#20277,#20275)
 exprContainers(#20277,#20265)
 literals("MutableRequired","MutableRequired",#20277)
 typedecl(#20277,#20269)
@@ -742,12 +742,12 @@ local_type_names(#20279,"T",#20278)
 #20280=*
 typeexprs(#20280,22,#20275,2,"T")
 hasLocation(#20280,#20047)
-enclosingStmt(#20280,#20275)
+enclosing_stmt(#20280,#20275)
 exprContainers(#20280,#20265)
 #20281=*
 typeexprs(#20281,1,#20280,0,"T")
 hasLocation(#20281,#20047)
-enclosingStmt(#20281,#20275)
+enclosing_stmt(#20281,#20275)
 exprContainers(#20281,#20265)
 literals("T","T",#20281)
 typedecl(#20281,#20279)
@@ -756,7 +756,7 @@ typeexprs(#20282,27,#20275,1,"{ -read ...  T[P] }")
 #20283=@"loc,{#10000},2,29,2,64"
 locations_default(#20283,#10000,2,29,2,64)
 hasLocation(#20282,#20283)
-enclosingStmt(#20282,#20275)
+enclosing_stmt(#20282,#20275)
 exprContainers(#20282,#20265)
 #20284=*
 scopes(#20284,13)
@@ -769,12 +769,12 @@ typeexprs(#20286,22,#20282,0,"P in keyof T")
 #20287=@"loc,{#10000},2,42,2,53"
 locations_default(#20287,#10000,2,42,2,53)
 hasLocation(#20286,#20287)
-enclosingStmt(#20286,#20275)
+enclosing_stmt(#20286,#20275)
 exprContainers(#20286,#20265)
 #20288=*
 typeexprs(#20288,1,#20286,0,"P")
 hasLocation(#20288,#20061)
-enclosingStmt(#20288,#20275)
+enclosing_stmt(#20288,#20275)
 exprContainers(#20288,#20265)
 literals("P","P",#20288)
 typedecl(#20288,#20285)
@@ -783,12 +783,12 @@ typeexprs(#20289,12,#20286,1,"keyof T")
 #20290=@"loc,{#10000},2,47,2,53"
 locations_default(#20290,#10000,2,47,2,53)
 hasLocation(#20289,#20290)
-enclosingStmt(#20289,#20275)
+enclosing_stmt(#20289,#20275)
 exprContainers(#20289,#20265)
 #20291=*
 typeexprs(#20291,0,#20289,0,"T")
 hasLocation(#20291,#20067)
-enclosingStmt(#20291,#20275)
+enclosing_stmt(#20291,#20275)
 exprContainers(#20291,#20265)
 literals("T","T",#20291)
 typebind(#20291,#20279)
@@ -797,19 +797,19 @@ typeexprs(#20292,8,#20282,1,"T[P]")
 #20293=@"loc,{#10000},2,59,2,62"
 locations_default(#20293,#10000,2,59,2,62)
 hasLocation(#20292,#20293)
-enclosingStmt(#20292,#20275)
+enclosing_stmt(#20292,#20275)
 exprContainers(#20292,#20265)
 #20294=*
 typeexprs(#20294,0,#20292,0,"T")
 hasLocation(#20294,#20077)
-enclosingStmt(#20294,#20275)
+enclosing_stmt(#20294,#20275)
 exprContainers(#20294,#20265)
 literals("T","T",#20294)
 typebind(#20294,#20279)
 #20295=*
 typeexprs(#20295,0,#20292,1,"P")
 hasLocation(#20295,#20081)
-enclosingStmt(#20295,#20275)
+enclosing_stmt(#20295,#20275)
 exprContainers(#20295,#20265)
 literals("P","P",#20295)
 typebind(#20295,#20285)
@@ -822,7 +822,7 @@ stmt_containers(#20296,#20265)
 #20298=*
 typeexprs(#20298,1,#20296,0,"ReadonlyPartial")
 hasLocation(#20298,#20091)
-enclosingStmt(#20298,#20296)
+enclosing_stmt(#20298,#20296)
 exprContainers(#20298,#20265)
 literals("ReadonlyPartial","ReadonlyPartial",#20298)
 typedecl(#20298,#20270)
@@ -835,12 +835,12 @@ local_type_names(#20300,"T",#20299)
 #20301=*
 typeexprs(#20301,22,#20296,2,"T")
 hasLocation(#20301,#20095)
-enclosingStmt(#20301,#20296)
+enclosing_stmt(#20301,#20296)
 exprContainers(#20301,#20265)
 #20302=*
 typeexprs(#20302,1,#20301,0,"T")
 hasLocation(#20302,#20095)
-enclosingStmt(#20302,#20296)
+enclosing_stmt(#20302,#20296)
 exprContainers(#20302,#20265)
 literals("T","T",#20302)
 typedecl(#20302,#20300)
@@ -849,7 +849,7 @@ typeexprs(#20303,27,#20296,1,"{ +read ...  T[P] }")
 #20304=@"loc,{#10000},3,29,3,64"
 locations_default(#20304,#10000,3,29,3,64)
 hasLocation(#20303,#20304)
-enclosingStmt(#20303,#20296)
+enclosing_stmt(#20303,#20296)
 exprContainers(#20303,#20265)
 #20305=*
 scopes(#20305,13)
@@ -862,12 +862,12 @@ typeexprs(#20307,22,#20303,0,"P in keyof T")
 #20308=@"loc,{#10000},3,42,3,53"
 locations_default(#20308,#10000,3,42,3,53)
 hasLocation(#20307,#20308)
-enclosingStmt(#20307,#20296)
+enclosing_stmt(#20307,#20296)
 exprContainers(#20307,#20265)
 #20309=*
 typeexprs(#20309,1,#20307,0,"P")
 hasLocation(#20309,#20109)
-enclosingStmt(#20309,#20296)
+enclosing_stmt(#20309,#20296)
 exprContainers(#20309,#20265)
 literals("P","P",#20309)
 typedecl(#20309,#20306)
@@ -876,12 +876,12 @@ typeexprs(#20310,12,#20307,1,"keyof T")
 #20311=@"loc,{#10000},3,47,3,53"
 locations_default(#20311,#10000,3,47,3,53)
 hasLocation(#20310,#20311)
-enclosingStmt(#20310,#20296)
+enclosing_stmt(#20310,#20296)
 exprContainers(#20310,#20265)
 #20312=*
 typeexprs(#20312,0,#20310,0,"T")
 hasLocation(#20312,#20115)
-enclosingStmt(#20312,#20296)
+enclosing_stmt(#20312,#20296)
 exprContainers(#20312,#20265)
 literals("T","T",#20312)
 typebind(#20312,#20300)
@@ -890,19 +890,19 @@ typeexprs(#20313,8,#20303,1,"T[P]")
 #20314=@"loc,{#10000},3,59,3,62"
 locations_default(#20314,#10000,3,59,3,62)
 hasLocation(#20313,#20314)
-enclosingStmt(#20313,#20296)
+enclosing_stmt(#20313,#20296)
 exprContainers(#20313,#20265)
 #20315=*
 typeexprs(#20315,0,#20313,0,"T")
 hasLocation(#20315,#20125)
-enclosingStmt(#20315,#20296)
+enclosing_stmt(#20315,#20296)
 exprContainers(#20315,#20265)
 literals("T","T",#20315)
 typebind(#20315,#20300)
 #20316=*
 typeexprs(#20316,0,#20313,1,"P")
 hasLocation(#20316,#20129)
-enclosingStmt(#20316,#20296)
+enclosing_stmt(#20316,#20296)
 exprContainers(#20316,#20265)
 literals("P","P",#20316)
 typebind(#20316,#20306)
@@ -915,7 +915,7 @@ stmt_containers(#20317,#20265)
 #20319=*
 typeexprs(#20319,1,#20317,0,"ReadonlyPartial2")
 hasLocation(#20319,#20139)
-enclosingStmt(#20319,#20317)
+enclosing_stmt(#20319,#20317)
 exprContainers(#20319,#20265)
 literals("ReadonlyPartial2","ReadonlyPartial2",#20319)
 typedecl(#20319,#20271)
@@ -928,12 +928,12 @@ local_type_names(#20321,"T",#20320)
 #20322=*
 typeexprs(#20322,22,#20317,2,"T")
 hasLocation(#20322,#20143)
-enclosingStmt(#20322,#20317)
+enclosing_stmt(#20322,#20317)
 exprContainers(#20322,#20265)
 #20323=*
 typeexprs(#20323,1,#20322,0,"T")
 hasLocation(#20323,#20143)
-enclosingStmt(#20323,#20317)
+enclosing_stmt(#20323,#20317)
 exprContainers(#20323,#20265)
 literals("T","T",#20323)
 typedecl(#20323,#20321)
@@ -942,7 +942,7 @@ typeexprs(#20324,27,#20317,1,"{ reado ...  T[P] }")
 #20325=@"loc,{#10000},5,30,5,63"
 locations_default(#20325,#10000,5,30,5,63)
 hasLocation(#20324,#20325)
-enclosingStmt(#20324,#20317)
+enclosing_stmt(#20324,#20317)
 exprContainers(#20324,#20265)
 #20326=*
 scopes(#20326,13)
@@ -955,12 +955,12 @@ typeexprs(#20328,22,#20324,0,"P in keyof T")
 #20329=@"loc,{#10000},5,42,5,53"
 locations_default(#20329,#10000,5,42,5,53)
 hasLocation(#20328,#20329)
-enclosingStmt(#20328,#20317)
+enclosing_stmt(#20328,#20317)
 exprContainers(#20328,#20265)
 #20330=*
 typeexprs(#20330,1,#20328,0,"P")
 hasLocation(#20330,#20155)
-enclosingStmt(#20330,#20317)
+enclosing_stmt(#20330,#20317)
 exprContainers(#20330,#20265)
 literals("P","P",#20330)
 typedecl(#20330,#20327)
@@ -969,12 +969,12 @@ typeexprs(#20331,12,#20328,1,"keyof T")
 #20332=@"loc,{#10000},5,47,5,53"
 locations_default(#20332,#10000,5,47,5,53)
 hasLocation(#20331,#20332)
-enclosingStmt(#20331,#20317)
+enclosing_stmt(#20331,#20317)
 exprContainers(#20331,#20265)
 #20333=*
 typeexprs(#20333,0,#20331,0,"T")
 hasLocation(#20333,#20161)
-enclosingStmt(#20333,#20317)
+enclosing_stmt(#20333,#20317)
 exprContainers(#20333,#20265)
 literals("T","T",#20333)
 typebind(#20333,#20321)
@@ -983,19 +983,19 @@ typeexprs(#20334,8,#20324,1,"T[P]")
 #20335=@"loc,{#10000},5,58,5,61"
 locations_default(#20335,#10000,5,58,5,61)
 hasLocation(#20334,#20335)
-enclosingStmt(#20334,#20317)
+enclosing_stmt(#20334,#20317)
 exprContainers(#20334,#20265)
 #20336=*
 typeexprs(#20336,0,#20334,0,"T")
 hasLocation(#20336,#20169)
-enclosingStmt(#20336,#20317)
+enclosing_stmt(#20336,#20317)
 exprContainers(#20336,#20265)
 literals("T","T",#20336)
 typebind(#20336,#20321)
 #20337=*
 typeexprs(#20337,0,#20334,1,"P")
 hasLocation(#20337,#20173)
-enclosingStmt(#20337,#20317)
+enclosing_stmt(#20337,#20317)
 exprContainers(#20337,#20265)
 literals("P","P",#20337)
 typebind(#20337,#20327)
@@ -1008,7 +1008,7 @@ stmt_containers(#20338,#20265)
 #20340=*
 typeexprs(#20340,1,#20338,0,"Required")
 hasLocation(#20340,#20183)
-enclosingStmt(#20340,#20338)
+enclosing_stmt(#20340,#20338)
 exprContainers(#20340,#20265)
 literals("Required","Required",#20340)
 typedecl(#20340,#20272)
@@ -1021,12 +1021,12 @@ local_type_names(#20342,"T",#20341)
 #20343=*
 typeexprs(#20343,22,#20338,2,"T")
 hasLocation(#20343,#20187)
-enclosingStmt(#20343,#20338)
+enclosing_stmt(#20343,#20338)
 exprContainers(#20343,#20265)
 #20344=*
 typeexprs(#20344,1,#20343,0,"T")
 hasLocation(#20344,#20187)
-enclosingStmt(#20344,#20338)
+enclosing_stmt(#20344,#20338)
 exprContainers(#20344,#20265)
 literals("T","T",#20344)
 typedecl(#20344,#20342)
@@ -1035,7 +1035,7 @@ typeexprs(#20345,27,#20338,1,"{ [P in ...  T[P] }")
 #20346=@"loc,{#10000},7,22,7,47"
 locations_default(#20346,#10000,7,22,7,47)
 hasLocation(#20345,#20346)
-enclosingStmt(#20345,#20338)
+enclosing_stmt(#20345,#20338)
 exprContainers(#20345,#20265)
 #20347=*
 scopes(#20347,13)
@@ -1048,12 +1048,12 @@ typeexprs(#20349,22,#20345,0,"P in keyof T")
 #20350=@"loc,{#10000},7,25,7,36"
 locations_default(#20350,#10000,7,25,7,36)
 hasLocation(#20349,#20350)
-enclosingStmt(#20349,#20338)
+enclosing_stmt(#20349,#20338)
 exprContainers(#20349,#20265)
 #20351=*
 typeexprs(#20351,1,#20349,0,"P")
 hasLocation(#20351,#20197)
-enclosingStmt(#20351,#20338)
+enclosing_stmt(#20351,#20338)
 exprContainers(#20351,#20265)
 literals("P","P",#20351)
 typedecl(#20351,#20348)
@@ -1062,12 +1062,12 @@ typeexprs(#20352,12,#20349,1,"keyof T")
 #20353=@"loc,{#10000},7,30,7,36"
 locations_default(#20353,#10000,7,30,7,36)
 hasLocation(#20352,#20353)
-enclosingStmt(#20352,#20338)
+enclosing_stmt(#20352,#20338)
 exprContainers(#20352,#20265)
 #20354=*
 typeexprs(#20354,0,#20352,0,"T")
 hasLocation(#20354,#20203)
-enclosingStmt(#20354,#20338)
+enclosing_stmt(#20354,#20338)
 exprContainers(#20354,#20265)
 literals("T","T",#20354)
 typebind(#20354,#20342)
@@ -1076,19 +1076,19 @@ typeexprs(#20355,8,#20345,1,"T[P]")
 #20356=@"loc,{#10000},7,42,7,45"
 locations_default(#20356,#10000,7,42,7,45)
 hasLocation(#20355,#20356)
-enclosingStmt(#20355,#20338)
+enclosing_stmt(#20355,#20338)
 exprContainers(#20355,#20265)
 #20357=*
 typeexprs(#20357,0,#20355,0,"T")
 hasLocation(#20357,#20213)
-enclosingStmt(#20357,#20338)
+enclosing_stmt(#20357,#20338)
 exprContainers(#20357,#20265)
 literals("T","T",#20357)
 typebind(#20357,#20342)
 #20358=*
 typeexprs(#20358,0,#20355,1,"P")
 hasLocation(#20358,#20217)
-enclosingStmt(#20358,#20338)
+enclosing_stmt(#20358,#20338)
 exprContainers(#20358,#20265)
 literals("P","P",#20358)
 typebind(#20358,#20348)
@@ -1101,7 +1101,7 @@ stmt_containers(#20359,#20265)
 #20361=*
 typeexprs(#20361,1,#20359,0,"Foo")
 hasLocation(#20361,#20227)
-enclosingStmt(#20361,#20359)
+enclosing_stmt(#20361,#20359)
 exprContainers(#20361,#20265)
 literals("Foo","Foo",#20361)
 typedecl(#20361,#20273)
@@ -1110,7 +1110,7 @@ typeexprs(#20362,21,#20359,1,"{ a?: string }")
 #20363=@"loc,{#10000},9,14,9,27"
 locations_default(#20363,#10000,9,14,9,27)
 hasLocation(#20362,#20363)
-enclosingStmt(#20362,#20359)
+enclosing_stmt(#20362,#20359)
 exprContainers(#20362,#20265)
 #20364=*
 properties(#20364,#20362,0,8,"a?: string")
@@ -1120,7 +1120,7 @@ hasLocation(#20364,#20365)
 #20366=*
 exprs(#20366,0,#20364,0,"a")
 hasLocation(#20366,#20233)
-enclosingStmt(#20366,#20359)
+enclosing_stmt(#20366,#20359)
 exprContainers(#20366,#20265)
 literals("a","a",#20366)
 isAbstractMember(#20364)
@@ -1128,7 +1128,7 @@ isOptionalMember(#20364)
 #20367=*
 typeexprs(#20367,2,#20364,2,"string")
 hasLocation(#20367,#20239)
-enclosingStmt(#20367,#20359)
+enclosing_stmt(#20367,#20359)
 exprContainers(#20367,#20265)
 literals("string","string",#20367)
 #20368=*
@@ -1140,7 +1140,7 @@ stmt_containers(#20368,#20265)
 #20370=*
 typeexprs(#20370,1,#20368,0,"Bar")
 hasLocation(#20370,#20247)
-enclosingStmt(#20370,#20368)
+enclosing_stmt(#20370,#20368)
 exprContainers(#20370,#20265)
 literals("Bar","Bar",#20370)
 typedecl(#20370,#20274)
@@ -1149,19 +1149,19 @@ typeexprs(#20371,14,#20368,1,"Required<Foo>")
 #20372=@"loc,{#10000},10,14,10,26"
 locations_default(#20372,#10000,10,14,10,26)
 hasLocation(#20371,#20372)
-enclosingStmt(#20371,#20368)
+enclosing_stmt(#20371,#20368)
 exprContainers(#20371,#20265)
 #20373=*
 typeexprs(#20373,0,#20371,-1,"Required")
 hasLocation(#20373,#20251)
-enclosingStmt(#20373,#20368)
+enclosing_stmt(#20373,#20368)
 exprContainers(#20373,#20265)
 literals("Required","Required",#20373)
 typebind(#20373,#20272)
 #20374=*
 typeexprs(#20374,0,#20371,0,"Foo")
 hasLocation(#20374,#20255)
-enclosingStmt(#20374,#20368)
+enclosing_stmt(#20374,#20368)
 exprContainers(#20374,#20265)
 literals("Foo","Foo",#20374)
 typebind(#20374,#20273)
diff --git a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
index 2f55d860971..726d2491c91 100644
--- a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
@@ -204,7 +204,7 @@ stmt_containers(#20071,#20001)
 #20073=*
 exprs(#20073,78,#20071,-1,"M")
 hasLocation(#20073,#20019)
-enclosingStmt(#20073,#20071)
+enclosing_stmt(#20073,#20071)
 exprContainers(#20073,#20001)
 literals("M","M",#20073)
 decl(#20073,#20066)
@@ -232,7 +232,7 @@ stmt_containers(#20079,#20071)
 #20081=*
 exprs(#20081,78,#20079,-1,"N")
 hasLocation(#20081,#20027)
-enclosingStmt(#20081,#20079)
+enclosing_stmt(#20081,#20079)
 exprContainers(#20081,#20071)
 literals("N","N",#20081)
 decl(#20081,#20075)
@@ -260,19 +260,19 @@ exprs(#20088,64,#20086,0,"x = 42")
 #20089=@"loc,{#10000},3,16,3,21"
 locations_default(#20089,#10000,3,16,3,21)
 hasLocation(#20088,#20089)
-enclosingStmt(#20088,#20086)
+enclosing_stmt(#20088,#20086)
 exprContainers(#20088,#20079)
 #20090=*
 exprs(#20090,78,#20088,0,"x")
 hasLocation(#20090,#20035)
-enclosingStmt(#20090,#20086)
+enclosing_stmt(#20090,#20086)
 exprContainers(#20090,#20079)
 literals("x","x",#20090)
 decl(#20090,#20083)
 #20091=*
 exprs(#20091,3,#20088,1,"42")
 hasLocation(#20091,#20039)
-enclosingStmt(#20091,#20086)
+enclosing_stmt(#20091,#20086)
 exprContainers(#20091,#20079)
 literals("42","42",#20091)
 is_instantiated(#20079)
@@ -284,7 +284,7 @@ stmt_containers(#20092,#20001)
 #20093=*
 exprs(#20093,78,#20092,0,"x")
 hasLocation(#20093,#20048)
-enclosingStmt(#20093,#20092)
+enclosing_stmt(#20093,#20092)
 exprContainers(#20093,#20001)
 literals("x","x",#20093)
 decl(#20093,#20067)
@@ -295,32 +295,32 @@ exprs(#20094,14,#20092,1,"M.N.x")
 #20095=@"loc,{#10000},7,12,7,16"
 locations_default(#20095,#10000,7,12,7,16)
 hasLocation(#20094,#20095)
-enclosingStmt(#20094,#20092)
+enclosing_stmt(#20094,#20092)
 exprContainers(#20094,#20001)
 #20096=*
 exprs(#20096,14,#20094,0,"M.N")
 #20097=@"loc,{#10000},7,12,7,14"
 locations_default(#20097,#10000,7,12,7,14)
 hasLocation(#20096,#20097)
-enclosingStmt(#20096,#20092)
+enclosing_stmt(#20096,#20092)
 exprContainers(#20096,#20001)
 #20098=*
 exprs(#20098,79,#20096,0,"M")
 hasLocation(#20098,#20052)
-enclosingStmt(#20098,#20092)
+enclosing_stmt(#20098,#20092)
 exprContainers(#20098,#20001)
 literals("M","M",#20098)
 bind(#20098,#20066)
 #20099=*
 exprs(#20099,0,#20096,1,"N")
 hasLocation(#20099,#20056)
-enclosingStmt(#20099,#20092)
+enclosing_stmt(#20099,#20092)
 exprContainers(#20099,#20001)
 literals("N","N",#20099)
 #20100=*
 exprs(#20100,0,#20094,1,"x")
 hasLocation(#20100,#20060)
-enclosingStmt(#20100,#20092)
+enclosing_stmt(#20100,#20092)
 exprContainers(#20100,#20001)
 literals("x","x",#20100)
 #20101=*
diff --git a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
index 50f4ae9a2de..cc92f4c55ce 100644
--- a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
@@ -233,7 +233,7 @@ stmt_containers(#20084,#20001)
 #20085=*
 exprs(#20085,78,#20084,-1,"A")
 hasLocation(#20085,#20021)
-enclosingStmt(#20085,#20084)
+enclosing_stmt(#20085,#20084)
 exprContainers(#20085,#20001)
 literals("A","A",#20085)
 namespacedecl(#20085,#20082)
@@ -256,7 +256,7 @@ stmt_containers(#20090,#20084)
 #20091=*
 exprs(#20091,78,#20090,-1,"B")
 hasLocation(#20091,#20025)
-enclosingStmt(#20091,#20090)
+enclosing_stmt(#20091,#20090)
 exprContainers(#20091,#20084)
 literals("B","B",#20091)
 namespacedecl(#20091,#20087)
@@ -271,7 +271,7 @@ stmt_containers(#20093,#20001)
 #20094=*
 exprs(#20094,78,#20093,-1,"A")
 hasLocation(#20094,#20033)
-enclosingStmt(#20094,#20093)
+enclosing_stmt(#20094,#20093)
 exprContainers(#20094,#20001)
 literals("A","A",#20094)
 namespacedecl(#20094,#20082)
@@ -294,7 +294,7 @@ stmt_containers(#20099,#20093)
 #20100=*
 exprs(#20100,78,#20099,-1,"B")
 hasLocation(#20100,#20037)
-enclosingStmt(#20100,#20099)
+enclosing_stmt(#20100,#20099)
 exprContainers(#20100,#20093)
 literals("B","B",#20100)
 namespacedecl(#20100,#20096)
@@ -317,7 +317,7 @@ stmt_containers(#20105,#20099)
 #20106=*
 exprs(#20106,78,#20105,-1,"C")
 hasLocation(#20106,#20041)
-enclosingStmt(#20106,#20105)
+enclosing_stmt(#20106,#20105)
 exprContainers(#20106,#20099)
 literals("C","C",#20106)
 namespacedecl(#20106,#20102)
@@ -334,7 +334,7 @@ stmt_containers(#20108,#20001)
 #20110=*
 exprs(#20110,78,#20108,-1,"X")
 hasLocation(#20110,#20049)
-enclosingStmt(#20110,#20108)
+enclosing_stmt(#20110,#20108)
 exprContainers(#20110,#20001)
 literals("X","X",#20110)
 namespacedecl(#20110,#20083)
@@ -361,7 +361,7 @@ stmt_containers(#20116,#20108)
 #20118=*
 exprs(#20118,78,#20116,-1,"Y")
 hasLocation(#20118,#20057)
-enclosingStmt(#20118,#20116)
+enclosing_stmt(#20118,#20116)
 exprContainers(#20118,#20108)
 literals("Y","Y",#20118)
 namespacedecl(#20118,#20112)
@@ -384,7 +384,7 @@ stmt_containers(#20123,#20116)
 #20124=*
 exprs(#20124,78,#20123,-1,"Z")
 hasLocation(#20124,#20061)
-enclosingStmt(#20124,#20123)
+enclosing_stmt(#20124,#20123)
 exprContainers(#20124,#20116)
 literals("Z","Z",#20124)
 namespacedecl(#20124,#20120)
@@ -401,7 +401,7 @@ stmt_containers(#20126,#20108)
 #20128=*
 exprs(#20128,78,#20126,-1,"W")
 hasLocation(#20128,#20069)
-enclosingStmt(#20128,#20126)
+enclosing_stmt(#20128,#20126)
 exprContainers(#20128,#20108)
 literals("W","W",#20128)
 namespacedecl(#20128,#20113)
@@ -424,7 +424,7 @@ stmt_containers(#20133,#20126)
 #20134=*
 exprs(#20134,78,#20133,-1,"Q")
 hasLocation(#20134,#20073)
-enclosingStmt(#20134,#20133)
+enclosing_stmt(#20134,#20133)
 exprContainers(#20134,#20126)
 literals("Q","Q",#20134)
 namespacedecl(#20134,#20130)
diff --git a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
index 09ef7364209..03e963b1168 100644
--- a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -728,7 +728,7 @@ isAbstractClass(#20260)
 #20262=*
 exprs(#20262,78,#20260,0,"C")
 hasLocation(#20262,#20091)
-enclosingStmt(#20262,#20260)
+enclosing_stmt(#20262,#20260)
 exprContainers(#20262,#20001)
 literals("C","C",#20262)
 decl(#20262,#20253)
@@ -745,13 +745,13 @@ hasLocation(#20264,#20265)
 #20266=*
 exprs(#20266,0,#20264,0,"h")
 hasLocation(#20266,#20097)
-enclosingStmt(#20266,#20260)
+enclosing_stmt(#20266,#20260)
 exprContainers(#20266,#20001)
 literals("h","h",#20266)
 #20267=*
 exprs(#20267,9,#20264,1,"abstract h();")
 hasLocation(#20267,#20265)
-enclosingStmt(#20267,#20260)
+enclosing_stmt(#20267,#20260)
 exprContainers(#20267,#20001)
 #20268=*
 scopes(#20268,1)
@@ -770,13 +770,13 @@ hasLocation(#20270,#20271)
 #20272=*
 exprs(#20272,0,#20270,0,"g")
 hasLocation(#20272,#20105)
-enclosingStmt(#20272,#20260)
+enclosing_stmt(#20272,#20260)
 exprContainers(#20272,#20001)
 literals("g","g",#20272)
 #20273=*
 exprs(#20273,9,#20270,1,"g(x: nu ... number;")
 hasLocation(#20273,#20271)
-enclosingStmt(#20273,#20260)
+enclosing_stmt(#20273,#20260)
 exprContainers(#20273,#20001)
 #20274=*
 scopes(#20274,1)
@@ -812,13 +812,13 @@ hasLocation(#20280,#20281)
 #20282=*
 exprs(#20282,0,#20280,0,"g")
 hasLocation(#20282,#20123)
-enclosingStmt(#20282,#20260)
+enclosing_stmt(#20282,#20260)
 exprContainers(#20282,#20001)
 literals("g","g",#20282)
 #20283=*
 exprs(#20283,9,#20280,1,"g(x: st ... string;")
 hasLocation(#20283,#20281)
-enclosingStmt(#20283,#20260)
+enclosing_stmt(#20283,#20260)
 exprContainers(#20283,#20001)
 #20284=*
 scopes(#20284,1)
@@ -854,13 +854,13 @@ hasLocation(#20290,#20291)
 #20292=*
 exprs(#20292,0,#20290,0,"g")
 hasLocation(#20292,#20141)
-enclosingStmt(#20292,#20260)
+enclosing_stmt(#20292,#20260)
 exprContainers(#20292,#20001)
 literals("g","g",#20292)
 #20293=*
 exprs(#20293,9,#20290,1,"g(x: any) {}")
 hasLocation(#20293,#20291)
-enclosingStmt(#20293,#20260)
+enclosing_stmt(#20293,#20260)
 exprContainers(#20293,#20001)
 #20294=*
 scopes(#20294,1)
@@ -904,7 +904,7 @@ isAbstractMember(#20301)
 #20305=*
 typeexprs(#20305,2,#20301,2,"number")
 hasLocation(#20305,#20163)
-enclosingStmt(#20305,#20260)
+enclosing_stmt(#20305,#20260)
 exprContainers(#20305,#20001)
 literals("number","number",#20305)
 #20306=*
@@ -915,12 +915,12 @@ hasLocation(#20306,#20307)
 #20308=*
 exprs(#20308,0,#20306,0,"constructor")
 hasLocation(#20308,#20307)
-enclosingStmt(#20308,#20260)
+enclosing_stmt(#20308,#20260)
 exprContainers(#20308,#20001)
 literals("constructor","constructor",#20308)
 exprs(#20303,9,#20306,1,"() {}")
 hasLocation(#20303,#20307)
-enclosingStmt(#20303,#20260)
+enclosing_stmt(#20303,#20260)
 exprContainers(#20303,#20001)
 #20309=*
 scopes(#20309,1)
@@ -945,7 +945,7 @@ isAbstractClass(#20312)
 #20314=*
 exprs(#20314,78,#20312,0,"D")
 hasLocation(#20314,#20174)
-enclosingStmt(#20314,#20312)
+enclosing_stmt(#20314,#20312)
 exprContainers(#20314,#20001)
 literals("D","D",#20314)
 #20315=@"var;{D};{#20000}"
@@ -963,13 +963,13 @@ hasLocation(#20317,#20318)
 #20319=*
 exprs(#20319,0,#20317,0,"h")
 hasLocation(#20319,#20180)
-enclosingStmt(#20319,#20312)
+enclosing_stmt(#20319,#20312)
 exprContainers(#20319,#20001)
 literals("h","h",#20319)
 #20320=*
 exprs(#20320,9,#20317,1,"abstract h();")
 hasLocation(#20320,#20318)
-enclosingStmt(#20320,#20312)
+enclosing_stmt(#20320,#20312)
 exprContainers(#20320,#20001)
 #20321=*
 scopes(#20321,1)
@@ -988,13 +988,13 @@ hasLocation(#20323,#20324)
 #20325=*
 exprs(#20325,0,#20323,0,"g")
 hasLocation(#20325,#20188)
-enclosingStmt(#20325,#20312)
+enclosing_stmt(#20325,#20312)
 exprContainers(#20325,#20001)
 literals("g","g",#20325)
 #20326=*
 exprs(#20326,9,#20323,1,"g(x: nu ... number;")
 hasLocation(#20326,#20324)
-enclosingStmt(#20326,#20312)
+enclosing_stmt(#20326,#20312)
 exprContainers(#20326,#20001)
 #20327=*
 scopes(#20327,1)
@@ -1030,13 +1030,13 @@ hasLocation(#20333,#20334)
 #20335=*
 exprs(#20335,0,#20333,0,"g")
 hasLocation(#20335,#20206)
-enclosingStmt(#20335,#20312)
+enclosing_stmt(#20335,#20312)
 exprContainers(#20335,#20001)
 literals("g","g",#20335)
 #20336=*
 exprs(#20336,9,#20333,1,"g(x: st ... string;")
 hasLocation(#20336,#20334)
-enclosingStmt(#20336,#20312)
+enclosing_stmt(#20336,#20312)
 exprContainers(#20336,#20001)
 #20337=*
 scopes(#20337,1)
@@ -1072,13 +1072,13 @@ hasLocation(#20343,#20344)
 #20345=*
 exprs(#20345,0,#20343,0,"g")
 hasLocation(#20345,#20224)
-enclosingStmt(#20345,#20312)
+enclosing_stmt(#20345,#20312)
 exprContainers(#20345,#20001)
 literals("g","g",#20345)
 #20346=*
 exprs(#20346,9,#20343,1,"g(x: any) {}")
 hasLocation(#20346,#20344)
-enclosingStmt(#20346,#20312)
+enclosing_stmt(#20346,#20312)
 exprContainers(#20346,#20001)
 #20347=*
 scopes(#20347,1)
@@ -1122,7 +1122,7 @@ isAbstractMember(#20354)
 #20358=*
 typeexprs(#20358,2,#20354,2,"number")
 hasLocation(#20358,#20246)
-enclosingStmt(#20358,#20312)
+enclosing_stmt(#20358,#20312)
 exprContainers(#20358,#20001)
 literals("number","number",#20358)
 #20359=*
@@ -1133,12 +1133,12 @@ hasLocation(#20359,#20360)
 #20361=*
 exprs(#20361,0,#20359,0,"constructor")
 hasLocation(#20361,#20360)
-enclosingStmt(#20361,#20312)
+enclosing_stmt(#20361,#20312)
 exprContainers(#20361,#20001)
 literals("constructor","constructor",#20361)
 exprs(#20356,9,#20359,1,"() {}")
 hasLocation(#20356,#20360)
-enclosingStmt(#20356,#20312)
+enclosing_stmt(#20356,#20312)
 exprContainers(#20356,#20001)
 #20362=*
 scopes(#20362,1)
diff --git a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
index 16aecabc3ec..32e7661c207 100644
--- a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
@@ -161,12 +161,12 @@ exprs(#20057,64,#20055,0,"x = {\n  ... v) {}\n}")
 #20058=@"loc,{#10000},1,5,4,1"
 locations_default(#20058,#10000,1,5,4,1)
 hasLocation(#20057,#20058)
-enclosingStmt(#20057,#20055)
+enclosing_stmt(#20057,#20055)
 exprContainers(#20057,#20001)
 #20059=*
 exprs(#20059,78,#20057,0,"x")
 hasLocation(#20059,#20013)
-enclosingStmt(#20059,#20055)
+enclosing_stmt(#20059,#20055)
 exprContainers(#20059,#20001)
 literals("x","x",#20059)
 decl(#20059,#20054)
@@ -175,7 +175,7 @@ exprs(#20060,8,#20057,1,"{\n  get ... v) {}\n}")
 #20061=@"loc,{#10000},1,9,4,1"
 locations_default(#20061,#10000,1,9,4,1)
 hasLocation(#20060,#20061)
-enclosingStmt(#20060,#20055)
+enclosing_stmt(#20060,#20055)
 exprContainers(#20060,#20001)
 #20062=*
 properties(#20062,#20060,0,1,"get foo() {return 1}")
@@ -185,13 +185,13 @@ hasLocation(#20062,#20063)
 #20064=*
 exprs(#20064,0,#20062,0,"foo")
 hasLocation(#20064,#20021)
-enclosingStmt(#20064,#20055)
+enclosing_stmt(#20064,#20055)
 exprContainers(#20064,#20001)
 literals("foo","foo",#20064)
 #20065=*
 exprs(#20065,9,#20062,1,"get foo() {return 1}")
 hasLocation(#20065,#20063)
-enclosingStmt(#20065,#20055)
+enclosing_stmt(#20065,#20055)
 exprContainers(#20065,#20001)
 #20066=*
 scopes(#20066,1)
@@ -215,7 +215,7 @@ stmt_containers(#20070,#20065)
 #20072=*
 exprs(#20072,3,#20070,0,"1")
 hasLocation(#20072,#20031)
-enclosingStmt(#20072,#20070)
+enclosing_stmt(#20072,#20070)
 exprContainers(#20072,#20065)
 literals("1","1",#20072)
 isMethod(#20062)
@@ -227,13 +227,13 @@ hasLocation(#20073,#20074)
 #20075=*
 exprs(#20075,0,#20073,0,"foo")
 hasLocation(#20075,#20039)
-enclosingStmt(#20075,#20055)
+enclosing_stmt(#20075,#20055)
 exprContainers(#20075,#20001)
 literals("foo","foo",#20075)
 #20076=*
 exprs(#20076,9,#20073,1,"set foo(v) {}")
 hasLocation(#20076,#20074)
-enclosingStmt(#20076,#20055)
+enclosing_stmt(#20076,#20055)
 exprContainers(#20076,#20001)
 #20077=*
 scopes(#20077,1)
diff --git a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
index bf5c861b72a..3e9292a5f82 100644
--- a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
@@ -61,12 +61,12 @@ exprs(#20019,7,#20018,0,"[, ,1]")
 #20020=@"loc,{#10000},1,1,1,6"
 locations_default(#20020,#10000,1,1,1,6)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,3,#20019,2,"1")
 hasLocation(#20021,#20011)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 literals("1","1",#20021)
 arraySize(#20019,3)
diff --git a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
index 99e7d166a78..77b64ae4091 100644
--- a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
@@ -156,19 +156,19 @@ exprs(#20056,14,#20055,0,"base?.x.y")
 #20057=@"loc,{#10000},1,1,1,9"
 locations_default(#20057,#10000,1,1,1,9)
 hasLocation(#20056,#20057)
-enclosingStmt(#20056,#20055)
+enclosing_stmt(#20056,#20055)
 exprContainers(#20056,#20001)
 #20058=*
 exprs(#20058,14,#20056,0,"base?.x")
 #20059=@"loc,{#10000},1,1,1,7"
 locations_default(#20059,#10000,1,1,1,7)
 hasLocation(#20058,#20059)
-enclosingStmt(#20058,#20055)
+enclosing_stmt(#20058,#20055)
 exprContainers(#20058,#20001)
 #20060=*
 exprs(#20060,79,#20058,0,"base")
 hasLocation(#20060,#20009)
-enclosingStmt(#20060,#20055)
+enclosing_stmt(#20060,#20055)
 exprContainers(#20060,#20001)
 literals("base","base",#20060)
 #20061=@"var;{base};{#20000}"
@@ -177,14 +177,14 @@ bind(#20060,#20061)
 #20062=*
 exprs(#20062,0,#20058,1,"x")
 hasLocation(#20062,#20013)
-enclosingStmt(#20062,#20055)
+enclosing_stmt(#20062,#20055)
 exprContainers(#20062,#20001)
 literals("x","x",#20062)
 isOptionalChaining(#20058)
 #20063=*
 exprs(#20063,0,#20056,1,"y")
 hasLocation(#20063,#20017)
-enclosingStmt(#20063,#20055)
+enclosing_stmt(#20063,#20055)
 exprContainers(#20063,#20001)
 literals("y","y",#20063)
 #20064=*
@@ -196,26 +196,26 @@ exprs(#20065,14,#20064,0,"base?.(x).y")
 #20066=@"loc,{#10000},2,1,2,11"
 locations_default(#20066,#10000,2,1,2,11)
 hasLocation(#20065,#20066)
-enclosingStmt(#20065,#20064)
+enclosing_stmt(#20065,#20064)
 exprContainers(#20065,#20001)
 #20067=*
 exprs(#20067,13,#20065,0,"base?.(x)")
 #20068=@"loc,{#10000},2,1,2,9"
 locations_default(#20068,#10000,2,1,2,9)
 hasLocation(#20067,#20068)
-enclosingStmt(#20067,#20064)
+enclosing_stmt(#20067,#20064)
 exprContainers(#20067,#20001)
 #20069=*
 exprs(#20069,79,#20067,-1,"base")
 hasLocation(#20069,#20021)
-enclosingStmt(#20069,#20064)
+enclosing_stmt(#20069,#20064)
 exprContainers(#20069,#20001)
 literals("base","base",#20069)
 bind(#20069,#20061)
 #20070=*
 exprs(#20070,79,#20067,0,"x")
 hasLocation(#20070,#20027)
-enclosingStmt(#20070,#20064)
+enclosing_stmt(#20070,#20064)
 exprContainers(#20070,#20001)
 literals("x","x",#20070)
 #20071=@"var;{x};{#20000}"
@@ -225,7 +225,7 @@ isOptionalChaining(#20067)
 #20072=*
 exprs(#20072,0,#20065,1,"y")
 hasLocation(#20072,#20033)
-enclosingStmt(#20072,#20064)
+enclosing_stmt(#20072,#20064)
 exprContainers(#20072,#20001)
 literals("y","y",#20072)
 #20073=*
@@ -237,26 +237,26 @@ exprs(#20074,14,#20073,0,"base?.[z].y")
 #20075=@"loc,{#10000},3,1,3,11"
 locations_default(#20075,#10000,3,1,3,11)
 hasLocation(#20074,#20075)
-enclosingStmt(#20074,#20073)
+enclosing_stmt(#20074,#20073)
 exprContainers(#20074,#20001)
 #20076=*
 exprs(#20076,15,#20074,0,"base?.[z]")
 #20077=@"loc,{#10000},3,1,3,9"
 locations_default(#20077,#10000,3,1,3,9)
 hasLocation(#20076,#20077)
-enclosingStmt(#20076,#20073)
+enclosing_stmt(#20076,#20073)
 exprContainers(#20076,#20001)
 #20078=*
 exprs(#20078,79,#20076,0,"base")
 hasLocation(#20078,#20037)
-enclosingStmt(#20078,#20073)
+enclosing_stmt(#20078,#20073)
 exprContainers(#20078,#20001)
 literals("base","base",#20078)
 bind(#20078,#20061)
 #20079=*
 exprs(#20079,79,#20076,1,"z")
 hasLocation(#20079,#20043)
-enclosingStmt(#20079,#20073)
+enclosing_stmt(#20079,#20073)
 exprContainers(#20079,#20001)
 literals("z","z",#20079)
 #20080=@"var;{z};{#20000}"
@@ -266,7 +266,7 @@ isOptionalChaining(#20076)
 #20081=*
 exprs(#20081,0,#20074,1,"y")
 hasLocation(#20081,#20049)
-enclosingStmt(#20081,#20073)
+enclosing_stmt(#20081,#20073)
 exprContainers(#20081,#20001)
 literals("y","y",#20081)
 #20082=*
diff --git a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
index 719dcda296e..67a35e29619 100644
--- a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
@@ -145,7 +145,7 @@ stmt_containers(#20048,#20001)
 #20050=*
 exprs(#20050,78,#20048,0,"C")
 hasLocation(#20050,#20017)
-enclosingStmt(#20050,#20048)
+enclosing_stmt(#20050,#20048)
 exprContainers(#20050,#20001)
 literals("C","C",#20050)
 decl(#20050,#20046)
@@ -175,12 +175,12 @@ hasLocation(#20057,#20058)
 #20059=*
 exprs(#20059,0,#20057,0,"constru ... = 5;\n }")
 hasLocation(#20059,#20058)
-enclosingStmt(#20059,#20048)
+enclosing_stmt(#20059,#20048)
 exprContainers(#20059,#20001)
 literals("constructor","constructor",#20059)
 exprs(#20054,9,#20057,1,"constru ... = 5;\n }")
 hasLocation(#20054,#20058)
-enclosingStmt(#20054,#20048)
+enclosing_stmt(#20054,#20048)
 exprContainers(#20054,#20001)
 #20060=*
 scopes(#20060,1)
@@ -206,32 +206,32 @@ exprs(#20066,47,#20064,0,"this.#foo = 5")
 #20067=@"loc,{#10000},4,4,4,16"
 locations_default(#20067,#10000,4,4,4,16)
 hasLocation(#20066,#20067)
-enclosingStmt(#20066,#20064)
+enclosing_stmt(#20066,#20064)
 exprContainers(#20066,#20054)
 #20068=*
 exprs(#20068,14,#20066,0,"this.#foo")
 #20069=@"loc,{#10000},4,4,4,12"
 locations_default(#20069,#10000,4,4,4,12)
 hasLocation(#20068,#20069)
-enclosingStmt(#20068,#20064)
+enclosing_stmt(#20068,#20064)
 exprContainers(#20068,#20054)
 #20070=*
 exprs(#20070,6,#20068,0,"this")
 hasLocation(#20070,#20031)
-enclosingStmt(#20070,#20064)
+enclosing_stmt(#20070,#20064)
 exprContainers(#20070,#20054)
 #20071=*
 exprs(#20071,0,#20068,1,"#foo")
 #20072=@"loc,{#10000},4,9,4,12"
 locations_default(#20072,#10000,4,9,4,12)
 hasLocation(#20071,#20072)
-enclosingStmt(#20071,#20064)
+enclosing_stmt(#20071,#20064)
 exprContainers(#20071,#20054)
 literals("#foo","#foo",#20071)
 #20073=*
 exprs(#20073,3,#20066,1,"5")
 hasLocation(#20073,#20037)
-enclosingStmt(#20073,#20064)
+enclosing_stmt(#20073,#20064)
 exprContainers(#20073,#20054)
 literals("5","5",#20073)
 isMethod(#20057)
diff --git a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
index a1d4da125ee..690f4ef7e96 100644
--- a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
@@ -32,7 +32,7 @@ stmt_containers(#20007,#20001)
 #20008=*
 exprs(#20008,5,#20007,0,"/a/")
 hasLocation(#20008,#20003)
-enclosingStmt(#20008,#20007)
+enclosing_stmt(#20008,#20007)
 exprContainers(#20008,#20001)
 literals("/a/","/a/",#20008)
 #20009=*
diff --git a/javascript/extractor/tests/ts/output/trap/templates.ts.trap b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
index f027173b2b6..14ebba72b31 100644
--- a/javascript/extractor/tests/ts/output/trap/templates.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
@@ -67,14 +67,14 @@ stmt_containers(#20021,#20001)
 #20022=*
 exprs(#20022,71,#20021,0,"`url(""$ ... age}"")`")
 hasLocation(#20022,#20003)
-enclosingStmt(#20022,#20021)
+enclosing_stmt(#20022,#20021)
 exprContainers(#20022,#20001)
 #20023=*
 exprs(#20023,72,#20022,0,"url(""")
 #20024=@"loc,{#10000},1,2,1,6"
 locations_default(#20024,#10000,1,2,1,6)
 hasLocation(#20023,#20024)
-enclosingStmt(#20023,#20021)
+enclosing_stmt(#20023,#20021)
 exprContainers(#20023,#20001)
 literals("url(""","url(""",#20023)
 #20025=*
@@ -82,19 +82,19 @@ exprs(#20025,14,#20022,1,"ctx.expected.image")
 #20026=@"loc,{#10000},1,9,1,26"
 locations_default(#20026,#10000,1,9,1,26)
 hasLocation(#20025,#20026)
-enclosingStmt(#20025,#20021)
+enclosing_stmt(#20025,#20021)
 exprContainers(#20025,#20001)
 #20027=*
 exprs(#20027,14,#20025,0,"ctx.expected")
 #20028=@"loc,{#10000},1,9,1,20"
 locations_default(#20028,#10000,1,9,1,20)
 hasLocation(#20027,#20028)
-enclosingStmt(#20027,#20021)
+enclosing_stmt(#20027,#20021)
 exprContainers(#20027,#20001)
 #20029=*
 exprs(#20029,79,#20027,0,"ctx")
 hasLocation(#20029,#20007)
-enclosingStmt(#20029,#20021)
+enclosing_stmt(#20029,#20021)
 exprContainers(#20029,#20001)
 literals("ctx","ctx",#20029)
 #20030=@"var;{ctx};{#20000}"
@@ -103,13 +103,13 @@ bind(#20029,#20030)
 #20031=*
 exprs(#20031,0,#20027,1,"expected")
 hasLocation(#20031,#20011)
-enclosingStmt(#20031,#20021)
+enclosing_stmt(#20031,#20021)
 exprContainers(#20031,#20001)
 literals("expected","expected",#20031)
 #20032=*
 exprs(#20032,0,#20025,1,"image")
 hasLocation(#20032,#20015)
-enclosingStmt(#20032,#20021)
+enclosing_stmt(#20032,#20021)
 exprContainers(#20032,#20001)
 literals("image","image",#20032)
 #20033=*
@@ -117,7 +117,7 @@ exprs(#20033,72,#20022,2,""")")
 #20034=@"loc,{#10000},1,28,1,29"
 locations_default(#20034,#10000,1,28,1,29)
 hasLocation(#20033,#20034)
-enclosingStmt(#20033,#20021)
+enclosing_stmt(#20033,#20021)
 exprContainers(#20033,#20001)
 literals(""")",""")",#20033)
 #20035=*
diff --git a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
index 2413db63e29..66162818335 100644
--- a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
@@ -481,12 +481,12 @@ exprs(#20175,64,#20174,0,"f = fun ... ber) {}")
 #20176=@"loc,{#10000},3,5,3,44"
 locations_default(#20176,#10000,3,5,3,44)
 hasLocation(#20175,#20176)
-enclosingStmt(#20175,#20174)
+enclosing_stmt(#20175,#20174)
 exprContainers(#20175,#20001)
 #20177=*
 exprs(#20177,78,#20175,0,"f")
 hasLocation(#20177,#20059)
-enclosingStmt(#20177,#20174)
+enclosing_stmt(#20177,#20174)
 exprContainers(#20177,#20001)
 literals("f","f",#20177)
 decl(#20177,#20160)
@@ -495,7 +495,7 @@ exprs(#20178,9,#20175,1,"functio ... ber) {}")
 #20179=@"loc,{#10000},3,9,3,44"
 locations_default(#20179,#10000,3,9,3,44)
 hasLocation(#20178,#20179)
-enclosingStmt(#20178,#20174)
+enclosing_stmt(#20178,#20174)
 exprContainers(#20178,#20001)
 #20180=*
 scopes(#20180,1)
@@ -575,7 +575,7 @@ stmt_containers(#20197,#20001)
 #20199=*
 exprs(#20199,78,#20197,0,"C")
 hasLocation(#20199,#20115)
-enclosingStmt(#20199,#20197)
+enclosing_stmt(#20199,#20197)
 exprContainers(#20199,#20001)
 literals("C","C",#20199)
 decl(#20199,#20161)
@@ -592,13 +592,13 @@ hasLocation(#20201,#20202)
 #20203=*
 exprs(#20203,0,#20201,0,"member")
 hasLocation(#20203,#20119)
-enclosingStmt(#20203,#20197)
+enclosing_stmt(#20203,#20197)
 exprContainers(#20203,#20001)
 literals("member","member",#20203)
 #20204=*
 exprs(#20204,9,#20201,1,"member(this: C) {}")
 hasLocation(#20204,#20202)
-enclosingStmt(#20204,#20197)
+enclosing_stmt(#20204,#20197)
 exprContainers(#20204,#20001)
 #20205=*
 scopes(#20205,1)
@@ -628,13 +628,13 @@ hasLocation(#20210,#20211)
 #20212=*
 exprs(#20212,0,#20210,0,"constructor")
 hasLocation(#20212,#20211)
-enclosingStmt(#20212,#20197)
+enclosing_stmt(#20212,#20197)
 exprContainers(#20212,#20001)
 literals("constructor","constructor",#20212)
 #20213=*
 exprs(#20213,9,#20210,1,"() {}")
 hasLocation(#20213,#20211)
-enclosingStmt(#20213,#20197)
+enclosing_stmt(#20213,#20197)
 exprContainers(#20213,#20001)
 #20214=*
 scopes(#20214,1)
@@ -657,7 +657,7 @@ stmt_containers(#20217,#20001)
 #20219=*
 typeexprs(#20219,1,#20217,0,"I")
 hasLocation(#20219,#20138)
-enclosingStmt(#20219,#20217)
+enclosing_stmt(#20219,#20217)
 exprContainers(#20219,#20001)
 literals("I","I",#20219)
 typedecl(#20219,#20163)
@@ -669,13 +669,13 @@ hasLocation(#20220,#20221)
 #20222=*
 exprs(#20222,0,#20220,0,"method")
 hasLocation(#20222,#20142)
-enclosingStmt(#20222,#20217)
+enclosing_stmt(#20222,#20217)
 exprContainers(#20222,#20001)
 literals("method","method",#20222)
 #20223=*
 exprs(#20223,9,#20220,1,"method(this: I);")
 hasLocation(#20223,#20221)
-enclosingStmt(#20223,#20217)
+enclosing_stmt(#20223,#20217)
 exprContainers(#20223,#20001)
 #20224=*
 scopes(#20224,1)
diff --git a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
index 839ef912d09..34bc8680b04 100644
--- a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
@@ -204,19 +204,19 @@ exprs(#20069,64,#20067,0,"x = 5")
 #20070=@"loc,{#10000},2,7,2,11"
 locations_default(#20070,#10000,2,7,2,11)
 hasLocation(#20069,#20070)
-enclosingStmt(#20069,#20067)
+enclosing_stmt(#20069,#20067)
 exprContainers(#20069,#20059)
 #20071=*
 exprs(#20071,78,#20069,0,"x")
 hasLocation(#20071,#20029)
-enclosingStmt(#20071,#20067)
+enclosing_stmt(#20071,#20067)
 exprContainers(#20071,#20059)
 literals("x","x",#20071)
 decl(#20071,#20063)
 #20072=*
 exprs(#20072,3,#20069,1,"5")
 hasLocation(#20072,#20033)
-enclosingStmt(#20072,#20067)
+enclosing_stmt(#20072,#20067)
 exprContainers(#20072,#20059)
 literals("5","5",#20072)
 #20073=*
@@ -246,7 +246,7 @@ stmt_containers(#20079,#20059)
 #20081=*
 exprs(#20081,79,#20079,0,"x")
 hasLocation(#20081,#20049)
-enclosingStmt(#20081,#20079)
+enclosing_stmt(#20081,#20079)
 exprContainers(#20081,#20059)
 literals("x","x",#20081)
 bind(#20081,#20063)
diff --git a/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap b/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
index 2f0e4a6d576..e632a8a3bd3 100644
--- a/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
+++ b/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
@@ -214,12 +214,12 @@ stmt_containers(#20077,#20001)
 #20079=*
 exprs(#20079,89,#20077,0,"<div cl ... \n</div>")
 hasLocation(#20079,#20078)
-enclosingStmt(#20079,#20077)
+enclosing_stmt(#20079,#20077)
 exprContainers(#20079,#20001)
 #20080=*
 exprs(#20080,0,#20079,-1,"div")
 hasLocation(#20080,#20013)
-enclosingStmt(#20080,#20077)
+enclosing_stmt(#20080,#20077)
 exprContainers(#20080,#20001)
 literals("div","div",#20080)
 #20081=*
@@ -230,13 +230,13 @@ hasLocation(#20081,#20082)
 #20083=*
 exprs(#20083,0,#20081,0,"className")
 hasLocation(#20083,#20015)
-enclosingStmt(#20083,#20077)
+enclosing_stmt(#20083,#20077)
 exprContainers(#20083,#20001)
 literals("className","className",#20083)
 #20084=*
 exprs(#20084,79,#20081,1,"className")
 hasLocation(#20084,#20021)
-enclosingStmt(#20084,#20077)
+enclosing_stmt(#20084,#20077)
 exprContainers(#20084,#20001)
 literals("className","className",#20084)
 #20085=@"var;{className};{#20000}"
@@ -250,13 +250,13 @@ hasLocation(#20086,#20087)
 #20088=*
 exprs(#20088,0,#20086,0,"title")
 hasLocation(#20088,#20025)
-enclosingStmt(#20088,#20077)
+enclosing_stmt(#20088,#20077)
 exprContainers(#20088,#20001)
 literals("title","title",#20088)
 #20089=*
 exprs(#20089,79,#20086,1,"title")
 hasLocation(#20089,#20031)
-enclosingStmt(#20089,#20077)
+enclosing_stmt(#20089,#20077)
 exprContainers(#20089,#20001)
 literals("title","title",#20089)
 #20090=@"var;{title};{#20000}"
@@ -267,7 +267,7 @@ exprs(#20091,4,#20079,-2,"")
 #20092=@"loc,{#10000},2,3,2,2"
 locations_default(#20092,#10000,2,3,2,2)
 hasLocation(#20091,#20092)
-enclosingStmt(#20091,#20077)
+enclosing_stmt(#20091,#20077)
 exprContainers(#20091,#20001)
 literals("
   ","",#20091)
@@ -284,37 +284,37 @@ exprs(#20095,89,#20079,-3,"<this.props.icon/>")
 #20096=@"loc,{#10000},2,3,2,20"
 locations_default(#20096,#10000,2,3,2,20)
 hasLocation(#20095,#20096)
-enclosingStmt(#20095,#20077)
+enclosing_stmt(#20095,#20077)
 exprContainers(#20095,#20001)
 #20097=*
 exprs(#20097,14,#20095,-1,"this.props.icon")
 #20098=@"loc,{#10000},2,4,2,18"
 locations_default(#20098,#10000,2,4,2,18)
 hasLocation(#20097,#20098)
-enclosingStmt(#20097,#20077)
+enclosing_stmt(#20097,#20077)
 exprContainers(#20097,#20001)
 #20099=*
 exprs(#20099,14,#20097,0,"this.props")
 #20100=@"loc,{#10000},2,4,2,13"
 locations_default(#20100,#10000,2,4,2,13)
 hasLocation(#20099,#20100)
-enclosingStmt(#20099,#20077)
+enclosing_stmt(#20099,#20077)
 exprContainers(#20099,#20001)
 #20101=*
 exprs(#20101,6,#20099,0,"this")
 hasLocation(#20101,#20039)
-enclosingStmt(#20101,#20077)
+enclosing_stmt(#20101,#20077)
 exprContainers(#20101,#20001)
 #20102=*
 exprs(#20102,0,#20099,1,"props")
 hasLocation(#20102,#20043)
-enclosingStmt(#20102,#20077)
+enclosing_stmt(#20102,#20077)
 exprContainers(#20102,#20001)
 literals("props","props",#20102)
 #20103=*
 exprs(#20103,0,#20097,1,"icon")
 hasLocation(#20103,#20047)
-enclosingStmt(#20103,#20077)
+enclosing_stmt(#20103,#20077)
 exprContainers(#20103,#20001)
 literals("icon","icon",#20103)
 #20104=*
@@ -322,7 +322,7 @@ exprs(#20104,4,#20079,-4,"")
 #20105=@"loc,{#10000},3,3,3,2"
 locations_default(#20105,#10000,3,3,3,2)
 hasLocation(#20104,#20105)
-enclosingStmt(#20104,#20077)
+enclosing_stmt(#20104,#20077)
 exprContainers(#20104,#20001)
 literals("
   ","",#20104)
@@ -339,14 +339,14 @@ exprs(#20108,89,#20079,-5,"<name-with-dashes/>")
 #20109=@"loc,{#10000},3,3,3,21"
 locations_default(#20109,#10000,3,3,3,21)
 hasLocation(#20108,#20109)
-enclosingStmt(#20108,#20077)
+enclosing_stmt(#20108,#20077)
 exprContainers(#20108,#20001)
 #20110=*
 exprs(#20110,0,#20108,-1,"name-with-dashes")
 #20111=@"loc,{#10000},3,4,3,19"
 locations_default(#20111,#10000,3,4,3,19)
 hasLocation(#20110,#20111)
-enclosingStmt(#20110,#20077)
+enclosing_stmt(#20110,#20077)
 exprContainers(#20110,#20001)
 literals("name-with-dashes","name-with-dashes",#20110)
 #20112=*
@@ -354,7 +354,7 @@ exprs(#20112,4,#20079,-6,"")
 #20113=@"loc,{#10000},4,1,4,0"
 locations_default(#20113,#10000,4,1,4,0)
 hasLocation(#20112,#20113)
-enclosingStmt(#20112,#20077)
+enclosing_stmt(#20112,#20077)
 exprContainers(#20112,#20001)
 literals("
 ","",#20112)
diff --git a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
index 568316b3a3f..01598ee898e 100644
--- a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
@@ -2514,7 +2514,7 @@ stmt_containers(#20981,#20001)
 #20982=*
 typeexprs(#20982,1,#20981,0,"Point")
 hasLocation(#20982,#20135)
-enclosingStmt(#20982,#20981)
+enclosing_stmt(#20982,#20981)
 exprContainers(#20982,#20001)
 literals("Point","Point",#20982)
 typedecl(#20982,#20975)
@@ -2526,14 +2526,14 @@ hasLocation(#20983,#20984)
 #20985=*
 exprs(#20985,0,#20983,0,"x")
 hasLocation(#20985,#20139)
-enclosingStmt(#20985,#20981)
+enclosing_stmt(#20985,#20981)
 exprContainers(#20985,#20001)
 literals("x","x",#20985)
 isAbstractMember(#20983)
 #20986=*
 typeexprs(#20986,2,#20983,2,"number")
 hasLocation(#20986,#20143)
-enclosingStmt(#20986,#20981)
+enclosing_stmt(#20986,#20981)
 exprContainers(#20986,#20001)
 literals("number","number",#20986)
 #20987=*
@@ -2544,14 +2544,14 @@ hasLocation(#20987,#20988)
 #20989=*
 exprs(#20989,0,#20987,0,"y")
 hasLocation(#20989,#20147)
-enclosingStmt(#20989,#20981)
+enclosing_stmt(#20989,#20981)
 exprContainers(#20989,#20001)
 literals("y","y",#20989)
 isAbstractMember(#20987)
 #20990=*
 typeexprs(#20990,2,#20987,2,"number")
 hasLocation(#20990,#20151)
-enclosingStmt(#20990,#20981)
+enclosing_stmt(#20990,#20981)
 exprContainers(#20990,#20001)
 literals("number","number",#20990)
 #20991=*
@@ -2563,7 +2563,7 @@ stmt_containers(#20991,#20001)
 #20993=*
 exprs(#20993,78,#20991,-1,"N")
 hasLocation(#20993,#20157)
-enclosingStmt(#20993,#20991)
+enclosing_stmt(#20993,#20991)
 exprContainers(#20993,#20001)
 literals("N","N",#20993)
 namespacedecl(#20993,#20970)
@@ -2590,7 +2590,7 @@ stmt_containers(#20999,#20991)
 #21001=*
 typeexprs(#21001,1,#20999,0,"I")
 hasLocation(#21001,#20165)
-enclosingStmt(#21001,#20999)
+enclosing_stmt(#21001,#20999)
 exprContainers(#21001,#20991)
 literals("I","I",#21001)
 typedecl(#21001,#20995)
@@ -2615,19 +2615,19 @@ local_type_names(#21007,"T",#21006)
 #21008=*
 typeexprs(#21008,22,#21004,-2,"T")
 hasLocation(#21008,#20179)
-enclosingStmt(#21008,#21004)
+enclosing_stmt(#21008,#21004)
 exprContainers(#21008,#20991)
 #21009=*
 typeexprs(#21009,1,#21008,0,"T")
 hasLocation(#21009,#20179)
-enclosingStmt(#21009,#21004)
+enclosing_stmt(#21009,#21004)
 exprContainers(#21009,#20991)
 literals("T","T",#21009)
 typedecl(#21009,#21007)
 #21010=*
 typeexprs(#21010,1,#21004,0,"J")
 hasLocation(#21010,#20175)
-enclosingStmt(#21010,#21004)
+enclosing_stmt(#21010,#21004)
 exprContainers(#21010,#20991)
 literals("J","J",#21010)
 typedecl(#21010,#20996)
@@ -2640,19 +2640,19 @@ exprs(#21012,64,#21011,0,"anyVar: ...     any")
 #21013=@"loc,{#10000},8,5,8,27"
 locations_default(#21013,#10000,8,5,8,27)
 hasLocation(#21012,#21013)
-enclosingStmt(#21012,#21011)
+enclosing_stmt(#21012,#21011)
 exprContainers(#21012,#20001)
 #21014=*
 exprs(#21014,78,#21012,0,"anyVar")
 hasLocation(#21014,#20190)
-enclosingStmt(#21014,#21011)
+enclosing_stmt(#21014,#21011)
 exprContainers(#21014,#20001)
 literals("anyVar","anyVar",#21014)
 decl(#21014,#20929)
 #21015=*
 typeexprs(#21015,2,#21012,2,"any")
 hasLocation(#21015,#20194)
-enclosingStmt(#21015,#21011)
+enclosing_stmt(#21015,#21011)
 exprContainers(#21015,#20001)
 literals("any","any",#21015)
 #21016=*
@@ -2664,19 +2664,19 @@ exprs(#21017,64,#21016,0,"objectV ...  object")
 #21018=@"loc,{#10000},9,5,9,30"
 locations_default(#21018,#10000,9,5,9,30)
 hasLocation(#21017,#21018)
-enclosingStmt(#21017,#21016)
+enclosing_stmt(#21017,#21016)
 exprContainers(#21017,#20001)
 #21019=*
 exprs(#21019,78,#21017,0,"objectVar")
 hasLocation(#21019,#20200)
-enclosingStmt(#21019,#21016)
+enclosing_stmt(#21019,#21016)
 exprContainers(#21019,#20001)
 literals("objectVar","objectVar",#21019)
 decl(#21019,#20930)
 #21020=*
 typeexprs(#21020,2,#21017,2,"object")
 hasLocation(#21020,#20204)
-enclosingStmt(#21020,#21016)
+enclosing_stmt(#21020,#21016)
 exprContainers(#21020,#20001)
 literals("object","object",#21020)
 #21021=*
@@ -2688,19 +2688,19 @@ exprs(#21022,64,#21021,0,"numberV ...  number")
 #21023=@"loc,{#10000},10,5,10,30"
 locations_default(#21023,#10000,10,5,10,30)
 hasLocation(#21022,#21023)
-enclosingStmt(#21022,#21021)
+enclosing_stmt(#21022,#21021)
 exprContainers(#21022,#20001)
 #21024=*
 exprs(#21024,78,#21022,0,"numberVar")
 hasLocation(#21024,#20210)
-enclosingStmt(#21024,#21021)
+enclosing_stmt(#21024,#21021)
 exprContainers(#21024,#20001)
 literals("numberVar","numberVar",#21024)
 decl(#21024,#20931)
 #21025=*
 typeexprs(#21025,2,#21022,2,"number")
 hasLocation(#21025,#20214)
-enclosingStmt(#21025,#21021)
+enclosing_stmt(#21025,#21021)
 exprContainers(#21025,#20001)
 literals("number","number",#21025)
 #21026=*
@@ -2712,19 +2712,19 @@ exprs(#21027,64,#21026,0,"stringV ...  string")
 #21028=@"loc,{#10000},11,5,11,30"
 locations_default(#21028,#10000,11,5,11,30)
 hasLocation(#21027,#21028)
-enclosingStmt(#21027,#21026)
+enclosing_stmt(#21027,#21026)
 exprContainers(#21027,#20001)
 #21029=*
 exprs(#21029,78,#21027,0,"stringVar")
 hasLocation(#21029,#20220)
-enclosingStmt(#21029,#21026)
+enclosing_stmt(#21029,#21026)
 exprContainers(#21029,#20001)
 literals("stringVar","stringVar",#21029)
 decl(#21029,#20932)
 #21030=*
 typeexprs(#21030,2,#21027,2,"string")
 hasLocation(#21030,#20224)
-enclosingStmt(#21030,#21026)
+enclosing_stmt(#21030,#21026)
 exprContainers(#21030,#20001)
 literals("string","string",#21030)
 #21031=*
@@ -2736,19 +2736,19 @@ exprs(#21032,64,#21031,0,"boolean ... boolean")
 #21033=@"loc,{#10000},12,5,12,31"
 locations_default(#21033,#10000,12,5,12,31)
 hasLocation(#21032,#21033)
-enclosingStmt(#21032,#21031)
+enclosing_stmt(#21032,#21031)
 exprContainers(#21032,#20001)
 #21034=*
 exprs(#21034,78,#21032,0,"booleanVar")
 hasLocation(#21034,#20230)
-enclosingStmt(#21034,#21031)
+enclosing_stmt(#21034,#21031)
 exprContainers(#21034,#20001)
 literals("booleanVar","booleanVar",#21034)
 decl(#21034,#20933)
 #21035=*
 typeexprs(#21035,2,#21032,2,"boolean")
 hasLocation(#21035,#20234)
-enclosingStmt(#21035,#21031)
+enclosing_stmt(#21035,#21031)
 exprContainers(#21035,#20001)
 literals("boolean","boolean",#21035)
 #21036=*
@@ -2760,19 +2760,19 @@ exprs(#21037,64,#21036,0,"nullVar ...    null")
 #21038=@"loc,{#10000},13,5,13,28"
 locations_default(#21038,#10000,13,5,13,28)
 hasLocation(#21037,#21038)
-enclosingStmt(#21037,#21036)
+enclosing_stmt(#21037,#21036)
 exprContainers(#21037,#20001)
 #21039=*
 exprs(#21039,78,#21037,0,"nullVar")
 hasLocation(#21039,#20240)
-enclosingStmt(#21039,#21036)
+enclosing_stmt(#21039,#21036)
 exprContainers(#21039,#20001)
 literals("nullVar","nullVar",#21039)
 decl(#21039,#20934)
 #21040=*
 typeexprs(#21040,2,#21037,2,"null")
 hasLocation(#21040,#20244)
-enclosingStmt(#21040,#21036)
+enclosing_stmt(#21040,#21036)
 exprContainers(#21040,#20001)
 literals("null","null",#21040)
 #21041=*
@@ -2784,19 +2784,19 @@ exprs(#21042,64,#21041,0,"undefin ... defined")
 #21043=@"loc,{#10000},14,5,14,33"
 locations_default(#21043,#10000,14,5,14,33)
 hasLocation(#21042,#21043)
-enclosingStmt(#21042,#21041)
+enclosing_stmt(#21042,#21041)
 exprContainers(#21042,#20001)
 #21044=*
 exprs(#21044,78,#21042,0,"undefinedVar")
 hasLocation(#21044,#20250)
-enclosingStmt(#21044,#21041)
+enclosing_stmt(#21044,#21041)
 exprContainers(#21044,#20001)
 literals("undefinedVar","undefinedVar",#21044)
 decl(#21044,#20935)
 #21045=*
 typeexprs(#21045,2,#21042,2,"undefined")
 hasLocation(#21045,#20254)
-enclosingStmt(#21045,#21041)
+enclosing_stmt(#21045,#21041)
 exprContainers(#21045,#20001)
 literals("undefined","undefined",#21045)
 #21046=*
@@ -2808,19 +2808,19 @@ exprs(#21047,64,#21046,0,"voidVar ...    void")
 #21048=@"loc,{#10000},15,5,15,28"
 locations_default(#21048,#10000,15,5,15,28)
 hasLocation(#21047,#21048)
-enclosingStmt(#21047,#21046)
+enclosing_stmt(#21047,#21046)
 exprContainers(#21047,#20001)
 #21049=*
 exprs(#21049,78,#21047,0,"voidVar")
 hasLocation(#21049,#20260)
-enclosingStmt(#21049,#21046)
+enclosing_stmt(#21049,#21046)
 exprContainers(#21049,#20001)
 literals("voidVar","voidVar",#21049)
 decl(#21049,#20936)
 #21050=*
 typeexprs(#21050,2,#21047,2,"void")
 hasLocation(#21050,#20264)
-enclosingStmt(#21050,#21046)
+enclosing_stmt(#21050,#21046)
 exprContainers(#21050,#20001)
 literals("void","void",#21050)
 #21051=*
@@ -2832,19 +2832,19 @@ exprs(#21052,64,#21051,0,"neverVa ...   never")
 #21053=@"loc,{#10000},16,5,16,29"
 locations_default(#21053,#10000,16,5,16,29)
 hasLocation(#21052,#21053)
-enclosingStmt(#21052,#21051)
+enclosing_stmt(#21052,#21051)
 exprContainers(#21052,#20001)
 #21054=*
 exprs(#21054,78,#21052,0,"neverVar")
 hasLocation(#21054,#20270)
-enclosingStmt(#21054,#21051)
+enclosing_stmt(#21054,#21051)
 exprContainers(#21054,#20001)
 literals("neverVar","neverVar",#21054)
 decl(#21054,#20937)
 #21055=*
 typeexprs(#21055,2,#21052,2,"never")
 hasLocation(#21055,#20274)
-enclosingStmt(#21055,#21051)
+enclosing_stmt(#21055,#21051)
 exprContainers(#21055,#20001)
 literals("never","never",#21055)
 #21056=*
@@ -2856,19 +2856,19 @@ exprs(#21057,64,#21056,0,"symbolV ...  symbol")
 #21058=@"loc,{#10000},17,5,17,30"
 locations_default(#21058,#10000,17,5,17,30)
 hasLocation(#21057,#21058)
-enclosingStmt(#21057,#21056)
+enclosing_stmt(#21057,#21056)
 exprContainers(#21057,#20001)
 #21059=*
 exprs(#21059,78,#21057,0,"symbolVar")
 hasLocation(#21059,#20280)
-enclosingStmt(#21059,#21056)
+enclosing_stmt(#21059,#21056)
 exprContainers(#21059,#20001)
 literals("symbolVar","symbolVar",#21059)
 decl(#21059,#20938)
 #21060=*
 typeexprs(#21060,2,#21057,2,"symbol")
 hasLocation(#21060,#20284)
-enclosingStmt(#21060,#21056)
+enclosing_stmt(#21060,#21056)
 exprContainers(#21060,#20001)
 literals("symbol","symbol",#21060)
 #21061=*
@@ -2880,12 +2880,12 @@ exprs(#21062,64,#21061,0,"objectV ... mber; }")
 #21063=@"loc,{#10000},18,5,18,38"
 locations_default(#21063,#10000,18,5,18,38)
 hasLocation(#21062,#21063)
-enclosingStmt(#21062,#21061)
+enclosing_stmt(#21062,#21061)
 exprContainers(#21062,#20001)
 #21064=*
 exprs(#21064,78,#21062,0,"objectVar")
 hasLocation(#21064,#20290)
-enclosingStmt(#21064,#21061)
+enclosing_stmt(#21064,#21061)
 exprContainers(#21064,#20001)
 literals("objectVar","objectVar",#21064)
 decl(#21064,#20930)
@@ -2894,7 +2894,7 @@ typeexprs(#21065,21,#21062,2,"{ x: number; }")
 #21066=@"loc,{#10000},18,25,18,38"
 locations_default(#21066,#10000,18,25,18,38)
 hasLocation(#21065,#21066)
-enclosingStmt(#21065,#21061)
+enclosing_stmt(#21065,#21061)
 exprContainers(#21065,#20001)
 #21067=*
 properties(#21067,#21065,0,8,"x: number;")
@@ -2904,14 +2904,14 @@ hasLocation(#21067,#21068)
 #21069=*
 exprs(#21069,0,#21067,0,"x")
 hasLocation(#21069,#20296)
-enclosingStmt(#21069,#21061)
+enclosing_stmt(#21069,#21061)
 exprContainers(#21069,#20001)
 literals("x","x",#21069)
 isAbstractMember(#21067)
 #21070=*
 typeexprs(#21070,2,#21067,2,"number")
 hasLocation(#21070,#20300)
-enclosingStmt(#21070,#21061)
+enclosing_stmt(#21070,#21061)
 exprContainers(#21070,#20001)
 literals("number","number",#21070)
 #21071=*
@@ -2923,12 +2923,12 @@ exprs(#21072,64,#21071,0,"nestedO ... ber } }")
 #21073=@"loc,{#10000},19,5,19,44"
 locations_default(#21073,#10000,19,5,19,44)
 hasLocation(#21072,#21073)
-enclosingStmt(#21072,#21071)
+enclosing_stmt(#21072,#21071)
 exprContainers(#21072,#20001)
 #21074=*
 exprs(#21074,78,#21072,0,"nestedObjectVar")
 hasLocation(#21074,#20308)
-enclosingStmt(#21074,#21071)
+enclosing_stmt(#21074,#21071)
 exprContainers(#21074,#20001)
 literals("nestedObjectVar","nestedObjectVar",#21074)
 decl(#21074,#20939)
@@ -2937,7 +2937,7 @@ typeexprs(#21075,21,#21072,2,"{ x: { y: number } }")
 #21076=@"loc,{#10000},19,25,19,44"
 locations_default(#21076,#10000,19,25,19,44)
 hasLocation(#21075,#21076)
-enclosingStmt(#21075,#21071)
+enclosing_stmt(#21075,#21071)
 exprContainers(#21075,#20001)
 #21077=*
 properties(#21077,#21075,0,8,"x: { y: number }")
@@ -2947,7 +2947,7 @@ hasLocation(#21077,#21078)
 #21079=*
 exprs(#21079,0,#21077,0,"x")
 hasLocation(#21079,#20314)
-enclosingStmt(#21079,#21071)
+enclosing_stmt(#21079,#21071)
 exprContainers(#21079,#20001)
 literals("x","x",#21079)
 isAbstractMember(#21077)
@@ -2956,7 +2956,7 @@ typeexprs(#21080,21,#21077,2,"{ y: number }")
 #21081=@"loc,{#10000},19,30,19,42"
 locations_default(#21081,#10000,19,30,19,42)
 hasLocation(#21080,#21081)
-enclosingStmt(#21080,#21071)
+enclosing_stmt(#21080,#21071)
 exprContainers(#21080,#20001)
 #21082=*
 properties(#21082,#21080,0,8,"y: number")
@@ -2966,14 +2966,14 @@ hasLocation(#21082,#21083)
 #21084=*
 exprs(#21084,0,#21082,0,"y")
 hasLocation(#21084,#20320)
-enclosingStmt(#21084,#21071)
+enclosing_stmt(#21084,#21071)
 exprContainers(#21084,#20001)
 literals("y","y",#21084)
 isAbstractMember(#21082)
 #21085=*
 typeexprs(#21085,2,#21082,2,"number")
 hasLocation(#21085,#20324)
-enclosingStmt(#21085,#21071)
+enclosing_stmt(#21085,#21071)
 exprContainers(#21085,#20001)
 literals("number","number",#21085)
 #21086=*
@@ -2985,12 +2985,12 @@ exprs(#21087,64,#21086,0,"arrayVa ... umber[]")
 #21088=@"loc,{#10000},20,5,20,32"
 locations_default(#21088,#10000,20,5,20,32)
 hasLocation(#21087,#21088)
-enclosingStmt(#21087,#21086)
+enclosing_stmt(#21087,#21086)
 exprContainers(#21087,#20001)
 #21089=*
 exprs(#21089,78,#21087,0,"arrayVar")
 hasLocation(#21089,#20332)
-enclosingStmt(#21089,#21086)
+enclosing_stmt(#21089,#21086)
 exprContainers(#21089,#20001)
 literals("arrayVar","arrayVar",#21089)
 decl(#21089,#20940)
@@ -2999,12 +2999,12 @@ typeexprs(#21090,6,#21087,2,"number[]")
 #21091=@"loc,{#10000},20,25,20,32"
 locations_default(#21091,#10000,20,25,20,32)
 hasLocation(#21090,#21091)
-enclosingStmt(#21090,#21086)
+enclosing_stmt(#21090,#21086)
 exprContainers(#21090,#20001)
 #21092=*
 typeexprs(#21092,2,#21090,0,"number")
 hasLocation(#21092,#20336)
-enclosingStmt(#21092,#21086)
+enclosing_stmt(#21092,#21086)
 exprContainers(#21092,#20001)
 literals("number","number",#21092)
 #21093=*
@@ -3016,19 +3016,19 @@ exprs(#21094,64,#21093,0,"stringO ...  String")
 #21095=@"loc,{#10000},21,5,21,30"
 locations_default(#21095,#10000,21,5,21,30)
 hasLocation(#21094,#21095)
-enclosingStmt(#21094,#21093)
+enclosing_stmt(#21094,#21093)
 exprContainers(#21094,#20001)
 #21096=*
 exprs(#21096,78,#21094,0,"stringObjectVar")
 hasLocation(#21096,#20344)
-enclosingStmt(#21096,#21093)
+enclosing_stmt(#21096,#21093)
 exprContainers(#21096,#20001)
 literals("stringObjectVar","stringObjectVar",#21096)
 decl(#21096,#20941)
 #21097=*
 typeexprs(#21097,0,#21094,2,"String")
 hasLocation(#21097,#20348)
-enclosingStmt(#21097,#21093)
+enclosing_stmt(#21097,#21093)
 exprContainers(#21097,#20001)
 literals("String","String",#21097)
 #21098=*
@@ -3040,19 +3040,19 @@ exprs(#21099,64,#21098,0,"pointVa ...   Point")
 #21100=@"loc,{#10000},22,5,22,29"
 locations_default(#21100,#10000,22,5,22,29)
 hasLocation(#21099,#21100)
-enclosingStmt(#21099,#21098)
+enclosing_stmt(#21099,#21098)
 exprContainers(#21099,#20001)
 #21101=*
 exprs(#21101,78,#21099,0,"pointVar")
 hasLocation(#21101,#20352)
-enclosingStmt(#21101,#21098)
+enclosing_stmt(#21101,#21098)
 exprContainers(#21101,#20001)
 literals("pointVar","pointVar",#21101)
 decl(#21101,#20942)
 #21102=*
 typeexprs(#21102,0,#21099,2,"Point")
 hasLocation(#21102,#20356)
-enclosingStmt(#21102,#21098)
+enclosing_stmt(#21102,#21098)
 exprContainers(#21102,#20001)
 literals("Point","Point",#21102)
 typebind(#21102,#20975)
@@ -3065,19 +3065,19 @@ exprs(#21104,64,#21103,0,"rawFunc ... unction")
 #21105=@"loc,{#10000},23,5,23,32"
 locations_default(#21105,#10000,23,5,23,32)
 hasLocation(#21104,#21105)
-enclosingStmt(#21104,#21103)
+enclosing_stmt(#21104,#21103)
 exprContainers(#21104,#20001)
 #21106=*
 exprs(#21106,78,#21104,0,"rawFunctionVar")
 hasLocation(#21106,#20360)
-enclosingStmt(#21106,#21103)
+enclosing_stmt(#21106,#21103)
 exprContainers(#21106,#20001)
 literals("rawFunctionVar","rawFunctionVar",#21106)
 decl(#21106,#20943)
 #21107=*
 typeexprs(#21107,0,#21104,2,"Function")
 hasLocation(#21107,#20364)
-enclosingStmt(#21107,#21103)
+enclosing_stmt(#21107,#21103)
 exprContainers(#21107,#20001)
 literals("Function","Function",#21107)
 #21108=*
@@ -3089,19 +3089,19 @@ exprs(#21109,64,#21108,0,"varVar: ...     x11")
 #21110=@"loc,{#10000},24,5,24,27"
 locations_default(#21110,#10000,24,5,24,27)
 hasLocation(#21109,#21110)
-enclosingStmt(#21109,#21108)
+enclosing_stmt(#21109,#21108)
 exprContainers(#21109,#20001)
 #21111=*
 exprs(#21111,78,#21109,0,"varVar")
 hasLocation(#21111,#20368)
-enclosingStmt(#21111,#21108)
+enclosing_stmt(#21111,#21108)
 exprContainers(#21111,#20001)
 literals("varVar","varVar",#21111)
 decl(#21111,#20944)
 #21112=*
 typeexprs(#21112,0,#21109,2,"x11")
 hasLocation(#21112,#20372)
-enclosingStmt(#21112,#21108)
+enclosing_stmt(#21112,#21108)
 exprContainers(#21112,#20001)
 literals("x11","x11",#21112)
 #21113=*
@@ -3113,12 +3113,12 @@ exprs(#21114,64,#21113,0,"generic ... number>")
 #21115=@"loc,{#10000},25,5,25,37"
 locations_default(#21115,#10000,25,5,25,37)
 hasLocation(#21114,#21115)
-enclosingStmt(#21114,#21113)
+enclosing_stmt(#21114,#21113)
 exprContainers(#21114,#20001)
 #21116=*
 exprs(#21116,78,#21114,0,"genericArrayVar")
 hasLocation(#21116,#20376)
-enclosingStmt(#21116,#21113)
+enclosing_stmt(#21116,#21113)
 exprContainers(#21116,#20001)
 literals("genericArrayVar","genericArrayVar",#21116)
 decl(#21116,#20945)
@@ -3127,18 +3127,18 @@ typeexprs(#21117,14,#21114,2,"Array<number>")
 #21118=@"loc,{#10000},25,25,25,37"
 locations_default(#21118,#10000,25,25,25,37)
 hasLocation(#21117,#21118)
-enclosingStmt(#21117,#21113)
+enclosing_stmt(#21117,#21113)
 exprContainers(#21117,#20001)
 #21119=*
 typeexprs(#21119,0,#21117,-1,"Array")
 hasLocation(#21119,#20380)
-enclosingStmt(#21119,#21113)
+enclosing_stmt(#21119,#21113)
 exprContainers(#21119,#20001)
 literals("Array","Array",#21119)
 #21120=*
 typeexprs(#21120,2,#21117,0,"number")
 hasLocation(#21120,#20384)
-enclosingStmt(#21120,#21113)
+enclosing_stmt(#21120,#21113)
 exprContainers(#21120,#20001)
 literals("number","number",#21120)
 #21121=*
@@ -3150,12 +3150,12 @@ exprs(#21122,64,#21121,0,"nestedG ... umber>>")
 #21123=@"loc,{#10000},26,5,26,40"
 locations_default(#21123,#10000,26,5,26,40)
 hasLocation(#21122,#21123)
-enclosingStmt(#21122,#21121)
+enclosing_stmt(#21122,#21121)
 exprContainers(#21122,#20001)
 #21124=*
 exprs(#21124,78,#21122,0,"nestedGenericVar")
 hasLocation(#21124,#20390)
-enclosingStmt(#21124,#21121)
+enclosing_stmt(#21124,#21121)
 exprContainers(#21124,#20001)
 literals("nestedGenericVar","nestedGenericVar",#21124)
 decl(#21124,#20946)
@@ -3164,12 +3164,12 @@ typeexprs(#21125,14,#21122,2,"Foo<Foo<number>>")
 #21126=@"loc,{#10000},26,25,26,40"
 locations_default(#21126,#10000,26,25,26,40)
 hasLocation(#21125,#21126)
-enclosingStmt(#21125,#21121)
+enclosing_stmt(#21125,#21121)
 exprContainers(#21125,#20001)
 #21127=*
 typeexprs(#21127,0,#21125,-1,"Foo")
 hasLocation(#21127,#20394)
-enclosingStmt(#21127,#21121)
+enclosing_stmt(#21127,#21121)
 exprContainers(#21127,#20001)
 literals("Foo","Foo",#21127)
 #21128=*
@@ -3177,18 +3177,18 @@ typeexprs(#21128,14,#21125,0,"Foo<number>")
 #21129=@"loc,{#10000},26,29,26,39"
 locations_default(#21129,#10000,26,29,26,39)
 hasLocation(#21128,#21129)
-enclosingStmt(#21128,#21121)
+enclosing_stmt(#21128,#21121)
 exprContainers(#21128,#20001)
 #21130=*
 typeexprs(#21130,0,#21128,-1,"Foo")
 hasLocation(#21130,#20398)
-enclosingStmt(#21130,#21121)
+enclosing_stmt(#21130,#21121)
 exprContainers(#21130,#20001)
 literals("Foo","Foo",#21130)
 #21131=*
 typeexprs(#21131,2,#21128,0,"number")
 hasLocation(#21131,#20402)
-enclosingStmt(#21131,#21121)
+enclosing_stmt(#21131,#21121)
 exprContainers(#21131,#20001)
 literals("number","number",#21131)
 #21132=*
@@ -3200,12 +3200,12 @@ exprs(#21133,64,#21132,0,"callSig ...  number")
 #21134=@"loc,{#10000},27,5,27,36"
 locations_default(#21134,#10000,27,5,27,36)
 hasLocation(#21133,#21134)
-enclosingStmt(#21133,#21132)
+enclosing_stmt(#21133,#21132)
 exprContainers(#21133,#20001)
 #21135=*
 exprs(#21135,78,#21133,0,"callSigVar")
 hasLocation(#21135,#20410)
-enclosingStmt(#21135,#21132)
+enclosing_stmt(#21135,#21132)
 exprContainers(#21135,#20001)
 literals("callSigVar","callSigVar",#21135)
 decl(#21135,#20947)
@@ -3214,12 +3214,12 @@ typeexprs(#21136,23,#21133,2,"() => number")
 #21137=@"loc,{#10000},27,25,27,36"
 locations_default(#21137,#10000,27,25,27,36)
 hasLocation(#21136,#21137)
-enclosingStmt(#21136,#21132)
+enclosing_stmt(#21136,#21132)
 exprContainers(#21136,#20001)
 #21138=*
 exprs(#21138,9,#21136,0,"() => number")
 hasLocation(#21138,#21137)
-enclosingStmt(#21138,#21132)
+enclosing_stmt(#21138,#21132)
 exprContainers(#21138,#20001)
 #21139=*
 scopes(#21139,1)
@@ -3242,12 +3242,12 @@ exprs(#21143,64,#21142,0,"constru ... > Point")
 #21144=@"loc,{#10000},28,5,28,39"
 locations_default(#21144,#10000,28,5,28,39)
 hasLocation(#21143,#21144)
-enclosingStmt(#21143,#21142)
+enclosing_stmt(#21143,#21142)
 exprContainers(#21143,#20001)
 #21145=*
 exprs(#21145,78,#21143,0,"constructSigVar")
 hasLocation(#21145,#20426)
-enclosingStmt(#21145,#21142)
+enclosing_stmt(#21145,#21142)
 exprContainers(#21145,#20001)
 literals("constructSigVar","constructSigVar",#21145)
 decl(#21145,#20948)
@@ -3256,12 +3256,12 @@ typeexprs(#21146,24,#21143,2,"new () => Point")
 #21147=@"loc,{#10000},28,25,28,39"
 locations_default(#21147,#10000,28,25,28,39)
 hasLocation(#21146,#21147)
-enclosingStmt(#21146,#21142)
+enclosing_stmt(#21146,#21142)
 exprContainers(#21146,#20001)
 #21148=*
 exprs(#21148,9,#21146,0,"new () => Point")
 hasLocation(#21148,#21147)
-enclosingStmt(#21148,#21142)
+enclosing_stmt(#21148,#21142)
 exprContainers(#21148,#20001)
 #21149=*
 scopes(#21149,1)
@@ -3285,12 +3285,12 @@ exprs(#21153,64,#21152,0,"callSig ... => void")
 #21154=@"loc,{#10000},29,5,29,34"
 locations_default(#21154,#10000,29,5,29,34)
 hasLocation(#21153,#21154)
-enclosingStmt(#21153,#21152)
+enclosing_stmt(#21153,#21152)
 exprContainers(#21153,#20001)
 #21155=*
 exprs(#21155,78,#21153,0,"callSigVoidVar")
 hasLocation(#21155,#20444)
-enclosingStmt(#21155,#21152)
+enclosing_stmt(#21155,#21152)
 exprContainers(#21155,#20001)
 literals("callSigVoidVar","callSigVoidVar",#21155)
 decl(#21155,#20949)
@@ -3299,12 +3299,12 @@ typeexprs(#21156,23,#21153,2,"() => void")
 #21157=@"loc,{#10000},29,25,29,34"
 locations_default(#21157,#10000,29,25,29,34)
 hasLocation(#21156,#21157)
-enclosingStmt(#21156,#21152)
+enclosing_stmt(#21156,#21152)
 exprContainers(#21156,#20001)
 #21158=*
 exprs(#21158,9,#21156,0,"() => void")
 hasLocation(#21158,#21157)
-enclosingStmt(#21158,#21152)
+enclosing_stmt(#21158,#21152)
 exprContainers(#21158,#20001)
 #21159=*
 scopes(#21159,1)
@@ -3327,12 +3327,12 @@ exprs(#21163,64,#21162,0,"callSig ... > never")
 #21164=@"loc,{#10000},30,5,30,35"
 locations_default(#21164,#10000,30,5,30,35)
 hasLocation(#21163,#21164)
-enclosingStmt(#21163,#21162)
+enclosing_stmt(#21163,#21162)
 exprContainers(#21163,#20001)
 #21165=*
 exprs(#21165,78,#21163,0,"callSigNeverVar")
 hasLocation(#21165,#20460)
-enclosingStmt(#21165,#21162)
+enclosing_stmt(#21165,#21162)
 exprContainers(#21165,#20001)
 literals("callSigNeverVar","callSigNeverVar",#21165)
 decl(#21165,#20950)
@@ -3341,12 +3341,12 @@ typeexprs(#21166,23,#21163,2,"() => never")
 #21167=@"loc,{#10000},30,25,30,35"
 locations_default(#21167,#10000,30,25,30,35)
 hasLocation(#21166,#21167)
-enclosingStmt(#21166,#21162)
+enclosing_stmt(#21166,#21162)
 exprContainers(#21166,#20001)
 #21168=*
 exprs(#21168,9,#21166,0,"() => never")
 hasLocation(#21168,#21167)
-enclosingStmt(#21168,#21162)
+enclosing_stmt(#21168,#21162)
 exprContainers(#21168,#20001)
 #21169=*
 scopes(#21169,1)
@@ -3369,12 +3369,12 @@ exprs(#21173,64,#21172,0,"unionVa ...  string")
 #21174=@"loc,{#10000},31,5,31,39"
 locations_default(#21174,#10000,31,5,31,39)
 hasLocation(#21173,#21174)
-enclosingStmt(#21173,#21172)
+enclosing_stmt(#21173,#21172)
 exprContainers(#21173,#20001)
 #21175=*
 exprs(#21175,78,#21173,0,"unionVar")
 hasLocation(#21175,#20476)
-enclosingStmt(#21175,#21172)
+enclosing_stmt(#21175,#21172)
 exprContainers(#21175,#20001)
 literals("unionVar","unionVar",#21175)
 decl(#21175,#20951)
@@ -3383,18 +3383,18 @@ typeexprs(#21176,7,#21173,2,"number | string")
 #21177=@"loc,{#10000},31,25,31,39"
 locations_default(#21177,#10000,31,25,31,39)
 hasLocation(#21176,#21177)
-enclosingStmt(#21176,#21172)
+enclosing_stmt(#21176,#21172)
 exprContainers(#21176,#20001)
 #21178=*
 typeexprs(#21178,2,#21176,0,"number")
 hasLocation(#21178,#20480)
-enclosingStmt(#21178,#21172)
+enclosing_stmt(#21178,#21172)
 exprContainers(#21178,#20001)
 literals("number","number",#21178)
 #21179=*
 typeexprs(#21179,2,#21176,1,"string")
 hasLocation(#21179,#20484)
-enclosingStmt(#21179,#21172)
+enclosing_stmt(#21179,#21172)
 exprContainers(#21179,#20001)
 literals("string","string",#21179)
 #21180=*
@@ -3406,19 +3406,19 @@ exprs(#21181,64,#21180,0,"stringL ... iteral""")
 #21182=@"loc,{#10000},32,5,32,33"
 locations_default(#21182,#10000,32,5,32,33)
 hasLocation(#21181,#21182)
-enclosingStmt(#21181,#21180)
+enclosing_stmt(#21181,#21180)
 exprContainers(#21181,#20001)
 #21183=*
 exprs(#21183,78,#21181,0,"stringLiteralVar")
 hasLocation(#21183,#20490)
-enclosingStmt(#21183,#21180)
+enclosing_stmt(#21183,#21180)
 exprContainers(#21183,#20001)
 literals("stringLiteralVar","stringLiteralVar",#21183)
 decl(#21183,#20952)
 #21184=*
 typeexprs(#21184,3,#21181,2,"""literal""")
 hasLocation(#21184,#20494)
-enclosingStmt(#21184,#21180)
+enclosing_stmt(#21184,#21180)
 exprContainers(#21184,#20001)
 literals("literal","""literal""",#21184)
 #21185=*
@@ -3430,19 +3430,19 @@ exprs(#21186,64,#21185,0,"trueVar ...    true")
 #21187=@"loc,{#10000},33,5,33,28"
 locations_default(#21187,#10000,33,5,33,28)
 hasLocation(#21186,#21187)
-enclosingStmt(#21186,#21185)
+enclosing_stmt(#21186,#21185)
 exprContainers(#21186,#20001)
 #21188=*
 exprs(#21188,78,#21186,0,"trueVar")
 hasLocation(#21188,#20500)
-enclosingStmt(#21188,#21185)
+enclosing_stmt(#21188,#21185)
 exprContainers(#21188,#20001)
 literals("trueVar","trueVar",#21188)
 decl(#21188,#20953)
 #21189=*
 typeexprs(#21189,5,#21186,2,"true")
 hasLocation(#21189,#20504)
-enclosingStmt(#21189,#21185)
+enclosing_stmt(#21189,#21185)
 exprContainers(#21189,#20001)
 literals("true","true",#21189)
 #21190=*
@@ -3454,19 +3454,19 @@ exprs(#21191,64,#21190,0,"falseVa ...   false")
 #21192=@"loc,{#10000},34,5,34,29"
 locations_default(#21192,#10000,34,5,34,29)
 hasLocation(#21191,#21192)
-enclosingStmt(#21191,#21190)
+enclosing_stmt(#21191,#21190)
 exprContainers(#21191,#20001)
 #21193=*
 exprs(#21193,78,#21191,0,"falseVar")
 hasLocation(#21193,#20510)
-enclosingStmt(#21193,#21190)
+enclosing_stmt(#21193,#21190)
 exprContainers(#21193,#20001)
 literals("falseVar","falseVar",#21193)
 decl(#21193,#20954)
 #21194=*
 typeexprs(#21194,5,#21191,2,"false")
 hasLocation(#21194,#20514)
-enclosingStmt(#21194,#21190)
+enclosing_stmt(#21194,#21190)
 exprContainers(#21194,#20001)
 literals("false","false",#21194)
 #21195=*
@@ -3478,19 +3478,19 @@ exprs(#21196,64,#21195,0,"intLite ...     100")
 #21197=@"loc,{#10000},35,5,35,27"
 locations_default(#21197,#10000,35,5,35,27)
 hasLocation(#21196,#21197)
-enclosingStmt(#21196,#21195)
+enclosing_stmt(#21196,#21195)
 exprContainers(#21196,#20001)
 #21198=*
 exprs(#21198,78,#21196,0,"intLiteralVar")
 hasLocation(#21198,#20520)
-enclosingStmt(#21198,#21195)
+enclosing_stmt(#21198,#21195)
 exprContainers(#21198,#20001)
 literals("intLiteralVar","intLiteralVar",#21198)
 decl(#21198,#20955)
 #21199=*
 typeexprs(#21199,4,#21196,2,"100")
 hasLocation(#21199,#20524)
-enclosingStmt(#21199,#21195)
+enclosing_stmt(#21199,#21195)
 exprContainers(#21199,#20001)
 literals("100","100",#21199)
 #21200=*
@@ -3502,19 +3502,19 @@ exprs(#21201,64,#21200,0,"doubleL ...  100.50")
 #21202=@"loc,{#10000},36,5,36,30"
 locations_default(#21202,#10000,36,5,36,30)
 hasLocation(#21201,#21202)
-enclosingStmt(#21201,#21200)
+enclosing_stmt(#21201,#21200)
 exprContainers(#21201,#20001)
 #21203=*
 exprs(#21203,78,#21201,0,"doubleLiteralVar")
 hasLocation(#21203,#20530)
-enclosingStmt(#21203,#21200)
+enclosing_stmt(#21203,#21200)
 exprContainers(#21203,#20001)
 literals("doubleLiteralVar","doubleLiteralVar",#21203)
 decl(#21203,#20956)
 #21204=*
 typeexprs(#21204,4,#21201,2,"100.50")
 hasLocation(#21204,#20534)
-enclosingStmt(#21204,#21200)
+enclosing_stmt(#21204,#21200)
 exprContainers(#21204,#20001)
 literals("100.5","100.50",#21204)
 #21205=*
@@ -3526,12 +3526,12 @@ exprs(#21206,64,#21205,0,"tupleVa ... number]")
 #21207=@"loc,{#10000},37,5,37,40"
 locations_default(#21207,#10000,37,5,37,40)
 hasLocation(#21206,#21207)
-enclosingStmt(#21206,#21205)
+enclosing_stmt(#21206,#21205)
 exprContainers(#21206,#20001)
 #21208=*
 exprs(#21208,78,#21206,0,"tupleVar")
 hasLocation(#21208,#20540)
-enclosingStmt(#21208,#21205)
+enclosing_stmt(#21208,#21205)
 exprContainers(#21208,#20001)
 literals("tupleVar","tupleVar",#21208)
 decl(#21208,#20957)
@@ -3540,18 +3540,18 @@ typeexprs(#21209,11,#21206,2,"[string, number]")
 #21210=@"loc,{#10000},37,25,37,40"
 locations_default(#21210,#10000,37,25,37,40)
 hasLocation(#21209,#21210)
-enclosingStmt(#21209,#21205)
+enclosing_stmt(#21209,#21205)
 exprContainers(#21209,#20001)
 #21211=*
 typeexprs(#21211,2,#21209,0,"string")
 hasLocation(#21211,#20546)
-enclosingStmt(#21211,#21205)
+enclosing_stmt(#21211,#21205)
 exprContainers(#21211,#20001)
 literals("string","string",#21211)
 #21212=*
 typeexprs(#21212,2,#21209,1,"number")
 hasLocation(#21212,#20550)
-enclosingStmt(#21212,#21205)
+enclosing_stmt(#21212,#21205)
 exprContainers(#21212,#20001)
 literals("number","number",#21212)
 #21213=*
@@ -3563,12 +3563,12 @@ exprs(#21214,64,#21213,0,"longUni ... "" | [3]")
 #21215=@"loc,{#10000},38,5,38,46"
 locations_default(#21215,#10000,38,5,38,46)
 hasLocation(#21214,#21215)
-enclosingStmt(#21214,#21213)
+enclosing_stmt(#21214,#21213)
 exprContainers(#21214,#20001)
 #21216=*
 exprs(#21216,78,#21214,0,"longUnionVar")
 hasLocation(#21216,#20556)
-enclosingStmt(#21216,#21213)
+enclosing_stmt(#21216,#21213)
 exprContainers(#21216,#20001)
 literals("longUnionVar","longUnionVar",#21216)
 decl(#21216,#20958)
@@ -3577,24 +3577,24 @@ typeexprs(#21217,7,#21214,2,"null |  ... "" | [3]")
 #21218=@"loc,{#10000},38,25,38,46"
 locations_default(#21218,#10000,38,25,38,46)
 hasLocation(#21217,#21218)
-enclosingStmt(#21217,#21213)
+enclosing_stmt(#21217,#21213)
 exprContainers(#21217,#20001)
 #21219=*
 typeexprs(#21219,2,#21217,0,"null")
 hasLocation(#21219,#20560)
-enclosingStmt(#21219,#21213)
+enclosing_stmt(#21219,#21213)
 exprContainers(#21219,#20001)
 literals("null","null",#21219)
 #21220=*
 typeexprs(#21220,4,#21217,1,"1")
 hasLocation(#21220,#20564)
-enclosingStmt(#21220,#21213)
+enclosing_stmt(#21220,#21213)
 exprContainers(#21220,#20001)
 literals("1","1",#21220)
 #21221=*
 typeexprs(#21221,3,#21217,2,"""two""")
 hasLocation(#21221,#20568)
-enclosingStmt(#21221,#21213)
+enclosing_stmt(#21221,#21213)
 exprContainers(#21221,#20001)
 literals("two","""two""",#21221)
 #21222=*
@@ -3602,12 +3602,12 @@ typeexprs(#21222,11,#21217,3,"[3]")
 #21223=@"loc,{#10000},38,44,38,46"
 locations_default(#21223,#10000,38,44,38,46)
 hasLocation(#21222,#21223)
-enclosingStmt(#21222,#21213)
+enclosing_stmt(#21222,#21213)
 exprContainers(#21222,#20001)
 #21224=*
 typeexprs(#21224,4,#21222,0,"3")
 hasLocation(#21224,#20574)
-enclosingStmt(#21224,#21213)
+enclosing_stmt(#21224,#21213)
 exprContainers(#21224,#20001)
 literals("3","3",#21224)
 #21225=*
@@ -3619,12 +3619,12 @@ exprs(#21226,64,#21225,0,"interse ... o & Bar")
 #21227=@"loc,{#10000},39,5,39,33"
 locations_default(#21227,#10000,39,5,39,33)
 hasLocation(#21226,#21227)
-enclosingStmt(#21226,#21225)
+enclosing_stmt(#21226,#21225)
 exprContainers(#21226,#20001)
 #21228=*
 exprs(#21228,78,#21226,0,"intersectVar")
 hasLocation(#21228,#20580)
-enclosingStmt(#21228,#21225)
+enclosing_stmt(#21228,#21225)
 exprContainers(#21228,#20001)
 literals("intersectVar","intersectVar",#21228)
 decl(#21228,#20959)
@@ -3633,18 +3633,18 @@ typeexprs(#21229,9,#21226,2,"Foo & Bar")
 #21230=@"loc,{#10000},39,25,39,33"
 locations_default(#21230,#10000,39,25,39,33)
 hasLocation(#21229,#21230)
-enclosingStmt(#21229,#21225)
+enclosing_stmt(#21229,#21225)
 exprContainers(#21229,#20001)
 #21231=*
 typeexprs(#21231,0,#21229,0,"Foo")
 hasLocation(#21231,#20584)
-enclosingStmt(#21231,#21225)
+enclosing_stmt(#21231,#21225)
 exprContainers(#21231,#20001)
 literals("Foo","Foo",#21231)
 #21232=*
 typeexprs(#21232,0,#21229,1,"Bar")
 hasLocation(#21232,#20588)
-enclosingStmt(#21232,#21225)
+enclosing_stmt(#21232,#21225)
 exprContainers(#21232,#20001)
 literals("Bar","Bar",#21232)
 #21233=*
@@ -3656,12 +3656,12 @@ exprs(#21234,64,#21233,0,"generic ... T) => T")
 #21235=@"loc,{#10000},40,5,40,38"
 locations_default(#21235,#10000,40,5,40,38)
 hasLocation(#21234,#21235)
-enclosingStmt(#21234,#21233)
+enclosing_stmt(#21234,#21233)
 exprContainers(#21234,#20001)
 #21236=*
 exprs(#21236,78,#21234,0,"genericCallSigVar")
 hasLocation(#21236,#20594)
-enclosingStmt(#21236,#21233)
+enclosing_stmt(#21236,#21233)
 exprContainers(#21236,#20001)
 literals("genericCallSigVar","genericCallSigVar",#21236)
 decl(#21236,#20960)
@@ -3670,12 +3670,12 @@ typeexprs(#21237,23,#21234,2,"<T>(x: T) => T")
 #21238=@"loc,{#10000},40,25,40,38"
 locations_default(#21238,#10000,40,25,40,38)
 hasLocation(#21237,#21238)
-enclosingStmt(#21237,#21233)
+enclosing_stmt(#21237,#21233)
 exprContainers(#21237,#20001)
 #21239=*
 exprs(#21239,9,#21237,0,"<T>(x: T) => T")
 hasLocation(#21239,#21238)
-enclosingStmt(#21239,#21233)
+enclosing_stmt(#21239,#21233)
 exprContainers(#21239,#20001)
 #21240=*
 scopes(#21240,1)
@@ -3725,12 +3725,12 @@ exprs(#21250,64,#21249,0,"generic ... T) => T")
 #21251=@"loc,{#10000},41,5,41,46"
 locations_default(#21251,#10000,41,5,41,46)
 hasLocation(#21250,#21251)
-enclosingStmt(#21250,#21249)
+enclosing_stmt(#21250,#21249)
 exprContainers(#21250,#20001)
 #21252=*
 exprs(#21252,78,#21250,0,"generic ... tSigVar")
 hasLocation(#21252,#20622)
-enclosingStmt(#21252,#21249)
+enclosing_stmt(#21252,#21249)
 exprContainers(#21252,#20001)
 literals("genericConstructSigVar","genericConstructSigVar",#21252)
 decl(#21252,#20961)
@@ -3739,12 +3739,12 @@ typeexprs(#21253,24,#21250,2,"new <T>(x: T) => T")
 #21254=@"loc,{#10000},41,29,41,46"
 locations_default(#21254,#10000,41,29,41,46)
 hasLocation(#21253,#21254)
-enclosingStmt(#21253,#21249)
+enclosing_stmt(#21253,#21249)
 exprContainers(#21253,#20001)
 #21255=*
 exprs(#21255,9,#21253,0,"new <T>(x: T) => T")
 hasLocation(#21255,#21254)
-enclosingStmt(#21255,#21249)
+enclosing_stmt(#21255,#21249)
 exprContainers(#21255,#20001)
 #21256=*
 scopes(#21256,1)
@@ -3794,12 +3794,12 @@ exprs(#21266,64,#21265,0,"keyofVa ... f Point")
 #21267=@"loc,{#10000},42,5,42,35"
 locations_default(#21267,#10000,42,5,42,35)
 hasLocation(#21266,#21267)
-enclosingStmt(#21266,#21265)
+enclosing_stmt(#21266,#21265)
 exprContainers(#21266,#20001)
 #21268=*
 exprs(#21268,78,#21266,0,"keyofVar")
 hasLocation(#21268,#20652)
-enclosingStmt(#21268,#21265)
+enclosing_stmt(#21268,#21265)
 exprContainers(#21268,#20001)
 literals("keyofVar","keyofVar",#21268)
 decl(#21268,#20962)
@@ -3808,12 +3808,12 @@ typeexprs(#21269,12,#21266,2,"keyof Point")
 #21270=@"loc,{#10000},42,25,42,35"
 locations_default(#21270,#10000,42,25,42,35)
 hasLocation(#21269,#21270)
-enclosingStmt(#21269,#21265)
+enclosing_stmt(#21269,#21265)
 exprContainers(#21269,#20001)
 #21271=*
 typeexprs(#21271,0,#21269,0,"Point")
 hasLocation(#21271,#20658)
-enclosingStmt(#21271,#21265)
+enclosing_stmt(#21271,#21265)
 exprContainers(#21271,#20001)
 literals("Point","Point",#21271)
 typebind(#21271,#20975)
@@ -3826,12 +3826,12 @@ exprs(#21273,64,#21272,0,"indexed ... nt[""x""]")
 #21274=@"loc,{#10000},43,5,43,34"
 locations_default(#21274,#10000,43,5,43,34)
 hasLocation(#21273,#21274)
-enclosingStmt(#21273,#21272)
+enclosing_stmt(#21273,#21272)
 exprContainers(#21273,#20001)
 #21275=*
 exprs(#21275,78,#21273,0,"indexedVar")
 hasLocation(#21275,#20662)
-enclosingStmt(#21275,#21272)
+enclosing_stmt(#21275,#21272)
 exprContainers(#21275,#20001)
 literals("indexedVar","indexedVar",#21275)
 decl(#21275,#20963)
@@ -3840,19 +3840,19 @@ typeexprs(#21276,8,#21273,2,"Point[""x""]")
 #21277=@"loc,{#10000},43,25,43,34"
 locations_default(#21277,#10000,43,25,43,34)
 hasLocation(#21276,#21277)
-enclosingStmt(#21276,#21272)
+enclosing_stmt(#21276,#21272)
 exprContainers(#21276,#20001)
 #21278=*
 typeexprs(#21278,0,#21276,0,"Point")
 hasLocation(#21278,#20666)
-enclosingStmt(#21278,#21272)
+enclosing_stmt(#21278,#21272)
 exprContainers(#21278,#20001)
 literals("Point","Point",#21278)
 typebind(#21278,#20975)
 #21279=*
 typeexprs(#21279,3,#21276,1,"""x""")
 hasLocation(#21279,#20670)
-enclosingStmt(#21279,#21272)
+enclosing_stmt(#21279,#21272)
 exprContainers(#21279,#20001)
 literals("x","""x""",#21279)
 #21280=*
@@ -3864,12 +3864,12 @@ exprs(#21281,64,#21280,0,"typeofV ... eof x31")
 #21282=@"loc,{#10000},44,5,44,34"
 locations_default(#21282,#10000,44,5,44,34)
 hasLocation(#21281,#21282)
-enclosingStmt(#21281,#21280)
+enclosing_stmt(#21281,#21280)
 exprContainers(#21281,#20001)
 #21283=*
 exprs(#21283,78,#21281,0,"typeofVar")
 hasLocation(#21283,#20676)
-enclosingStmt(#21283,#21280)
+enclosing_stmt(#21283,#21280)
 exprContainers(#21283,#20001)
 literals("typeofVar","typeofVar",#21283)
 decl(#21283,#20964)
@@ -3878,12 +3878,12 @@ typeexprs(#21284,16,#21281,2,"typeof x31")
 #21285=@"loc,{#10000},44,25,44,34"
 locations_default(#21285,#10000,44,25,44,34)
 hasLocation(#21284,#21285)
-enclosingStmt(#21284,#21280)
+enclosing_stmt(#21284,#21280)
 exprContainers(#21284,#20001)
 #21286=*
 typeexprs(#21286,17,#21284,0,"x31")
 hasLocation(#21286,#20682)
-enclosingStmt(#21286,#21280)
+enclosing_stmt(#21286,#21280)
 exprContainers(#21286,#20001)
 literals("x31","x31",#21286)
 #21287=@"var;{x31};{#20000}"
@@ -3898,12 +3898,12 @@ exprs(#21289,64,#21288,0,"mappedV ... : any }")
 #21290=@"loc,{#10000},45,5,45,51"
 locations_default(#21290,#10000,45,5,45,51)
 hasLocation(#21289,#21290)
-enclosingStmt(#21289,#21288)
+enclosing_stmt(#21289,#21288)
 exprContainers(#21289,#20001)
 #21291=*
 exprs(#21291,78,#21289,0,"mappedVar")
 hasLocation(#21291,#20686)
-enclosingStmt(#21291,#21288)
+enclosing_stmt(#21291,#21288)
 exprContainers(#21291,#20001)
 literals("mappedVar","mappedVar",#21291)
 decl(#21291,#20965)
@@ -3912,7 +3912,7 @@ typeexprs(#21292,27,#21289,2,"{ [K in ... : any }")
 #21293=@"loc,{#10000},45,25,45,51"
 locations_default(#21293,#10000,45,25,45,51)
 hasLocation(#21292,#21293)
-enclosingStmt(#21292,#21288)
+enclosing_stmt(#21292,#21288)
 exprContainers(#21292,#20001)
 #21294=*
 scopes(#21294,13)
@@ -3925,12 +3925,12 @@ typeexprs(#21296,22,#21292,0,"K in keyof Point")
 #21297=@"loc,{#10000},45,28,45,43"
 locations_default(#21297,#10000,45,28,45,43)
 hasLocation(#21296,#21297)
-enclosingStmt(#21296,#21288)
+enclosing_stmt(#21296,#21288)
 exprContainers(#21296,#20001)
 #21298=*
 typeexprs(#21298,1,#21296,0,"K")
 hasLocation(#21298,#20694)
-enclosingStmt(#21298,#21288)
+enclosing_stmt(#21298,#21288)
 exprContainers(#21298,#20001)
 literals("K","K",#21298)
 typedecl(#21298,#21295)
@@ -3939,19 +3939,19 @@ typeexprs(#21299,12,#21296,1,"keyof Point")
 #21300=@"loc,{#10000},45,33,45,43"
 locations_default(#21300,#10000,45,33,45,43)
 hasLocation(#21299,#21300)
-enclosingStmt(#21299,#21288)
+enclosing_stmt(#21299,#21288)
 exprContainers(#21299,#20001)
 #21301=*
 typeexprs(#21301,0,#21299,0,"Point")
 hasLocation(#21301,#20700)
-enclosingStmt(#21301,#21288)
+enclosing_stmt(#21301,#21288)
 exprContainers(#21301,#20001)
 literals("Point","Point",#21301)
 typebind(#21301,#20975)
 #21302=*
 typeexprs(#21302,2,#21292,1,"any")
 hasLocation(#21302,#20706)
-enclosingStmt(#21302,#21288)
+enclosing_stmt(#21302,#21288)
 exprContainers(#21302,#20001)
 literals("any","any",#21302)
 #21303=*
@@ -3963,12 +3963,12 @@ exprs(#21304,64,#21303,0,"parenth ... number)")
 #21305=@"loc,{#10000},46,5,46,32"
 locations_default(#21305,#10000,46,5,46,32)
 hasLocation(#21304,#21305)
-enclosingStmt(#21304,#21303)
+enclosing_stmt(#21304,#21303)
 exprContainers(#21304,#20001)
 #21306=*
 exprs(#21306,78,#21304,0,"parenthesizedVar")
 hasLocation(#21306,#20712)
-enclosingStmt(#21306,#21303)
+enclosing_stmt(#21306,#21303)
 exprContainers(#21306,#20001)
 literals("parenthesizedVar","parenthesizedVar",#21306)
 decl(#21306,#20966)
@@ -3977,12 +3977,12 @@ typeexprs(#21307,10,#21304,2,"(number)")
 #21308=@"loc,{#10000},46,25,46,32"
 locations_default(#21308,#10000,46,25,46,32)
 hasLocation(#21307,#21308)
-enclosingStmt(#21307,#21303)
+enclosing_stmt(#21307,#21303)
 exprContainers(#21307,#20001)
 #21309=*
 typeexprs(#21309,2,#21307,0,"number")
 hasLocation(#21309,#20718)
-enclosingStmt(#21309,#21303)
+enclosing_stmt(#21309,#21303)
 exprContainers(#21309,#20001)
 literals("number","number",#21309)
 #21310=*
@@ -3994,12 +3994,12 @@ exprs(#21311,64,#21310,0,"namespa ... :   N.I")
 #21312=@"loc,{#10000},47,5,47,27"
 locations_default(#21312,#10000,47,5,47,27)
 hasLocation(#21311,#21312)
-enclosingStmt(#21311,#21310)
+enclosing_stmt(#21311,#21310)
 exprContainers(#21311,#20001)
 #21313=*
 exprs(#21313,78,#21311,0,"namespaceTypeVar")
 hasLocation(#21313,#20726)
-enclosingStmt(#21313,#21310)
+enclosing_stmt(#21313,#21310)
 exprContainers(#21313,#20001)
 literals("namespaceTypeVar","namespaceTypeVar",#21313)
 decl(#21313,#20967)
@@ -4008,19 +4008,19 @@ typeexprs(#21314,13,#21311,2,"N.I")
 #21315=@"loc,{#10000},47,25,47,27"
 locations_default(#21315,#10000,47,25,47,27)
 hasLocation(#21314,#21315)
-enclosingStmt(#21314,#21310)
+enclosing_stmt(#21314,#21310)
 exprContainers(#21314,#20001)
 #21316=*
 typeexprs(#21316,25,#21314,0,"N")
 hasLocation(#21316,#20730)
-enclosingStmt(#21316,#21310)
+enclosing_stmt(#21316,#21310)
 exprContainers(#21316,#20001)
 literals("N","N",#21316)
 namespacebind(#21316,#20970)
 #21317=*
 typeexprs(#21317,15,#21314,1,"I")
 hasLocation(#21317,#20734)
-enclosingStmt(#21317,#21310)
+enclosing_stmt(#21317,#21310)
 exprContainers(#21317,#20001)
 literals("I","I",#21317)
 #21318=*
@@ -4032,12 +4032,12 @@ exprs(#21319,64,#21318,0,"namespa ... number>")
 #21320=@"loc,{#10000},48,5,48,40"
 locations_default(#21320,#10000,48,5,48,40)
 hasLocation(#21319,#21320)
-enclosingStmt(#21319,#21318)
+enclosing_stmt(#21319,#21318)
 exprContainers(#21319,#20001)
 #21321=*
 exprs(#21321,78,#21319,0,"namespa ... TypeVar")
 hasLocation(#21321,#20740)
-enclosingStmt(#21321,#21318)
+enclosing_stmt(#21321,#21318)
 exprContainers(#21321,#20001)
 literals("namespaceGenericTypeVar","namespaceGenericTypeVar",#21321)
 decl(#21321,#20968)
@@ -4046,32 +4046,32 @@ typeexprs(#21322,14,#21319,2,"N.J<number>")
 #21323=@"loc,{#10000},48,30,48,40"
 locations_default(#21323,#10000,48,30,48,40)
 hasLocation(#21322,#21323)
-enclosingStmt(#21322,#21318)
+enclosing_stmt(#21322,#21318)
 exprContainers(#21322,#20001)
 #21324=*
 typeexprs(#21324,13,#21322,-1,"N.J")
 #21325=@"loc,{#10000},48,30,48,32"
 locations_default(#21325,#10000,48,30,48,32)
 hasLocation(#21324,#21325)
-enclosingStmt(#21324,#21318)
+enclosing_stmt(#21324,#21318)
 exprContainers(#21324,#20001)
 #21326=*
 typeexprs(#21326,25,#21324,0,"N")
 hasLocation(#21326,#20744)
-enclosingStmt(#21326,#21318)
+enclosing_stmt(#21326,#21318)
 exprContainers(#21326,#20001)
 literals("N","N",#21326)
 namespacebind(#21326,#20970)
 #21327=*
 typeexprs(#21327,15,#21324,1,"J")
 hasLocation(#21327,#20748)
-enclosingStmt(#21327,#21318)
+enclosing_stmt(#21327,#21318)
 exprContainers(#21327,#20001)
 literals("J","J",#21327)
 #21328=*
 typeexprs(#21328,2,#21322,0,"number")
 hasLocation(#21328,#20752)
-enclosingStmt(#21328,#21318)
+enclosing_stmt(#21328,#21318)
 exprContainers(#21328,#20001)
 literals("number","number",#21328)
 #21329=*
@@ -4089,19 +4089,19 @@ local_type_names(#21332,"T",#21331)
 #21333=*
 typeexprs(#21333,22,#21329,-2,"T")
 hasLocation(#21333,#20764)
-enclosingStmt(#21333,#21329)
+enclosing_stmt(#21333,#21329)
 exprContainers(#21333,#20001)
 #21334=*
 typeexprs(#21334,1,#21333,0,"T")
 hasLocation(#21334,#20764)
-enclosingStmt(#21334,#21329)
+enclosing_stmt(#21334,#21329)
 exprContainers(#21334,#20001)
 literals("T","T",#21334)
 typedecl(#21334,#21332)
 #21335=*
 typeexprs(#21335,1,#21329,0,"GenericInterface")
 hasLocation(#21335,#20760)
-enclosingStmt(#21335,#21329)
+enclosing_stmt(#21335,#21329)
 exprContainers(#21335,#20001)
 literals("GenericInterface","GenericInterface",#21335)
 typedecl(#21335,#20976)
@@ -4113,14 +4113,14 @@ hasLocation(#21336,#21337)
 #21338=*
 exprs(#21338,0,#21336,0,"field")
 hasLocation(#21338,#20770)
-enclosingStmt(#21338,#21329)
+enclosing_stmt(#21338,#21329)
 exprContainers(#21338,#20001)
 literals("field","field",#21338)
 isAbstractMember(#21336)
 #21339=*
 typeexprs(#21339,0,#21336,2,"T")
 hasLocation(#21339,#20774)
-enclosingStmt(#21339,#21329)
+enclosing_stmt(#21339,#21329)
 exprContainers(#21339,#20001)
 literals("T","T",#21339)
 typebind(#21339,#21332)
@@ -4132,13 +4132,13 @@ hasLocation(#21340,#21341)
 #21342=*
 exprs(#21342,0,#21340,0,"method")
 hasLocation(#21342,#20778)
-enclosingStmt(#21342,#21329)
+enclosing_stmt(#21342,#21329)
 exprContainers(#21342,#20001)
 literals("method","method",#21342)
 #21343=*
 exprs(#21343,9,#21340,1,"method(x: T): T;")
 hasLocation(#21343,#21341)
-enclosingStmt(#21343,#21329)
+enclosing_stmt(#21343,#21329)
 exprContainers(#21343,#20001)
 #21344=*
 scopes(#21344,1)
@@ -4179,7 +4179,7 @@ isAbstractClass(#21350)
 #21352=*
 exprs(#21352,78,#21350,0,"GenericClass")
 hasLocation(#21352,#20801)
-enclosingStmt(#21352,#21350)
+enclosing_stmt(#21352,#21350)
 exprContainers(#21352,#20001)
 literals("GenericClass","GenericClass",#21352)
 decl(#21352,#20971)
@@ -4193,12 +4193,12 @@ local_type_names(#21354,"T",#21353)
 #21355=*
 typeexprs(#21355,22,#21350,-3,"T")
 hasLocation(#21355,#20805)
-enclosingStmt(#21355,#21350)
+enclosing_stmt(#21355,#21350)
 exprContainers(#21355,#20001)
 #21356=*
 typeexprs(#21356,1,#21355,0,"T")
 hasLocation(#21356,#20805)
-enclosingStmt(#21356,#21350)
+enclosing_stmt(#21356,#21350)
 exprContainers(#21356,#20001)
 literals("T","T",#21356)
 typedecl(#21356,#21354)
@@ -4207,19 +4207,19 @@ typeexprs(#21357,14,#21350,-1,"GenericInterface<T>")
 #21358=@"loc,{#10000},54,43,54,61"
 locations_default(#21358,#10000,54,43,54,61)
 hasLocation(#21357,#21358)
-enclosingStmt(#21357,#21350)
+enclosing_stmt(#21357,#21350)
 exprContainers(#21357,#20001)
 #21359=*
 typeexprs(#21359,0,#21357,-1,"GenericInterface")
 hasLocation(#21359,#20811)
-enclosingStmt(#21359,#21350)
+enclosing_stmt(#21359,#21350)
 exprContainers(#21359,#20001)
 literals("GenericInterface","GenericInterface",#21359)
 typebind(#21359,#20976)
 #21360=*
 typeexprs(#21360,0,#21357,0,"T")
 hasLocation(#21360,#20815)
-enclosingStmt(#21360,#21350)
+enclosing_stmt(#21360,#21350)
 exprContainers(#21360,#20001)
 literals("T","T",#21360)
 typebind(#21360,#21354)
@@ -4237,7 +4237,7 @@ literals("field","field",#21364)
 #21365=*
 typeexprs(#21365,0,#21361,2,"T")
 hasLocation(#21365,#20825)
-enclosingStmt(#21365,#21350)
+enclosing_stmt(#21365,#21350)
 exprContainers(#21365,#20001)
 literals("T","T",#21365)
 typebind(#21365,#21354)
@@ -4249,13 +4249,13 @@ hasLocation(#21366,#21367)
 #21368=*
 exprs(#21368,0,#21366,0,"method")
 hasLocation(#21368,#20829)
-enclosingStmt(#21368,#21350)
+enclosing_stmt(#21368,#21350)
 exprContainers(#21368,#20001)
 literals("method","method",#21368)
 #21369=*
 exprs(#21369,9,#21366,1,"abstrac ... :T): T;")
 hasLocation(#21369,#21367)
-enclosingStmt(#21369,#21350)
+enclosing_stmt(#21369,#21350)
 exprContainers(#21369,#20001)
 #21370=*
 scopes(#21370,1)
@@ -4294,12 +4294,12 @@ hasLocation(#21376,#21377)
 #21378=*
 exprs(#21378,0,#21376,0,"constructor")
 hasLocation(#21378,#21377)
-enclosingStmt(#21378,#21350)
+enclosing_stmt(#21378,#21350)
 exprContainers(#21378,#20001)
 literals("constructor","constructor",#21378)
 exprs(#21363,9,#21376,1,"() {}")
 hasLocation(#21363,#21377)
-enclosingStmt(#21363,#21350)
+enclosing_stmt(#21363,#21350)
 exprContainers(#21363,#20001)
 #21379=*
 scopes(#21379,1)
@@ -4320,7 +4320,7 @@ stmt_containers(#21382,#20001)
 #21383=*
 exprs(#21383,78,#21382,0,"Fish")
 hasLocation(#21383,#20850)
-enclosingStmt(#21383,#21382)
+enclosing_stmt(#21383,#21382)
 exprContainers(#21383,#20001)
 literals("Fish","Fish",#21383)
 decl(#21383,#20972)
@@ -4337,13 +4337,13 @@ hasLocation(#21385,#21386)
 #21387=*
 exprs(#21387,0,#21385,0,"constructor")
 hasLocation(#21387,#21386)
-enclosingStmt(#21387,#21382)
+enclosing_stmt(#21387,#21382)
 exprContainers(#21387,#20001)
 literals("constructor","constructor",#21387)
 #21388=*
 exprs(#21388,9,#21385,1,"() {}")
 hasLocation(#21388,#21386)
-enclosingStmt(#21388,#21382)
+enclosing_stmt(#21388,#21382)
 exprContainers(#21388,#20001)
 #21389=*
 scopes(#21389,1)
@@ -4364,7 +4364,7 @@ stmt_containers(#21392,#20001)
 #21393=*
 exprs(#21393,78,#21392,0,"Bird")
 hasLocation(#21393,#20858)
-enclosingStmt(#21393,#21392)
+enclosing_stmt(#21393,#21392)
 exprContainers(#21393,#20001)
 literals("Bird","Bird",#21393)
 decl(#21393,#20973)
@@ -4381,13 +4381,13 @@ hasLocation(#21395,#21396)
 #21397=*
 exprs(#21397,0,#21395,0,"constructor")
 hasLocation(#21397,#21396)
-enclosingStmt(#21397,#21392)
+enclosing_stmt(#21397,#21392)
 exprContainers(#21397,#20001)
 literals("constructor","constructor",#21397)
 #21398=*
 exprs(#21398,9,#21395,1,"() {}")
 hasLocation(#21398,#21396)
-enclosingStmt(#21398,#21392)
+enclosing_stmt(#21398,#21392)
 exprContainers(#21398,#20001)
 #21399=*
 scopes(#21399,1)
@@ -4477,7 +4477,7 @@ stmt_containers(#21418,#20001)
 #21420=*
 exprs(#21420,78,#21418,0,"ThisTypes")
 hasLocation(#21420,#20896)
-enclosingStmt(#21420,#21418)
+enclosing_stmt(#21420,#21418)
 exprContainers(#21420,#20001)
 literals("ThisTypes","ThisTypes",#21420)
 decl(#21420,#20974)
@@ -4494,13 +4494,13 @@ hasLocation(#21422,#21423)
 #21424=*
 exprs(#21424,0,#21422,0,"foo")
 hasLocation(#21424,#20900)
-enclosingStmt(#21424,#21418)
+enclosing_stmt(#21424,#21418)
 exprContainers(#21424,#20001)
 literals("foo","foo",#21424)
 #21425=*
 exprs(#21425,9,#21422,1,"foo(x:  ... this; }")
 hasLocation(#21425,#21423)
-enclosingStmt(#21425,#21418)
+enclosing_stmt(#21425,#21418)
 exprContainers(#21425,#20001)
 #21426=*
 scopes(#21426,1)
@@ -4542,7 +4542,7 @@ stmt_containers(#21434,#21425)
 #21436=*
 exprs(#21436,6,#21434,0,"this")
 hasLocation(#21436,#20920)
-enclosingStmt(#21436,#21434)
+enclosing_stmt(#21436,#21434)
 exprContainers(#21436,#21425)
 isMethod(#21422)
 #21437=*
@@ -4553,13 +4553,13 @@ hasLocation(#21437,#21438)
 #21439=*
 exprs(#21439,0,#21437,0,"constructor")
 hasLocation(#21439,#21438)
-enclosingStmt(#21439,#21418)
+enclosing_stmt(#21439,#21418)
 exprContainers(#21439,#20001)
 literals("constructor","constructor",#21439)
 #21440=*
 exprs(#21440,9,#21437,1,"() {}")
 hasLocation(#21440,#21438)
-enclosingStmt(#21440,#21418)
+enclosing_stmt(#21440,#21418)
 exprContainers(#21440,#20001)
 #21441=*
 scopes(#21441,1)
diff --git a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
index 7dadaaa22e3..c45e7203b08 100644
--- a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
@@ -61,19 +61,19 @@ exprs(#20019,64,#20018,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1
 #20020=@"loc,{#10000},1,5,1,81"
 locations_default(#20020,#10000,1,5,1,81)
 hasLocation(#20019,#20020)
-enclosingStmt(#20019,#20018)
+enclosing_stmt(#20019,#20018)
 exprContainers(#20019,#20001)
 #20021=*
 exprs(#20021,78,#20019,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... Abcd123")
 hasLocation(#20021,#20007)
-enclosingStmt(#20021,#20018)
+enclosing_stmt(#20021,#20018)
 exprContainers(#20021,#20001)
 literals("才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123","才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20021)
 decl(#20021,#20017)
 #20022=*
 exprs(#20022,3,#20019,1,"1")
 hasLocation(#20022,#20011)
-enclosingStmt(#20022,#20018)
+enclosing_stmt(#20022,#20018)
 exprContainers(#20022,#20001)
 literals("1","1",#20022)
 #20023=*
diff --git a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
index 8b3c1e69ec9..fd69d4dfd7c 100644
--- a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
@@ -592,7 +592,7 @@ stmt_containers(#20212,#20001)
 #20214=*
 exprs(#20214,78,#20212,-1,"Wrapper")
 hasLocation(#20214,#20059)
-enclosingStmt(#20214,#20212)
+enclosing_stmt(#20214,#20212)
 exprContainers(#20214,#20001)
 literals("Wrapper","Wrapper",#20214)
 decl(#20214,#20210)
@@ -630,7 +630,7 @@ stmt_containers(#20226,#20212)
 #20228=*
 exprs(#20228,78,#20226,-1,"Empty")
 hasLocation(#20228,#20065)
-enclosingStmt(#20228,#20226)
+enclosing_stmt(#20228,#20226)
 exprContainers(#20228,#20212)
 literals("Empty","Empty",#20228)
 namespacedecl(#20228,#20219)
@@ -647,7 +647,7 @@ stmt_containers(#20230,#20212)
 #20232=*
 exprs(#20232,78,#20230,-1,"Comments")
 hasLocation(#20232,#20073)
-enclosingStmt(#20232,#20230)
+enclosing_stmt(#20232,#20230)
 exprContainers(#20232,#20212)
 literals("Comments","Comments",#20232)
 namespacedecl(#20232,#20220)
@@ -664,7 +664,7 @@ stmt_containers(#20234,#20212)
 #20236=*
 exprs(#20236,78,#20234,-1,"Outer")
 hasLocation(#20236,#20081)
-enclosingStmt(#20236,#20234)
+enclosing_stmt(#20236,#20234)
 exprContainers(#20236,#20212)
 literals("Outer","Outer",#20236)
 namespacedecl(#20236,#20221)
@@ -683,7 +683,7 @@ stmt_containers(#20239,#20234)
 #20241=*
 exprs(#20241,78,#20239,-1,"Inner")
 hasLocation(#20241,#20087)
-enclosingStmt(#20241,#20239)
+enclosing_stmt(#20241,#20239)
 exprContainers(#20241,#20234)
 literals("Inner","Inner",#20241)
 namespacedecl(#20241,#20238)
@@ -700,7 +700,7 @@ stmt_containers(#20243,#20212)
 #20245=*
 exprs(#20245,78,#20243,-1,"Outer2")
 hasLocation(#20245,#20097)
-enclosingStmt(#20245,#20243)
+enclosing_stmt(#20245,#20243)
 exprContainers(#20245,#20212)
 literals("Outer2","Outer2",#20245)
 namespacedecl(#20245,#20222)
@@ -725,7 +725,7 @@ stmt_containers(#20250,#20243)
 #20252=*
 exprs(#20252,78,#20250,-1,"Inner")
 hasLocation(#20252,#20105)
-enclosingStmt(#20252,#20250)
+enclosing_stmt(#20252,#20250)
 exprContainers(#20252,#20243)
 literals("Inner","Inner",#20252)
 namespacedecl(#20252,#20247)
@@ -742,7 +742,7 @@ stmt_containers(#20254,#20212)
 #20256=*
 exprs(#20256,78,#20254,-1,"Interfaces")
 hasLocation(#20256,#20115)
-enclosingStmt(#20256,#20254)
+enclosing_stmt(#20256,#20254)
 exprContainers(#20256,#20212)
 literals("Interfaces","Interfaces",#20256)
 namespacedecl(#20256,#20223)
@@ -761,7 +761,7 @@ stmt_containers(#20259,#20254)
 #20261=*
 typeexprs(#20261,1,#20259,0,"I")
 hasLocation(#20261,#20121)
-enclosingStmt(#20261,#20259)
+enclosing_stmt(#20261,#20259)
 exprContainers(#20261,#20254)
 literals("I","I",#20261)
 typedecl(#20261,#20258)
@@ -773,14 +773,14 @@ hasLocation(#20262,#20263)
 #20264=*
 exprs(#20264,0,#20262,0,"x")
 hasLocation(#20264,#20125)
-enclosingStmt(#20264,#20259)
+enclosing_stmt(#20264,#20259)
 exprContainers(#20264,#20254)
 literals("x","x",#20264)
 isAbstractMember(#20262)
 #20265=*
 typeexprs(#20265,2,#20262,2,"number")
 hasLocation(#20265,#20129)
-enclosingStmt(#20265,#20259)
+enclosing_stmt(#20265,#20259)
 exprContainers(#20265,#20254)
 literals("number","number",#20265)
 #20266=*
@@ -791,13 +791,13 @@ hasLocation(#20266,#20267)
 #20268=*
 exprs(#20268,0,#20266,0,"foo")
 hasLocation(#20268,#20133)
-enclosingStmt(#20268,#20259)
+enclosing_stmt(#20268,#20259)
 exprContainers(#20268,#20254)
 literals("foo","foo",#20268)
 #20269=*
 exprs(#20269,9,#20266,1,"foo(): number;")
 hasLocation(#20269,#20267)
-enclosingStmt(#20269,#20259)
+enclosing_stmt(#20269,#20259)
 exprContainers(#20269,#20254)
 #20270=*
 scopes(#20270,1)
@@ -822,7 +822,7 @@ stmt_containers(#20273,#20212)
 #20275=*
 exprs(#20275,78,#20273,-1,"EmptyStatement")
 hasLocation(#20275,#20151)
-enclosingStmt(#20275,#20273)
+enclosing_stmt(#20275,#20273)
 exprContainers(#20275,#20212)
 literals("EmptyStatement","EmptyStatement",#20275)
 decl(#20275,#20216)
@@ -845,7 +845,7 @@ stmt_containers(#20278,#20212)
 #20280=*
 exprs(#20280,78,#20278,-1,"EmptyBlock")
 hasLocation(#20280,#20161)
-enclosingStmt(#20280,#20278)
+enclosing_stmt(#20280,#20278)
 exprContainers(#20280,#20212)
 literals("EmptyBlock","EmptyBlock",#20280)
 decl(#20280,#20217)
@@ -872,12 +872,12 @@ exprs(#20286,64,#20284,0,"x = [Em ... yBlock]")
 #20287=@"loc,{#10000},24,7,24,82"
 locations_default(#20287,#10000,24,7,24,82)
 hasLocation(#20286,#20287)
-enclosingStmt(#20286,#20284)
+enclosing_stmt(#20286,#20284)
 exprContainers(#20286,#20212)
 #20288=*
 exprs(#20288,78,#20286,0,"x")
 hasLocation(#20288,#20173)
-enclosingStmt(#20288,#20284)
+enclosing_stmt(#20288,#20284)
 exprContainers(#20288,#20212)
 literals("x","x",#20288)
 decl(#20288,#20218)
@@ -886,12 +886,12 @@ exprs(#20289,7,#20286,1,"[Empty, ... yBlock]")
 #20290=@"loc,{#10000},24,11,24,82"
 locations_default(#20290,#10000,24,11,24,82)
 hasLocation(#20289,#20290)
-enclosingStmt(#20289,#20284)
+enclosing_stmt(#20289,#20284)
 exprContainers(#20289,#20212)
 #20291=*
 exprs(#20291,79,#20289,0,"Empty")
 hasLocation(#20291,#20179)
-enclosingStmt(#20291,#20284)
+enclosing_stmt(#20291,#20284)
 exprContainers(#20291,#20212)
 literals("Empty","Empty",#20291)
 #20292=@"var;{Empty};{#20000}"
@@ -900,7 +900,7 @@ bind(#20291,#20292)
 #20293=*
 exprs(#20293,79,#20289,1,"Comments")
 hasLocation(#20293,#20183)
-enclosingStmt(#20293,#20284)
+enclosing_stmt(#20293,#20284)
 exprContainers(#20293,#20212)
 literals("Comments","Comments",#20293)
 #20294=@"var;{Comments};{#20000}"
@@ -909,7 +909,7 @@ bind(#20293,#20294)
 #20295=*
 exprs(#20295,79,#20289,2,"Outer")
 hasLocation(#20295,#20187)
-enclosingStmt(#20295,#20284)
+enclosing_stmt(#20295,#20284)
 exprContainers(#20295,#20212)
 literals("Outer","Outer",#20295)
 #20296=@"var;{Outer};{#20000}"
@@ -918,7 +918,7 @@ bind(#20295,#20296)
 #20297=*
 exprs(#20297,79,#20289,3,"Outer2")
 hasLocation(#20297,#20191)
-enclosingStmt(#20297,#20284)
+enclosing_stmt(#20297,#20284)
 exprContainers(#20297,#20212)
 literals("Outer2","Outer2",#20297)
 #20298=@"var;{Outer2};{#20000}"
@@ -927,7 +927,7 @@ bind(#20297,#20298)
 #20299=*
 exprs(#20299,79,#20289,4,"Interfaces")
 hasLocation(#20299,#20195)
-enclosingStmt(#20299,#20284)
+enclosing_stmt(#20299,#20284)
 exprContainers(#20299,#20212)
 literals("Interfaces","Interfaces",#20299)
 #20300=@"var;{Interfaces};{#20000}"
@@ -936,14 +936,14 @@ bind(#20299,#20300)
 #20301=*
 exprs(#20301,79,#20289,5,"EmptyStatement")
 hasLocation(#20301,#20199)
-enclosingStmt(#20301,#20284)
+enclosing_stmt(#20301,#20284)
 exprContainers(#20301,#20212)
 literals("EmptyStatement","EmptyStatement",#20301)
 bind(#20301,#20216)
 #20302=*
 exprs(#20302,79,#20289,6,"EmptyBlock")
 hasLocation(#20302,#20203)
-enclosingStmt(#20302,#20284)
+enclosing_stmt(#20302,#20284)
 exprContainers(#20302,#20212)
 literals("EmptyBlock","EmptyBlock",#20302)
 bind(#20302,#20217)
diff --git a/javascript/extractor/tests/v8/output/trap/tst.js.trap b/javascript/extractor/tests/v8/output/trap/tst.js.trap
index 8fdd7f6a612..112293b2c43 100644
--- a/javascript/extractor/tests/v8/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/v8/output/trap/tst.js.trap
@@ -114,14 +114,14 @@ exprs(#20040,13,#20039,0,"%CheckI ... pping()")
 #20041=@"loc,{#10000},1,1,1,23"
 locations_default(#20041,#10000,1,1,1,23)
 hasLocation(#20040,#20041)
-enclosingStmt(#20040,#20039)
+enclosing_stmt(#20040,#20039)
 exprContainers(#20040,#20001)
 #20042=*
 exprs(#20042,79,#20040,-1,"%CheckI ... rapping")
 #20043=@"loc,{#10000},1,1,1,21"
 locations_default(#20043,#10000,1,1,1,21)
 hasLocation(#20042,#20043)
-enclosingStmt(#20042,#20039)
+enclosing_stmt(#20042,#20039)
 exprContainers(#20042,#20001)
 literals("%CheckIsBootstrapping","%CheckIsBootstrapping",#20042)
 #20044=@"var;{%CheckIsBootstrapping};{#20000}"
@@ -136,12 +136,12 @@ exprs(#20046,38,#20045,0,"a%%NumberAdd(1, 2)")
 #20047=@"loc,{#10000},2,1,2,18"
 locations_default(#20047,#10000,2,1,2,18)
 hasLocation(#20046,#20047)
-enclosingStmt(#20046,#20045)
+enclosing_stmt(#20046,#20045)
 exprContainers(#20046,#20001)
 #20048=*
 exprs(#20048,79,#20046,0,"a")
 hasLocation(#20048,#20017)
-enclosingStmt(#20048,#20045)
+enclosing_stmt(#20048,#20045)
 exprContainers(#20048,#20001)
 literals("a","a",#20048)
 #20049=@"var;{a};{#20000}"
@@ -152,14 +152,14 @@ exprs(#20050,13,#20046,1,"%NumberAdd(1, 2)")
 #20051=@"loc,{#10000},2,3,2,18"
 locations_default(#20051,#10000,2,3,2,18)
 hasLocation(#20050,#20051)
-enclosingStmt(#20050,#20045)
+enclosing_stmt(#20050,#20045)
 exprContainers(#20050,#20001)
 #20052=*
 exprs(#20052,79,#20050,-1,"%NumberAdd")
 #20053=@"loc,{#10000},2,3,2,12"
 locations_default(#20053,#10000,2,3,2,12)
 hasLocation(#20052,#20053)
-enclosingStmt(#20052,#20045)
+enclosing_stmt(#20052,#20045)
 exprContainers(#20052,#20001)
 literals("%NumberAdd","%NumberAdd",#20052)
 #20054=@"var;{%NumberAdd};{#20000}"
@@ -168,13 +168,13 @@ bind(#20052,#20054)
 #20055=*
 exprs(#20055,3,#20050,0,"1")
 hasLocation(#20055,#20027)
-enclosingStmt(#20055,#20045)
+enclosing_stmt(#20055,#20045)
 exprContainers(#20055,#20001)
 literals("1","1",#20055)
 #20056=*
 exprs(#20056,3,#20050,1,"2")
 hasLocation(#20056,#20031)
-enclosingStmt(#20056,#20045)
+enclosing_stmt(#20056,#20045)
 exprContainers(#20056,#20001)
 literals("2","2",#20056)
 #20057=*
diff --git a/javascript/extractor/tests/variables/output/trap/const.js.trap b/javascript/extractor/tests/variables/output/trap/const.js.trap
index de5960ffa8c..53c3568e300 100644
--- a/javascript/extractor/tests/variables/output/trap/const.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/const.js.trap
@@ -58,19 +58,19 @@ exprs(#20018,64,#20017,0,"answer = 42")
 #20019=@"loc,{#10000},1,7,1,17"
 locations_default(#20019,#10000,1,7,1,17)
 hasLocation(#20018,#20019)
-enclosingStmt(#20018,#20017)
+enclosing_stmt(#20018,#20017)
 exprContainers(#20018,#20001)
 #20020=*
 exprs(#20020,78,#20018,0,"answer")
 hasLocation(#20020,#20007)
-enclosingStmt(#20020,#20017)
+enclosing_stmt(#20020,#20017)
 exprContainers(#20020,#20001)
 literals("answer","answer",#20020)
 decl(#20020,#20016)
 #20021=*
 exprs(#20021,3,#20018,1,"42")
 hasLocation(#20021,#20011)
-enclosingStmt(#20021,#20017)
+enclosing_stmt(#20021,#20017)
 exprContainers(#20021,#20001)
 literals("42","42",#20021)
 #20022=*
diff --git a/javascript/extractor/tests/variables/output/trap/finally.js.trap b/javascript/extractor/tests/variables/output/trap/finally.js.trap
index 696d568f5f0..44af40888fc 100644
--- a/javascript/extractor/tests/variables/output/trap/finally.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/finally.js.trap
@@ -272,12 +272,12 @@ stmt_containers(#20089,#20075)
 #20091=*
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20053)
-enclosingStmt(#20091,#20089)
+enclosing_stmt(#20091,#20089)
 exprContainers(#20091,#20075)
 #20092=*
 exprs(#20092,78,#20091,0,"x")
 hasLocation(#20092,#20053)
-enclosingStmt(#20092,#20089)
+enclosing_stmt(#20092,#20089)
 exprContainers(#20092,#20075)
 literals("x","x",#20092)
 decl(#20092,#20079)
diff --git a/javascript/extractor/tests/variables/output/trap/switch.js.trap b/javascript/extractor/tests/variables/output/trap/switch.js.trap
index 4cdbf834fa9..a4ed6c53ade 100644
--- a/javascript/extractor/tests/variables/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/switch.js.trap
@@ -180,7 +180,7 @@ stmt_containers(#20059,#20051)
 #20061=*
 exprs(#20061,3,#20059,-1,"0")
 hasLocation(#20061,#20029)
-enclosingStmt(#20061,#20059)
+enclosing_stmt(#20061,#20059)
 exprContainers(#20061,#20051)
 literals("0","0",#20061)
 #20062=*
@@ -198,12 +198,12 @@ stmt_containers(#20064,#20051)
 #20066=*
 exprs(#20066,64,#20064,0,"i")
 hasLocation(#20066,#20041)
-enclosingStmt(#20066,#20064)
+enclosing_stmt(#20066,#20064)
 exprContainers(#20066,#20051)
 #20067=*
 exprs(#20067,78,#20066,0,"i")
 hasLocation(#20067,#20041)
-enclosingStmt(#20067,#20064)
+enclosing_stmt(#20067,#20064)
 exprContainers(#20067,#20051)
 literals("i","i",#20067)
 decl(#20067,#20055)
diff --git a/javascript/extractor/tests/variables/output/trap/try.js.trap b/javascript/extractor/tests/variables/output/trap/try.js.trap
index 86cc5df6d77..d8336b0edb0 100644
--- a/javascript/extractor/tests/variables/output/trap/try.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/try.js.trap
@@ -172,12 +172,12 @@ stmt_containers(#20056,#20045)
 #20058=*
 exprs(#20058,64,#20056,0,"x")
 hasLocation(#20058,#20029)
-enclosingStmt(#20058,#20056)
+enclosing_stmt(#20058,#20056)
 exprContainers(#20058,#20045)
 #20059=*
 exprs(#20059,78,#20058,0,"x")
 hasLocation(#20059,#20029)
-enclosingStmt(#20059,#20056)
+enclosing_stmt(#20059,#20056)
 exprContainers(#20059,#20045)
 literals("x","x",#20059)
 decl(#20059,#20048)
diff --git a/javascript/extractor/tests/variables/output/trap/variables.js.trap b/javascript/extractor/tests/variables/output/trap/variables.js.trap
index 3c431c1f004..94650215219 100644
--- a/javascript/extractor/tests/variables/output/trap/variables.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/variables.js.trap
@@ -413,12 +413,12 @@ stmt_containers(#20149,#20001)
 #20150=*
 exprs(#20150,64,#20149,0,"global")
 hasLocation(#20150,#20043)
-enclosingStmt(#20150,#20149)
+enclosing_stmt(#20150,#20149)
 exprContainers(#20150,#20001)
 #20151=*
 exprs(#20151,78,#20150,0,"global")
 hasLocation(#20151,#20043)
-enclosingStmt(#20151,#20149)
+enclosing_stmt(#20151,#20149)
 exprContainers(#20151,#20001)
 literals("global","global",#20151)
 decl(#20151,#20145)
@@ -431,12 +431,12 @@ exprs(#20153,47,#20152,0,"also_a_global = 23")
 #20154=@"loc,{#10000},2,1,2,18"
 locations_default(#20154,#10000,2,1,2,18)
 hasLocation(#20153,#20154)
-enclosingStmt(#20153,#20152)
+enclosing_stmt(#20153,#20152)
 exprContainers(#20153,#20001)
 #20155=*
 exprs(#20155,79,#20153,0,"also_a_global")
 hasLocation(#20155,#20047)
-enclosingStmt(#20155,#20152)
+enclosing_stmt(#20155,#20152)
 exprContainers(#20155,#20001)
 literals("also_a_global","also_a_global",#20155)
 #20156=@"var;{also_a_global};{#20000}"
@@ -445,7 +445,7 @@ bind(#20155,#20156)
 #20157=*
 exprs(#20157,3,#20153,1,"23")
 hasLocation(#20157,#20051)
-enclosingStmt(#20157,#20152)
+enclosing_stmt(#20157,#20152)
 exprContainers(#20157,#20001)
 literals("23","23",#20157)
 #20158=*
@@ -455,7 +455,7 @@ stmt_containers(#20158,#20001)
 #20159=*
 exprs(#20159,79,#20158,0,"global")
 hasLocation(#20159,#20055)
-enclosingStmt(#20159,#20158)
+enclosing_stmt(#20159,#20158)
 exprContainers(#20159,#20001)
 literals("global","global",#20159)
 bind(#20159,#20145)
@@ -466,7 +466,7 @@ stmt_containers(#20160,#20001)
 #20161=*
 exprs(#20161,79,#20160,0,"another_global")
 hasLocation(#20161,#20059)
-enclosingStmt(#20161,#20160)
+enclosing_stmt(#20161,#20160)
 exprContainers(#20161,#20001)
 literals("another_global","another_global",#20161)
 bind(#20161,#20146)
@@ -485,12 +485,12 @@ stmt_containers(#20164,#20001)
 #20166=*
 exprs(#20166,64,#20164,0,"another_global")
 hasLocation(#20166,#20066)
-enclosingStmt(#20166,#20164)
+enclosing_stmt(#20166,#20164)
 exprContainers(#20166,#20001)
 #20167=*
 exprs(#20167,78,#20166,0,"another_global")
 hasLocation(#20167,#20066)
-enclosingStmt(#20167,#20164)
+enclosing_stmt(#20167,#20164)
 exprContainers(#20167,#20001)
 literals("another_global","another_global",#20167)
 decl(#20167,#20146)
@@ -530,12 +530,12 @@ stmt_containers(#20176,#20168)
 #20178=*
 exprs(#20178,64,#20176,0,"x")
 hasLocation(#20178,#20083)
-enclosingStmt(#20178,#20176)
+enclosing_stmt(#20178,#20176)
 exprContainers(#20178,#20168)
 #20179=*
 exprs(#20179,78,#20178,0,"x")
 hasLocation(#20179,#20083)
-enclosingStmt(#20179,#20176)
+enclosing_stmt(#20179,#20176)
 exprContainers(#20179,#20168)
 literals("x","x",#20179)
 decl(#20179,#20172)
@@ -548,7 +548,7 @@ stmt_containers(#20180,#20168)
 #20182=*
 exprs(#20182,79,#20180,0,"x")
 hasLocation(#20182,#20087)
-enclosingStmt(#20182,#20180)
+enclosing_stmt(#20182,#20180)
 exprContainers(#20182,#20168)
 literals("x","x",#20182)
 bind(#20182,#20172)
@@ -590,7 +590,7 @@ stmt_containers(#20192,#20183)
 #20194=*
 exprs(#20194,79,#20192,0,"x")
 hasLocation(#20194,#20102)
-enclosingStmt(#20194,#20192)
+enclosing_stmt(#20194,#20192)
 exprContainers(#20194,#20183)
 literals("x","x",#20194)
 bind(#20194,#20187)
@@ -603,12 +603,12 @@ stmt_containers(#20195,#20183)
 #20197=*
 exprs(#20197,64,#20195,0,"x")
 hasLocation(#20197,#20108)
-enclosingStmt(#20197,#20195)
+enclosing_stmt(#20197,#20195)
 exprContainers(#20197,#20183)
 #20198=*
 exprs(#20198,78,#20197,0,"x")
 hasLocation(#20198,#20108)
-enclosingStmt(#20198,#20195)
+enclosing_stmt(#20198,#20195)
 exprContainers(#20198,#20183)
 literals("x","x",#20198)
 decl(#20198,#20187)
@@ -652,14 +652,14 @@ stmt_containers(#20208,#20183)
 #20210=*
 exprs(#20210,18,#20208,0,"!function k() {}")
 hasLocation(#20210,#20209)
-enclosingStmt(#20210,#20208)
+enclosing_stmt(#20210,#20208)
 exprContainers(#20210,#20183)
 #20211=*
 exprs(#20211,9,#20210,0,"function k() {}")
 #20212=@"loc,{#10000},17,4,17,18"
 locations_default(#20212,#10000,17,4,17,18)
 hasLocation(#20211,#20212)
-enclosingStmt(#20211,#20208)
+enclosing_stmt(#20211,#20208)
 exprContainers(#20211,#20183)
 #20213=*
 scopes(#20213,1)
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index 631131a1a0f..f904f6efb17 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -115,3 +115,8 @@ deprecated predicate hasDeclareKeyword(ASTNode stmt) { has_declare_keyword(stmt)
  * Use `ForOfStmt#isAwait()` instead.
  */ 
 deprecated predicate isForAwaitOf(ForOfStmt forof) { is_for_await_of(forof) }
+/**
+ * Alias for the predicate `enclosing_stmt` defined in the .dbscheme.
+ * Use `ExprOrType#getEnclosingStmt` instead.
+ */ 
+deprecated predicate enclosingStmt(ExprOrType expr, Stmt stmt) { enclosing_stmt(expr, stmt) }
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
index 53546033e87..4c9592e275f 100644
--- a/javascript/ql/src/semmle/javascript/Expr.qll
+++ b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -16,7 +16,7 @@ import javascript
  */
 class ExprOrType extends @exprortype, Documentable {
   /** Gets the statement in which this expression or type appears. */
-  Stmt getEnclosingStmt() { enclosingStmt(this, result) }
+  Stmt getEnclosingStmt() { enclosing_stmt(this, result) }
 
   /** Gets the function in which this expression or type appears, if any. */
   Function getEnclosingFunction() { result = getContainer() }
@@ -238,7 +238,7 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
   pragma[inline]
   private Stmt getRawEnclosingStmt(Expr e) {
     // For performance reasons, we need the enclosing statement without overrides
-    enclosingStmt(e, result)
+    enclosing_stmt(e, result)
   }
 
   /**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 7dcf9f928b9..fafc648a9df 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -217,7 +217,7 @@ literals (varchar(900) value: string ref,
        varchar(900) raw: string ref,
        unique int expr: @exprortype ref);
        
-enclosingStmt (unique int expr: @exprortype ref,
+enclosing_stmt (unique int expr: @exprortype ref,
        int stmt: @stmt ref);
 
 exprContainers (unique int expr: @exprortype ref,
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index 032056e1443..ce7600770f9 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -11187,7 +11187,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>enclosingStmt</name>
+<name>enclosing_stmt</name>
 <cardinality>5372899</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index fb0a58cc3e8..d8165ac2502 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -20,3 +20,5 @@ has_declare_keyword.rel: reorder hasDeclareKeyword.rel(int stmt) stmt
 hasDeclareKeyword.rel: delete
 is_for_await_of.rel: reorder isForAwaitOf.rel(int forof) forof
 isForAwaitOf.rel: delete
+enclosing_stmt.rel: reorder enclosingStmt.rel(int expr, int stmt) expr stmt
+enclosingStmt.rel: delete