diff --git a/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/old.dbscheme b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/old.dbscheme
new file mode 100644
index 000000000000..49e6663bb7d4
--- /dev/null
+++ b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/old.dbscheme
@@ -0,0 +1,1220 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+has_parentheses (unique int expr: @expr ref,
+       int depth: int ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access | @this_expr;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/semmlecode.javascript.dbscheme b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..26a123164be8
--- /dev/null
+++ b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/semmlecode.javascript.dbscheme
@@ -0,0 +1,1217 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access | @this_expr;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/upgrade.properties b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/upgrade.properties
new file mode 100644
index 000000000000..94f4403e1dfd
--- /dev/null
+++ b/javascript/downgrades/49e6663bb7d470c5f0e8e4bcef0ac01a8fb1a30a/upgrade.properties
@@ -0,0 +1,4 @@
+description: Remove parenthesized expression from AST, add has_parentheses relation
+compatibility: partial
+
+has_parentheses.rel: delete
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index b4739b061fb2..bcd4aea43c0d 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1473,9 +1473,18 @@ public Label visit(SequenceExpression nd, Context c) {
 
     @Override
     public Label visit(ParenthesizedExpression nd, Context c) {
-      Label key = super.visit(nd, c);
-      visit(nd.getExpression(), key, 0, IdContext.VAR_BIND);
-      return key;
+      // Bypass the parenthesized expression node: visit the inner expression
+      // with the parent's context so it takes the place of the ParExpr in the tree.
+      // Count nested parentheses so that ((x)) results in depth 2.
+      int depth = 1;
+      Expression inner = nd.getExpression();
+      while (inner instanceof ParenthesizedExpression) {
+        depth++;
+        inner = ((ParenthesizedExpression) inner).getExpression();
+      }
+      Label innerLabel = inner.accept(this, c);
+      trapwriter.addTuple("has_parentheses", innerLabel, depth);
+      return innerLabel;
     }
 
     @Override
diff --git a/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
index 72dac30c933b..285769288eda 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/CFGExtractor.java
@@ -537,6 +537,11 @@ public Node visit(XMLDotDotExpression nd, Void c) {
       return nd.getLeft().accept(this, c);
     }
 
+    @Override
+    public Node visit(ParenthesizedExpression nd, Void c) {
+      return nd.getExpression().accept(this, c);
+    }
+
     public static Node of(Node nd) {
       return nd.accept(new First(), null);
     }
@@ -1299,7 +1304,7 @@ public Void visit(ExpressionStatement nd, SuccessorInfo i) {
 
     @Override
     public Void visit(ParenthesizedExpression nd, SuccessorInfo i) {
-      writeSuccessor(nd, First.of(nd.getExpression()));
+      // Bypass parenthesized expression - it has no DB entry, so just delegate to the inner expression
       return nd.getExpression().accept(this, i);
     }
 
@@ -1773,6 +1778,10 @@ private void preVisitChainable(Chainable chainable, Expression base, SuccessorIn
 
     private void postVisitChainable(Chainable chainable, Expression base, boolean optional) {
       if (optional) {
+        // Unwrap parenthesized expressions since they have no DB entry.
+        while (base instanceof ParenthesizedExpression) {
+          base = ((ParenthesizedExpression) base).getExpression();
+        }
         writeSuccessors(base, chainRootSuccessors.get(chainable).getSuccessors(false));
       }
       chainRootSuccessors.remove(chainable);
diff --git a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
index 572ddd8cfa81..629787caf758 100644
--- a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
@@ -96,125 +96,118 @@ hasLocation(#20032,#20033)
 enclosing_stmt(#20032,#20031)
 expr_containers(#20032,#20001)
 #20034=*
-exprs(#20034,63,#20032,0,"(a ? b || c : d)")
-#20035=@"loc,{#10000},1,1,1,16"
-locations_default(#20035,#10000,1,1,1,16)
+exprs(#20034,11,#20032,0,"a ? b || c : d")
+#20035=@"loc,{#10000},1,2,1,15"
+locations_default(#20035,#10000,1,2,1,15)
 hasLocation(#20034,#20035)
 enclosing_stmt(#20034,#20031)
 expr_containers(#20034,#20001)
 #20036=*
-exprs(#20036,11,#20034,0,"a ? b || c : d")
-#20037=@"loc,{#10000},1,2,1,15"
-locations_default(#20037,#10000,1,2,1,15)
-hasLocation(#20036,#20037)
+exprs(#20036,79,#20034,0,"a")
+hasLocation(#20036,#20007)
 enclosing_stmt(#20036,#20031)
 expr_containers(#20036,#20001)
+literals("a","a",#20036)
+#20037=@"var;{a};{#20000}"
+variables(#20037,"a",#20000)
+bind(#20036,#20037)
 #20038=*
-exprs(#20038,79,#20036,0,"a")
-hasLocation(#20038,#20007)
+exprs(#20038,45,#20034,1,"b || c")
+#20039=@"loc,{#10000},1,6,1,11"
+locations_default(#20039,#10000,1,6,1,11)
+hasLocation(#20038,#20039)
 enclosing_stmt(#20038,#20031)
 expr_containers(#20038,#20001)
-literals("a","a",#20038)
-#20039=@"var;{a};{#20000}"
-variables(#20039,"a",#20000)
-bind(#20038,#20039)
 #20040=*
-exprs(#20040,45,#20036,1,"b || c")
-#20041=@"loc,{#10000},1,6,1,11"
-locations_default(#20041,#10000,1,6,1,11)
-hasLocation(#20040,#20041)
+exprs(#20040,79,#20038,0,"b")
+hasLocation(#20040,#20011)
 enclosing_stmt(#20040,#20031)
 expr_containers(#20040,#20001)
+literals("b","b",#20040)
+#20041=@"var;{b};{#20000}"
+variables(#20041,"b",#20000)
+bind(#20040,#20041)
 #20042=*
-exprs(#20042,79,#20040,0,"b")
-hasLocation(#20042,#20011)
+exprs(#20042,79,#20038,1,"c")
+hasLocation(#20042,#20015)
 enclosing_stmt(#20042,#20031)
 expr_containers(#20042,#20001)
-literals("b","b",#20042)
-#20043=@"var;{b};{#20000}"
-variables(#20043,"b",#20000)
+literals("c","c",#20042)
+#20043=@"var;{c};{#20000}"
+variables(#20043,"c",#20000)
 bind(#20042,#20043)
 #20044=*
-exprs(#20044,79,#20040,1,"c")
-hasLocation(#20044,#20015)
+exprs(#20044,79,#20034,2,"d")
+hasLocation(#20044,#20019)
 enclosing_stmt(#20044,#20031)
 expr_containers(#20044,#20001)
-literals("c","c",#20044)
-#20045=@"var;{c};{#20000}"
-variables(#20045,"c",#20000)
+literals("d","d",#20044)
+#20045=@"var;{d};{#20000}"
+variables(#20045,"d",#20000)
 bind(#20044,#20045)
+has_parentheses(#20034,1)
 #20046=*
-exprs(#20046,79,#20036,2,"d")
-hasLocation(#20046,#20019)
+exprs(#20046,79,#20032,1,"e")
+hasLocation(#20046,#20025)
 enclosing_stmt(#20046,#20031)
 expr_containers(#20046,#20001)
-literals("d","d",#20046)
-#20047=@"var;{d};{#20000}"
-variables(#20047,"d",#20000)
+literals("e","e",#20046)
+#20047=@"var;{e};{#20000}"
+variables(#20047,"e",#20000)
 bind(#20046,#20047)
 #20048=*
-exprs(#20048,79,#20032,1,"e")
-hasLocation(#20048,#20025)
-enclosing_stmt(#20048,#20031)
-expr_containers(#20048,#20001)
-literals("e","e",#20048)
-#20049=@"var;{e};{#20000}"
-variables(#20049,"e",#20000)
-bind(#20048,#20049)
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
 #20050=*
-entry_cfg_node(#20050,#20001)
-#20051=@"loc,{#10000},1,1,1,0"
-locations_default(#20051,#10000,1,1,1,0)
-hasLocation(#20050,#20051)
-#20052=*
-exit_cfg_node(#20052,#20001)
-hasLocation(#20052,#20029)
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20029)
 successor(#20031,#20032)
 successor(#20032,#20034)
 successor(#20034,#20036)
-successor(#20036,#20038)
+#20051=*
+guard_node(#20051,1,#20036)
+hasLocation(#20051,#20007)
+successor(#20051,#20038)
+#20052=*
+guard_node(#20052,0,#20036)
+hasLocation(#20052,#20007)
+successor(#20052,#20044)
+successor(#20036,#20051)
+successor(#20036,#20052)
+successor(#20038,#20040)
 #20053=*
-guard_node(#20053,1,#20038)
-hasLocation(#20053,#20007)
-successor(#20053,#20040)
+guard_node(#20053,1,#20040)
+hasLocation(#20053,#20011)
+successor(#20053,#20050)
 #20054=*
-guard_node(#20054,0,#20038)
-hasLocation(#20054,#20007)
-successor(#20054,#20046)
-successor(#20038,#20053)
-successor(#20038,#20054)
-successor(#20040,#20042)
+guard_node(#20054,0,#20040)
+hasLocation(#20054,#20011)
+successor(#20054,#20042)
+successor(#20040,#20053)
+successor(#20040,#20054)
 #20055=*
 guard_node(#20055,1,#20042)
-hasLocation(#20055,#20011)
-successor(#20055,#20052)
+hasLocation(#20055,#20015)
+successor(#20055,#20050)
 #20056=*
 guard_node(#20056,0,#20042)
-hasLocation(#20056,#20011)
-successor(#20056,#20044)
+hasLocation(#20056,#20015)
+successor(#20056,#20046)
 successor(#20042,#20055)
 successor(#20042,#20056)
 #20057=*
 guard_node(#20057,1,#20044)
-hasLocation(#20057,#20015)
-successor(#20057,#20052)
+hasLocation(#20057,#20019)
+successor(#20057,#20050)
 #20058=*
 guard_node(#20058,0,#20044)
-hasLocation(#20058,#20015)
-successor(#20058,#20048)
+hasLocation(#20058,#20019)
+successor(#20058,#20046)
 successor(#20044,#20057)
 successor(#20044,#20058)
-#20059=*
-guard_node(#20059,1,#20046)
-hasLocation(#20059,#20019)
-successor(#20059,#20052)
-#20060=*
-guard_node(#20060,0,#20046)
-hasLocation(#20060,#20019)
-successor(#20060,#20048)
-successor(#20046,#20059)
-successor(#20046,#20060)
-successor(#20048,#20052)
-successor(#20050,#20031)
+successor(#20046,#20050)
+successor(#20048,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/tst.js.trap b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
index 195204b85d04..9bf01b858c4b 100644
--- a/javascript/extractor/tests/cfg/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
@@ -1349,86 +1349,79 @@ hasLocation(#20448,#20449)
 enclosing_stmt(#20448,#20446)
 expr_containers(#20448,#20001)
 #20450=*
-exprs(#20450,63,#20448,0,"(x || y)")
-#20451=@"loc,{#10000},35,6,35,13"
-locations_default(#20451,#10000,35,6,35,13)
+exprs(#20450,45,#20448,0,"x || y")
+#20451=@"loc,{#10000},35,7,35,12"
+locations_default(#20451,#10000,35,7,35,12)
 hasLocation(#20450,#20451)
 enclosing_stmt(#20450,#20446)
 expr_containers(#20450,#20001)
 #20452=*
-exprs(#20452,45,#20450,0,"x || y")
-#20453=@"loc,{#10000},35,7,35,12"
-locations_default(#20453,#10000,35,7,35,12)
-hasLocation(#20452,#20453)
+exprs(#20452,79,#20450,0,"x")
+hasLocation(#20452,#20304)
 enclosing_stmt(#20452,#20446)
 expr_containers(#20452,#20001)
+literals("x","x",#20452)
+#20453=@"var;{x};{#20000}"
+variables(#20453,"x",#20000)
+bind(#20452,#20453)
 #20454=*
-exprs(#20454,79,#20452,0,"x")
-hasLocation(#20454,#20304)
+exprs(#20454,79,#20450,1,"y")
+hasLocation(#20454,#20308)
 enclosing_stmt(#20454,#20446)
 expr_containers(#20454,#20001)
-literals("x","x",#20454)
-#20455=@"var;{x};{#20000}"
-variables(#20455,"x",#20000)
+literals("y","y",#20454)
+#20455=@"var;{y};{#20000}"
+variables(#20455,"y",#20000)
 bind(#20454,#20455)
+has_parentheses(#20450,1)
 #20456=*
-exprs(#20456,79,#20452,1,"y")
-hasLocation(#20456,#20308)
-enclosing_stmt(#20456,#20446)
-expr_containers(#20456,#20001)
-literals("y","y",#20456)
-#20457=@"var;{y};{#20000}"
-variables(#20457,"y",#20000)
-bind(#20456,#20457)
+stmts(#20456,2,#20446,1,"z;")
+#20457=@"loc,{#10000},36,3,36,4"
+locations_default(#20457,#10000,36,3,36,4)
+hasLocation(#20456,#20457)
+stmt_containers(#20456,#20001)
 #20458=*
-stmts(#20458,2,#20446,1,"z;")
-#20459=@"loc,{#10000},36,3,36,4"
-locations_default(#20459,#10000,36,3,36,4)
-hasLocation(#20458,#20459)
-stmt_containers(#20458,#20001)
+exprs(#20458,79,#20456,0,"z")
+hasLocation(#20458,#20314)
+enclosing_stmt(#20458,#20456)
+expr_containers(#20458,#20001)
+literals("z","z",#20458)
+#20459=@"var;{z};{#20000}"
+variables(#20459,"z",#20000)
+bind(#20458,#20459)
 #20460=*
-exprs(#20460,79,#20458,0,"z")
-hasLocation(#20460,#20314)
-enclosing_stmt(#20460,#20458)
-expr_containers(#20460,#20001)
-literals("z","z",#20460)
-#20461=@"var;{z};{#20000}"
-variables(#20461,"z",#20000)
-bind(#20460,#20461)
+entry_cfg_node(#20460,#20001)
+#20461=@"loc,{#10000},1,1,1,0"
+locations_default(#20461,#10000,1,1,1,0)
+hasLocation(#20460,#20461)
 #20462=*
-entry_cfg_node(#20462,#20001)
-#20463=@"loc,{#10000},1,1,1,0"
-locations_default(#20463,#10000,1,1,1,0)
-hasLocation(#20462,#20463)
-#20464=*
-exit_cfg_node(#20464,#20001)
-hasLocation(#20464,#20318)
+exit_cfg_node(#20462,#20001)
+hasLocation(#20462,#20318)
 successor(#20446,#20450)
 successor(#20450,#20452)
-successor(#20452,#20454)
+#20463=*
+guard_node(#20463,1,#20452)
+hasLocation(#20463,#20304)
+successor(#20463,#20448)
+#20464=*
+guard_node(#20464,0,#20452)
+hasLocation(#20464,#20304)
+successor(#20464,#20454)
+successor(#20452,#20463)
+successor(#20452,#20464)
+successor(#20454,#20448)
 #20465=*
-guard_node(#20465,1,#20454)
-hasLocation(#20465,#20304)
-successor(#20465,#20448)
+guard_node(#20465,0,#20454)
+hasLocation(#20465,#20308)
+successor(#20465,#20456)
 #20466=*
-guard_node(#20466,0,#20454)
+guard_node(#20466,0,#20452)
 hasLocation(#20466,#20304)
-successor(#20466,#20456)
-successor(#20454,#20465)
-successor(#20454,#20466)
-successor(#20456,#20448)
-#20467=*
-guard_node(#20467,0,#20456)
-hasLocation(#20467,#20308)
-successor(#20467,#20458)
-#20468=*
-guard_node(#20468,0,#20454)
-hasLocation(#20468,#20304)
-successor(#20468,#20467)
-successor(#20448,#20468)
-successor(#20448,#20464)
-successor(#20458,#20460)
-successor(#20460,#20464)
+successor(#20466,#20465)
+successor(#20448,#20466)
+successor(#20448,#20462)
+successor(#20456,#20458)
+successor(#20458,#20462)
 successor(#20435,#20437)
 successor(#20437,#20439)
 successor(#20441,#20445)
@@ -1458,81 +1451,81 @@ successor(#20404,#20406)
 successor(#20403,#20404)
 successor(#20415,#20417)
 successor(#20373,#20395)
+#20467=*
+entry_cfg_node(#20467,#20373)
+#20468=@"loc,{#10000},15,1,15,0"
+locations_default(#20468,#10000,15,1,15,0)
+hasLocation(#20467,#20468)
 #20469=*
-entry_cfg_node(#20469,#20373)
-#20470=@"loc,{#10000},15,1,15,0"
-locations_default(#20470,#10000,15,1,15,0)
+exit_cfg_node(#20469,#20373)
+#20470=@"loc,{#10000},18,2,18,1"
+locations_default(#20470,#10000,18,2,18,1)
 hasLocation(#20469,#20470)
-#20471=*
-exit_cfg_node(#20471,#20373)
-#20472=@"loc,{#10000},18,2,18,1"
-locations_default(#20472,#10000,18,2,18,1)
-hasLocation(#20471,#20472)
 successor(#20386,#20384)
 successor(#20384,#20387)
-successor(#20384,#20471)
+successor(#20384,#20469)
 successor(#20391,#20393)
-#20473=*
-guard_node(#20473,1,#20393)
-hasLocation(#20473,#20203)
-successor(#20473,#20394)
-#20474=*
-guard_node(#20474,0,#20393)
-hasLocation(#20474,#20203)
-successor(#20474,#20384)
-successor(#20393,#20473)
-successor(#20393,#20474)
+#20471=*
+guard_node(#20471,1,#20393)
+hasLocation(#20471,#20203)
+successor(#20471,#20394)
+#20472=*
+guard_node(#20472,0,#20393)
+hasLocation(#20472,#20203)
+successor(#20472,#20384)
+successor(#20393,#20471)
+successor(#20393,#20472)
 successor(#20394,#20384)
 successor(#20387,#20390)
 successor(#20390,#20389)
 successor(#20389,#20391)
 successor(#20382,#20386)
 successor(#20380,#20382)
-successor(#20469,#20380)
+successor(#20467,#20380)
 successor(#20367,#20369)
-#20475=*
-guard_node(#20475,1,#20369)
-hasLocation(#20475,#20163)
-successor(#20475,#20371)
-#20476=*
-guard_node(#20476,0,#20369)
-hasLocation(#20476,#20163)
-successor(#20476,#20373)
-successor(#20369,#20475)
-successor(#20369,#20476)
+#20473=*
+guard_node(#20473,1,#20369)
+hasLocation(#20473,#20163)
+successor(#20473,#20371)
+#20474=*
+guard_node(#20474,0,#20369)
+hasLocation(#20474,#20163)
+successor(#20474,#20373)
+successor(#20369,#20473)
+successor(#20369,#20474)
 successor(#20371,#20369)
 successor(#20323,#20367)
-#20477=*
-entry_cfg_node(#20477,#20323)
-hasLocation(#20477,#20463)
-#20478=*
-exit_cfg_node(#20478,#20323)
-#20479=@"loc,{#10000},10,2,10,1"
-locations_default(#20479,#10000,10,2,10,1)
-hasLocation(#20478,#20479)
+#20475=*
+entry_cfg_node(#20475,#20323)
+hasLocation(#20475,#20461)
+#20476=*
+exit_cfg_node(#20476,#20323)
+#20477=@"loc,{#10000},10,2,10,1"
+locations_default(#20477,#10000,10,2,10,1)
+hasLocation(#20476,#20477)
 successor(#20358,#20360)
 successor(#20360,#20361)
 successor(#20361,#20363)
 successor(#20363,#20366)
-successor(#20363,#20478)
+successor(#20363,#20476)
 successor(#20366,#20364)
-successor(#20364,#20478)
+successor(#20364,#20476)
 successor(#20344,#20355)
 successor(#20356,#20353)
 successor(#20355,#20356)
 successor(#20353,#20348)
 successor(#20349,#20346)
 successor(#20348,#20349)
-#20480=*
-guard_node(#20480,1,#20346)
-hasLocation(#20480,#20347)
-successor(#20480,#20357)
-#20481=*
-guard_node(#20481,0,#20346)
-hasLocation(#20481,#20347)
-successor(#20481,#20358)
-successor(#20346,#20480)
-successor(#20346,#20481)
+#20478=*
+guard_node(#20478,1,#20346)
+hasLocation(#20478,#20347)
+successor(#20478,#20357)
+#20479=*
+guard_node(#20479,0,#20346)
+hasLocation(#20479,#20347)
+successor(#20479,#20358)
+successor(#20346,#20478)
+successor(#20346,#20479)
 successor(#20352,#20350)
 successor(#20350,#20348)
 successor(#20357,#20352)
@@ -1545,9 +1538,9 @@ successor(#20337,#20334)
 successor(#20336,#20337)
 successor(#20334,#20338)
 successor(#20330,#20332)
-successor(#20477,#20330)
+successor(#20475,#20330)
 successor(#20375,#20323)
 successor(#20325,#20375)
-successor(#20462,#20325)
+successor(#20460,#20325)
 numlines(#10000,36,30,0)
 filetype(#10000,"javascript")
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 bb694ccaa394..737f83a470c2 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
@@ -72,48 +72,41 @@ hasLocation(#20023,#20003)
 enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
 #20024=*
-exprs(#20024,63,#20023,0,"(x = 0)")
-#20025=@"loc,{#10000},1,1,1,7"
-locations_default(#20025,#10000,1,1,1,7)
-hasLocation(#20024,#20025)
+exprs(#20024,79,#20023,0,"x")
+hasLocation(#20024,#20007)
 enclosing_stmt(#20024,#20022)
 expr_containers(#20024,#20001)
-#20026=*
-exprs(#20026,79,#20024,0,"x")
-hasLocation(#20026,#20007)
-enclosing_stmt(#20026,#20022)
-expr_containers(#20026,#20001)
+has_parentheses(#20024,1)
+#20025=*
+exprs(#20025,79,#20023,1,"y")
+hasLocation(#20025,#20017)
+enclosing_stmt(#20025,#20022)
+expr_containers(#20025,#20001)
+literals("y","y",#20025)
+#20026=@"var;{y};{#20000}"
+variables(#20026,"y",#20000)
+bind(#20025,#20026)
 #20027=*
-exprs(#20027,79,#20023,1,"y")
-hasLocation(#20027,#20017)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("y","y",#20027)
-#20028=@"var;{y};{#20000}"
-variables(#20028,"y",#20000)
-bind(#20027,#20028)
+entry_cfg_node(#20027,#20001)
+#20028=@"loc,{#10000},1,1,1,0"
+locations_default(#20028,#10000,1,1,1,0)
+hasLocation(#20027,#20028)
 #20029=*
-entry_cfg_node(#20029,#20001)
-#20030=@"loc,{#10000},1,1,1,0"
-locations_default(#20030,#10000,1,1,1,0)
-hasLocation(#20029,#20030)
-#20031=*
-exit_cfg_node(#20031,#20001)
-hasLocation(#20031,#20019)
+exit_cfg_node(#20029,#20001)
+hasLocation(#20029,#20019)
 successor(#20022,#20024)
-successor(#20027,#20023)
-successor(#20024,#20026)
-successor(#20026,#20027)
-successor(#20023,#20031)
-successor(#20029,#20022)
-#20032=*
-js_parse_errors(#20032,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
+successor(#20025,#20023)
+successor(#20024,#20025)
+successor(#20023,#20029)
+successor(#20027,#20022)
+#20030=*
+js_parse_errors(#20030,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
 ")
-hasLocation(#20032,#20007)
-#20033=*
-lines(#20033,#20001,"(x = 0) = y","
+hasLocation(#20030,#20007)
+#20031=*
+lines(#20031,#20001,"(x = 0) = y","
 ")
-hasLocation(#20033,#20003)
+hasLocation(#20031,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
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 a88a7106bb10..4e572da68832 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
@@ -127,175 +127,168 @@ scopenesting(#20043,#20000)
 #20044=@"var;{this};{#20043}"
 variables(#20044,"this",#20043)
 #20045=*
-exprs(#20045,63,#20041,1,"(Math.r ...  Array)")
-#20046=@"loc,{#10000},1,21,1,52"
-locations_default(#20046,#10000,1,21,1,52)
+exprs(#20045,11,#20041,1,"Math.ra ... : Array")
+#20046=@"loc,{#10000},1,22,1,51"
+locations_default(#20046,#10000,1,22,1,51)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20041)
 expr_containers(#20045,#20001)
 #20047=*
-exprs(#20047,11,#20045,0,"Math.ra ... : Array")
-#20048=@"loc,{#10000},1,22,1,51"
-locations_default(#20048,#10000,1,22,1,51)
+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)
 enclosing_stmt(#20047,#20041)
 expr_containers(#20047,#20001)
 #20049=*
-exprs(#20049,13,#20047,0,"Math.random()")
-#20050=@"loc,{#10000},1,22,1,34"
-locations_default(#20050,#10000,1,22,1,34)
+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)
 enclosing_stmt(#20049,#20041)
 expr_containers(#20049,#20001)
 #20051=*
-exprs(#20051,14,#20049,-1,"Math.random")
-#20052=@"loc,{#10000},1,22,1,32"
-locations_default(#20052,#10000,1,22,1,32)
-hasLocation(#20051,#20052)
+exprs(#20051,79,#20049,0,"Math")
+hasLocation(#20051,#20013)
 enclosing_stmt(#20051,#20041)
 expr_containers(#20051,#20001)
+literals("Math","Math",#20051)
+#20052=@"var;{Math};{#20000}"
+variables(#20052,"Math",#20000)
+bind(#20051,#20052)
 #20053=*
-exprs(#20053,79,#20051,0,"Math")
-hasLocation(#20053,#20013)
+exprs(#20053,0,#20049,1,"random")
+hasLocation(#20053,#20017)
 enclosing_stmt(#20053,#20041)
 expr_containers(#20053,#20001)
-literals("Math","Math",#20053)
-#20054=@"var;{Math};{#20000}"
-variables(#20054,"Math",#20000)
-bind(#20053,#20054)
-#20055=*
-exprs(#20055,0,#20051,1,"random")
-hasLocation(#20055,#20017)
-enclosing_stmt(#20055,#20041)
-expr_containers(#20055,#20001)
-literals("random","random",#20055)
+literals("random","random",#20053)
+#20054=*
+exprs(#20054,79,#20045,1,"Object")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20041)
+expr_containers(#20054,#20001)
+literals("Object","Object",#20054)
+#20055=@"var;{Object};{#20000}"
+variables(#20055,"Object",#20000)
+bind(#20054,#20055)
 #20056=*
-exprs(#20056,79,#20047,1,"Object")
-hasLocation(#20056,#20025)
+exprs(#20056,79,#20045,2,"Array")
+hasLocation(#20056,#20029)
 enclosing_stmt(#20056,#20041)
 expr_containers(#20056,#20001)
-literals("Object","Object",#20056)
-#20057=@"var;{Object};{#20000}"
-variables(#20057,"Object",#20000)
+literals("Array","Array",#20056)
+#20057=@"var;{Array};{#20000}"
+variables(#20057,"Array",#20000)
 bind(#20056,#20057)
+has_parentheses(#20045,1)
 #20058=*
-exprs(#20058,79,#20047,2,"Array")
-hasLocation(#20058,#20029)
-enclosing_stmt(#20058,#20041)
-expr_containers(#20058,#20001)
-literals("Array","Array",#20058)
-#20059=@"var;{Array};{#20000}"
-variables(#20059,"Array",#20000)
-bind(#20058,#20059)
+properties(#20058,#20041,2,0,"constru ... rgs); }")
+#20059=@"loc,{#10000},1,54,1,53"
+locations_default(#20059,#10000,1,54,1,53)
+hasLocation(#20058,#20059)
 #20060=*
-properties(#20060,#20041,2,0,"constru ... rgs); }")
-#20061=@"loc,{#10000},1,54,1,53"
-locations_default(#20061,#10000,1,54,1,53)
-hasLocation(#20060,#20061)
+exprs(#20060,0,#20058,0,"constructor")
+hasLocation(#20060,#20059)
+enclosing_stmt(#20060,#20041)
+expr_containers(#20060,#20001)
+literals("constructor","constructor",#20060)
+#20061=*
+exprs(#20061,9,#20058,1,"(...arg ... rgs); }")
+hasLocation(#20061,#20059)
+enclosing_stmt(#20061,#20041)
+expr_containers(#20061,#20001)
 #20062=*
-exprs(#20062,0,#20060,0,"constructor")
-hasLocation(#20062,#20061)
-enclosing_stmt(#20062,#20041)
-expr_containers(#20062,#20001)
-literals("constructor","constructor",#20062)
-#20063=*
-exprs(#20063,9,#20060,1,"(...arg ... rgs); }")
-hasLocation(#20063,#20061)
-enclosing_stmt(#20063,#20041)
-expr_containers(#20063,#20001)
-#20064=*
-scopes(#20064,1)
-scopenodes(#20063,#20064)
-scopenesting(#20064,#20043)
-#20065=@"var;{this};{#20064}"
-variables(#20065,"this",#20064)
-#20066=@"var;{args};{#20064}"
-variables(#20066,"args",#20064)
+scopes(#20062,1)
+scopenodes(#20061,#20062)
+scopenesting(#20062,#20043)
+#20063=@"var;{this};{#20062}"
+variables(#20063,"this",#20062)
+#20064=@"var;{args};{#20062}"
+variables(#20064,"args",#20062)
+#20065=*
+exprs(#20065,78,#20061,0,"args")
+hasLocation(#20065,#20059)
+expr_containers(#20065,#20061)
+literals("args","args",#20065)
+decl(#20065,#20064)
+#20066=@"var;{arguments};{#20062}"
+variables(#20066,"arguments",#20062)
+is_arguments_object(#20066)
+has_rest_parameter(#20061)
 #20067=*
-exprs(#20067,78,#20063,0,"args")
-hasLocation(#20067,#20061)
-expr_containers(#20067,#20063)
-literals("args","args",#20067)
-decl(#20067,#20066)
-#20068=@"var;{arguments};{#20064}"
-variables(#20068,"arguments",#20064)
-is_arguments_object(#20068)
-has_rest_parameter(#20063)
+stmts(#20067,1,#20061,-2,"{ super(...args); }")
+hasLocation(#20067,#20059)
+stmt_containers(#20067,#20061)
+#20068=*
+stmts(#20068,2,#20067,0,"super(...args);")
+hasLocation(#20068,#20059)
+stmt_containers(#20068,#20061)
 #20069=*
-stmts(#20069,1,#20063,-2,"{ super(...args); }")
-hasLocation(#20069,#20061)
-stmt_containers(#20069,#20063)
+exprs(#20069,13,#20068,0,"super(...args)")
+hasLocation(#20069,#20059)
+enclosing_stmt(#20069,#20068)
+expr_containers(#20069,#20061)
 #20070=*
-stmts(#20070,2,#20069,0,"super(...args);")
-hasLocation(#20070,#20061)
-stmt_containers(#20070,#20063)
+exprs(#20070,81,#20069,-1,"super")
+hasLocation(#20070,#20059)
+enclosing_stmt(#20070,#20068)
+expr_containers(#20070,#20061)
 #20071=*
-exprs(#20071,13,#20070,0,"super(...args)")
-hasLocation(#20071,#20061)
-enclosing_stmt(#20071,#20070)
-expr_containers(#20071,#20063)
+exprs(#20071,66,#20069,0,"...args")
+hasLocation(#20071,#20059)
+enclosing_stmt(#20071,#20068)
+expr_containers(#20071,#20061)
 #20072=*
-exprs(#20072,81,#20071,-1,"super")
-hasLocation(#20072,#20061)
-enclosing_stmt(#20072,#20070)
-expr_containers(#20072,#20063)
+exprs(#20072,79,#20071,0,"args")
+hasLocation(#20072,#20059)
+enclosing_stmt(#20072,#20068)
+expr_containers(#20072,#20061)
+literals("args","args",#20072)
+bind(#20072,#20064)
+is_method(#20058)
 #20073=*
-exprs(#20073,66,#20071,0,"...args")
-hasLocation(#20073,#20061)
-enclosing_stmt(#20073,#20070)
-expr_containers(#20073,#20063)
-#20074=*
-exprs(#20074,79,#20073,0,"args")
-hasLocation(#20074,#20061)
-enclosing_stmt(#20074,#20070)
-expr_containers(#20074,#20063)
-literals("args","args",#20074)
-bind(#20074,#20066)
-is_method(#20060)
+entry_cfg_node(#20073,#20001)
+#20074=@"loc,{#10000},1,1,1,0"
+locations_default(#20074,#10000,1,1,1,0)
+hasLocation(#20073,#20074)
 #20075=*
-entry_cfg_node(#20075,#20001)
-#20076=@"loc,{#10000},1,1,1,0"
-locations_default(#20076,#10000,1,1,1,0)
-hasLocation(#20075,#20076)
+exit_cfg_node(#20075,#20001)
+hasLocation(#20075,#20037)
+successor(#20061,#20058)
+#20076=*
+entry_cfg_node(#20076,#20061)
+hasLocation(#20076,#20059)
 #20077=*
-exit_cfg_node(#20077,#20001)
-hasLocation(#20077,#20037)
-successor(#20063,#20060)
+exit_cfg_node(#20077,#20061)
+hasLocation(#20077,#20059)
+successor(#20068,#20070)
+successor(#20072,#20071)
+successor(#20071,#20069)
+successor(#20070,#20072)
+successor(#20069,#20077)
+successor(#20067,#20068)
+successor(#20065,#20067)
+successor(#20076,#20065)
+successor(#20060,#20061)
+successor(#20058,#20041)
+successor(#20045,#20051)
+successor(#20053,#20049)
+successor(#20051,#20053)
+successor(#20049,#20047)
 #20078=*
-entry_cfg_node(#20078,#20063)
-hasLocation(#20078,#20061)
+guard_node(#20078,1,#20047)
+hasLocation(#20078,#20048)
+successor(#20078,#20054)
 #20079=*
-exit_cfg_node(#20079,#20063)
-hasLocation(#20079,#20061)
-successor(#20070,#20072)
-successor(#20074,#20073)
-successor(#20073,#20071)
-successor(#20072,#20074)
-successor(#20071,#20079)
-successor(#20069,#20070)
-successor(#20067,#20069)
-successor(#20078,#20067)
-successor(#20062,#20063)
-successor(#20060,#20041)
-successor(#20045,#20047)
-successor(#20047,#20053)
-successor(#20055,#20051)
-successor(#20053,#20055)
-successor(#20051,#20049)
-#20080=*
-guard_node(#20080,1,#20049)
-hasLocation(#20080,#20050)
-successor(#20080,#20056)
-#20081=*
-guard_node(#20081,0,#20049)
-hasLocation(#20081,#20050)
-successor(#20081,#20058)
-successor(#20049,#20080)
-successor(#20049,#20081)
-successor(#20056,#20062)
-successor(#20058,#20062)
+guard_node(#20079,0,#20047)
+hasLocation(#20079,#20048)
+successor(#20079,#20056)
+successor(#20047,#20078)
+successor(#20047,#20079)
+successor(#20054,#20060)
+successor(#20056,#20060)
 successor(#20042,#20045)
-successor(#20041,#20077)
-successor(#20075,#20042)
+successor(#20041,#20075)
+successor(#20073,#20042)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
index 2f89081d2c1d..18281812960b 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
@@ -59,88 +59,83 @@ stmts(#20019,2,#20001,0,"(class Point {})")
 hasLocation(#20019,#20003)
 stmt_containers(#20019,#20001)
 #20020=*
-exprs(#20020,63,#20019,0,"(class Point {})")
-hasLocation(#20020,#20003)
+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)
 enclosing_stmt(#20020,#20019)
 expr_containers(#20020,#20001)
-#20021=*
-exprs(#20021,80,#20020,0,"class Point {}")
-#20022=@"loc,{#10000},1,2,1,15"
-locations_default(#20022,#10000,1,2,1,15)
-hasLocation(#20021,#20022)
-enclosing_stmt(#20021,#20019)
-expr_containers(#20021,#20001)
-#20023=*
-scopes(#20023,8)
-scopenodes(#20021,#20023)
-scopenesting(#20023,#20000)
-#20024=@"var;{this};{#20023}"
-variables(#20024,"this",#20023)
-#20025=@"var;{Point};{#20023}"
-variables(#20025,"Point",#20023)
-#20026=@"local_type_name;{Point};{#20023}"
-local_type_names(#20026,"Point",#20023)
+#20022=*
+scopes(#20022,8)
+scopenodes(#20020,#20022)
+scopenesting(#20022,#20000)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
+#20024=@"var;{Point};{#20022}"
+variables(#20024,"Point",#20022)
+#20025=@"local_type_name;{Point};{#20022}"
+local_type_names(#20025,"Point",#20022)
+#20026=*
+exprs(#20026,78,#20020,0,"Point")
+hasLocation(#20026,#20009)
+enclosing_stmt(#20026,#20019)
+expr_containers(#20026,#20001)
+literals("Point","Point",#20026)
+decl(#20026,#20024)
+typedecl(#20026,#20025)
 #20027=*
-exprs(#20027,78,#20021,0,"Point")
-hasLocation(#20027,#20009)
-enclosing_stmt(#20027,#20019)
-expr_containers(#20027,#20001)
-literals("Point","Point",#20027)
-decl(#20027,#20025)
-typedecl(#20027,#20026)
-#20028=*
-properties(#20028,#20021,2,0,"constructor() {}")
-#20029=@"loc,{#10000},1,14,1,13"
-locations_default(#20029,#10000,1,14,1,13)
-hasLocation(#20028,#20029)
+properties(#20027,#20020,2,0,"constructor() {}")
+#20028=@"loc,{#10000},1,14,1,13"
+locations_default(#20028,#10000,1,14,1,13)
+hasLocation(#20027,#20028)
+#20029=*
+exprs(#20029,0,#20027,0,"constructor")
+hasLocation(#20029,#20028)
+enclosing_stmt(#20029,#20019)
+expr_containers(#20029,#20001)
+literals("constructor","constructor",#20029)
 #20030=*
-exprs(#20030,0,#20028,0,"constructor")
-hasLocation(#20030,#20029)
+exprs(#20030,9,#20027,1,"() {}")
+hasLocation(#20030,#20028)
 enclosing_stmt(#20030,#20019)
 expr_containers(#20030,#20001)
-literals("constructor","constructor",#20030)
 #20031=*
-exprs(#20031,9,#20028,1,"() {}")
-hasLocation(#20031,#20029)
-enclosing_stmt(#20031,#20019)
-expr_containers(#20031,#20001)
-#20032=*
-scopes(#20032,1)
-scopenodes(#20031,#20032)
-scopenesting(#20032,#20023)
-#20033=@"var;{this};{#20032}"
-variables(#20033,"this",#20032)
-#20034=@"var;{arguments};{#20032}"
-variables(#20034,"arguments",#20032)
-is_arguments_object(#20034)
+scopes(#20031,1)
+scopenodes(#20030,#20031)
+scopenesting(#20031,#20022)
+#20032=@"var;{this};{#20031}"
+variables(#20032,"this",#20031)
+#20033=@"var;{arguments};{#20031}"
+variables(#20033,"arguments",#20031)
+is_arguments_object(#20033)
+#20034=*
+stmts(#20034,1,#20030,-2,"{}")
+hasLocation(#20034,#20028)
+stmt_containers(#20034,#20030)
+is_method(#20027)
+has_parentheses(#20020,1)
 #20035=*
-stmts(#20035,1,#20031,-2,"{}")
-hasLocation(#20035,#20029)
-stmt_containers(#20035,#20031)
-is_method(#20028)
-#20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20017)
+successor(#20019,#20026)
+successor(#20030,#20027)
 #20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20017)
-successor(#20019,#20020)
-successor(#20020,#20027)
-successor(#20031,#20028)
+entry_cfg_node(#20038,#20030)
+hasLocation(#20038,#20028)
 #20039=*
-entry_cfg_node(#20039,#20031)
-hasLocation(#20039,#20029)
-#20040=*
-exit_cfg_node(#20040,#20031)
-hasLocation(#20040,#20029)
-successor(#20035,#20040)
-successor(#20039,#20035)
-successor(#20030,#20031)
-successor(#20028,#20021)
-successor(#20027,#20030)
-successor(#20021,#20038)
-successor(#20036,#20019)
+exit_cfg_node(#20039,#20030)
+hasLocation(#20039,#20028)
+successor(#20034,#20039)
+successor(#20038,#20034)
+successor(#20029,#20030)
+successor(#20027,#20020)
+successor(#20026,#20029)
+successor(#20020,#20037)
+successor(#20035,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
index 070cba610dce..9b4964b4a619 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
@@ -54,75 +54,70 @@ stmts(#20017,2,#20001,0,"(class       {})")
 hasLocation(#20017,#20003)
 stmt_containers(#20017,#20001)
 #20018=*
-exprs(#20018,63,#20017,0,"(class       {})")
-hasLocation(#20018,#20003)
+exprs(#20018,80,#20017,0,"class       {}")
+#20019=@"loc,{#10000},1,2,1,15"
+locations_default(#20019,#10000,1,2,1,15)
+hasLocation(#20018,#20019)
 enclosing_stmt(#20018,#20017)
 expr_containers(#20018,#20001)
-#20019=*
-exprs(#20019,80,#20018,0,"class       {}")
-#20020=@"loc,{#10000},1,2,1,15"
-locations_default(#20020,#10000,1,2,1,15)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20017)
-expr_containers(#20019,#20001)
-#20021=*
-scopes(#20021,8)
-scopenodes(#20019,#20021)
-scopenesting(#20021,#20000)
-#20022=@"var;{this};{#20021}"
-variables(#20022,"this",#20021)
-#20023=*
-properties(#20023,#20019,2,0,"constructor() {}")
-#20024=@"loc,{#10000},1,14,1,13"
-locations_default(#20024,#10000,1,14,1,13)
-hasLocation(#20023,#20024)
+#20020=*
+scopes(#20020,8)
+scopenodes(#20018,#20020)
+scopenesting(#20020,#20000)
+#20021=@"var;{this};{#20020}"
+variables(#20021,"this",#20020)
+#20022=*
+properties(#20022,#20018,2,0,"constructor() {}")
+#20023=@"loc,{#10000},1,14,1,13"
+locations_default(#20023,#10000,1,14,1,13)
+hasLocation(#20022,#20023)
+#20024=*
+exprs(#20024,0,#20022,0,"constructor")
+hasLocation(#20024,#20023)
+enclosing_stmt(#20024,#20017)
+expr_containers(#20024,#20001)
+literals("constructor","constructor",#20024)
 #20025=*
-exprs(#20025,0,#20023,0,"constructor")
-hasLocation(#20025,#20024)
+exprs(#20025,9,#20022,1,"() {}")
+hasLocation(#20025,#20023)
 enclosing_stmt(#20025,#20017)
 expr_containers(#20025,#20001)
-literals("constructor","constructor",#20025)
 #20026=*
-exprs(#20026,9,#20023,1,"() {}")
-hasLocation(#20026,#20024)
-enclosing_stmt(#20026,#20017)
-expr_containers(#20026,#20001)
-#20027=*
-scopes(#20027,1)
-scopenodes(#20026,#20027)
-scopenesting(#20027,#20021)
-#20028=@"var;{this};{#20027}"
-variables(#20028,"this",#20027)
-#20029=@"var;{arguments};{#20027}"
-variables(#20029,"arguments",#20027)
-is_arguments_object(#20029)
+scopes(#20026,1)
+scopenodes(#20025,#20026)
+scopenesting(#20026,#20020)
+#20027=@"var;{this};{#20026}"
+variables(#20027,"this",#20026)
+#20028=@"var;{arguments};{#20026}"
+variables(#20028,"arguments",#20026)
+is_arguments_object(#20028)
+#20029=*
+stmts(#20029,1,#20025,-2,"{}")
+hasLocation(#20029,#20023)
+stmt_containers(#20029,#20025)
+is_method(#20022)
+has_parentheses(#20018,1)
 #20030=*
-stmts(#20030,1,#20026,-2,"{}")
-hasLocation(#20030,#20024)
-stmt_containers(#20030,#20026)
-is_method(#20023)
-#20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},1,1,1,0"
-locations_default(#20032,#10000,1,1,1,0)
-hasLocation(#20031,#20032)
+entry_cfg_node(#20030,#20001)
+#20031=@"loc,{#10000},1,1,1,0"
+locations_default(#20031,#10000,1,1,1,0)
+hasLocation(#20030,#20031)
+#20032=*
+exit_cfg_node(#20032,#20001)
+hasLocation(#20032,#20015)
+successor(#20017,#20024)
+successor(#20025,#20022)
 #20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20015)
-successor(#20017,#20018)
-successor(#20018,#20025)
-successor(#20026,#20023)
+entry_cfg_node(#20033,#20025)
+hasLocation(#20033,#20023)
 #20034=*
-entry_cfg_node(#20034,#20026)
-hasLocation(#20034,#20024)
-#20035=*
-exit_cfg_node(#20035,#20026)
-hasLocation(#20035,#20024)
-successor(#20030,#20035)
-successor(#20034,#20030)
-successor(#20025,#20026)
-successor(#20023,#20019)
-successor(#20019,#20033)
-successor(#20031,#20017)
+exit_cfg_node(#20034,#20025)
+hasLocation(#20034,#20023)
+successor(#20029,#20034)
+successor(#20033,#20029)
+successor(#20024,#20025)
+successor(#20022,#20018)
+successor(#20018,#20032)
+successor(#20030,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
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 8239f4aaa21b..ea0fed080eca 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
@@ -89,86 +89,79 @@ stmts(#20031,2,#20001,0,"({ x: o.x } = q);")
 hasLocation(#20031,#20003)
 stmt_containers(#20031,#20001)
 #20032=*
-exprs(#20032,63,#20031,0,"({ x: o.x } = q)")
-#20033=@"loc,{#10000},1,1,1,16"
-locations_default(#20033,#10000,1,1,1,16)
+exprs(#20032,47,#20031,0,"{ x: o.x } = q")
+#20033=@"loc,{#10000},1,2,1,15"
+locations_default(#20033,#10000,1,2,1,15)
 hasLocation(#20032,#20033)
 enclosing_stmt(#20032,#20031)
 expr_containers(#20032,#20001)
 #20034=*
-exprs(#20034,47,#20032,0,"{ x: o.x } = q")
-#20035=@"loc,{#10000},1,2,1,15"
-locations_default(#20035,#10000,1,2,1,15)
+exprs(#20034,68,#20032,0,"{ x: o.x }")
+#20035=@"loc,{#10000},1,2,1,11"
+locations_default(#20035,#10000,1,2,1,11)
 hasLocation(#20034,#20035)
 enclosing_stmt(#20034,#20031)
 expr_containers(#20034,#20001)
 #20036=*
-exprs(#20036,68,#20034,0,"{ x: o.x }")
-#20037=@"loc,{#10000},1,2,1,11"
-locations_default(#20037,#10000,1,2,1,11)
+properties(#20036,#20034,0,0,"x: o.x")
+#20037=@"loc,{#10000},1,4,1,9"
+locations_default(#20037,#10000,1,4,1,9)
 hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20031)
-expr_containers(#20036,#20001)
 #20038=*
-properties(#20038,#20036,0,0,"x: o.x")
-#20039=@"loc,{#10000},1,4,1,9"
-locations_default(#20039,#10000,1,4,1,9)
-hasLocation(#20038,#20039)
-#20040=*
-exprs(#20040,0,#20038,0,"x")
-hasLocation(#20040,#20009)
-enclosing_stmt(#20040,#20031)
-expr_containers(#20040,#20001)
-literals("x","x",#20040)
+exprs(#20038,0,#20036,0,"x")
+hasLocation(#20038,#20009)
+enclosing_stmt(#20038,#20031)
+expr_containers(#20038,#20001)
+literals("x","x",#20038)
+#20039=*
+exprs(#20039,14,#20036,1,"o.x")
+#20040=@"loc,{#10000},1,7,1,9"
+locations_default(#20040,#10000,1,7,1,9)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20031)
+expr_containers(#20039,#20001)
 #20041=*
-exprs(#20041,14,#20038,1,"o.x")
-#20042=@"loc,{#10000},1,7,1,9"
-locations_default(#20042,#10000,1,7,1,9)
-hasLocation(#20041,#20042)
+exprs(#20041,79,#20039,0,"o")
+hasLocation(#20041,#20013)
 enclosing_stmt(#20041,#20031)
 expr_containers(#20041,#20001)
+literals("o","o",#20041)
+#20042=@"var;{o};{#20000}"
+variables(#20042,"o",#20000)
+bind(#20041,#20042)
 #20043=*
-exprs(#20043,79,#20041,0,"o")
-hasLocation(#20043,#20013)
+exprs(#20043,0,#20039,1,"x")
+hasLocation(#20043,#20017)
 enclosing_stmt(#20043,#20031)
 expr_containers(#20043,#20001)
-literals("o","o",#20043)
-#20044=@"var;{o};{#20000}"
-variables(#20044,"o",#20000)
-bind(#20043,#20044)
-#20045=*
-exprs(#20045,0,#20041,1,"x")
-hasLocation(#20045,#20017)
-enclosing_stmt(#20045,#20031)
-expr_containers(#20045,#20001)
-literals("x","x",#20045)
+literals("x","x",#20043)
+#20044=*
+exprs(#20044,79,#20032,1,"q")
+hasLocation(#20044,#20023)
+enclosing_stmt(#20044,#20031)
+expr_containers(#20044,#20001)
+literals("q","q",#20044)
+#20045=@"var;{q};{#20000}"
+variables(#20045,"q",#20000)
+bind(#20044,#20045)
+has_parentheses(#20032,1)
 #20046=*
-exprs(#20046,79,#20034,1,"q")
-hasLocation(#20046,#20023)
-enclosing_stmt(#20046,#20031)
-expr_containers(#20046,#20001)
-literals("q","q",#20046)
-#20047=@"var;{q};{#20000}"
-variables(#20047,"q",#20000)
-bind(#20046,#20047)
+entry_cfg_node(#20046,#20001)
+#20047=@"loc,{#10000},1,1,1,0"
+locations_default(#20047,#10000,1,1,1,0)
+hasLocation(#20046,#20047)
 #20048=*
-entry_cfg_node(#20048,#20001)
-#20049=@"loc,{#10000},1,1,1,0"
-locations_default(#20049,#10000,1,1,1,0)
-hasLocation(#20048,#20049)
-#20050=*
-exit_cfg_node(#20050,#20001)
-hasLocation(#20050,#20029)
-successor(#20031,#20032)
-successor(#20032,#20046)
-successor(#20036,#20040)
-successor(#20045,#20041)
-successor(#20043,#20045)
-successor(#20041,#20038)
-successor(#20040,#20043)
-successor(#20038,#20034)
-successor(#20046,#20036)
-successor(#20034,#20050)
-successor(#20048,#20031)
+exit_cfg_node(#20048,#20001)
+hasLocation(#20048,#20029)
+successor(#20031,#20044)
+successor(#20034,#20038)
+successor(#20043,#20039)
+successor(#20041,#20043)
+successor(#20039,#20036)
+successor(#20038,#20041)
+successor(#20036,#20032)
+successor(#20044,#20034)
+successor(#20032,#20048)
+successor(#20046,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
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 3ff5c6044290..007a0916dc5c 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
@@ -62,51 +62,44 @@ stmts(#20020,2,#20001,0,"({ async });")
 hasLocation(#20020,#20003)
 stmt_containers(#20020,#20001)
 #20021=*
-exprs(#20021,63,#20020,0,"({ async })")
-#20022=@"loc,{#10000},1,1,1,11"
-locations_default(#20022,#10000,1,1,1,11)
+exprs(#20021,8,#20020,0,"{ async }")
+#20022=@"loc,{#10000},1,2,1,10"
+locations_default(#20022,#10000,1,2,1,10)
 hasLocation(#20021,#20022)
 enclosing_stmt(#20021,#20020)
 expr_containers(#20021,#20001)
 #20023=*
-exprs(#20023,8,#20021,0,"{ async }")
-#20024=@"loc,{#10000},1,2,1,10"
-locations_default(#20024,#10000,1,2,1,10)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20020)
-expr_containers(#20023,#20001)
+properties(#20023,#20021,0,0,"async")
+hasLocation(#20023,#20009)
+#20024=*
+exprs(#20024,0,#20023,0,"async")
+hasLocation(#20024,#20009)
+enclosing_stmt(#20024,#20020)
+expr_containers(#20024,#20001)
+literals("async","async",#20024)
 #20025=*
-properties(#20025,#20023,0,0,"async")
+exprs(#20025,79,#20023,1,"async")
 hasLocation(#20025,#20009)
-#20026=*
-exprs(#20026,0,#20025,0,"async")
-hasLocation(#20026,#20009)
-enclosing_stmt(#20026,#20020)
-expr_containers(#20026,#20001)
-literals("async","async",#20026)
+enclosing_stmt(#20025,#20020)
+expr_containers(#20025,#20001)
+literals("async","async",#20025)
+#20026=@"var;{async};{#20000}"
+variables(#20026,"async",#20000)
+bind(#20025,#20026)
+has_parentheses(#20021,1)
 #20027=*
-exprs(#20027,79,#20025,1,"async")
-hasLocation(#20027,#20009)
-enclosing_stmt(#20027,#20020)
-expr_containers(#20027,#20001)
-literals("async","async",#20027)
-#20028=@"var;{async};{#20000}"
-variables(#20028,"async",#20000)
-bind(#20027,#20028)
+entry_cfg_node(#20027,#20001)
+#20028=@"loc,{#10000},1,1,1,0"
+locations_default(#20028,#10000,1,1,1,0)
+hasLocation(#20027,#20028)
 #20029=*
-entry_cfg_node(#20029,#20001)
-#20030=@"loc,{#10000},1,1,1,0"
-locations_default(#20030,#10000,1,1,1,0)
-hasLocation(#20029,#20030)
-#20031=*
-exit_cfg_node(#20031,#20001)
-hasLocation(#20031,#20017)
+exit_cfg_node(#20029,#20001)
+hasLocation(#20029,#20017)
 successor(#20020,#20021)
-successor(#20021,#20023)
-successor(#20023,#20026)
-successor(#20027,#20025)
-successor(#20026,#20027)
-successor(#20025,#20031)
-successor(#20029,#20020)
+successor(#20021,#20024)
+successor(#20025,#20023)
+successor(#20024,#20025)
+successor(#20023,#20029)
+successor(#20027,#20020)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
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 c74fcdf8b1e3..3ca6cb4a291b 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
@@ -1032,652 +1032,638 @@ hasLocation(#20365,#20366)
 enclosing_stmt(#20365,#20364)
 expr_containers(#20365,#20001)
 #20367=*
-exprs(#20367,63,#20365,0,"(a?.b)")
-#20368=@"loc,{#10000},5,1,5,6"
-locations_default(#20368,#10000,5,1,5,6)
+exprs(#20367,14,#20365,0,"a?.b")
+#20368=@"loc,{#10000},5,2,5,5"
+locations_default(#20368,#10000,5,2,5,5)
 hasLocation(#20367,#20368)
 enclosing_stmt(#20367,#20364)
 expr_containers(#20367,#20001)
 #20369=*
-exprs(#20369,14,#20367,0,"a?.b")
-#20370=@"loc,{#10000},5,2,5,5"
-locations_default(#20370,#10000,5,2,5,5)
-hasLocation(#20369,#20370)
+exprs(#20369,79,#20367,0,"a")
+hasLocation(#20369,#20117)
 enclosing_stmt(#20369,#20364)
 expr_containers(#20369,#20001)
+literals("a","a",#20369)
+bind(#20369,#20339)
+#20370=*
+exprs(#20370,0,#20367,1,"b")
+hasLocation(#20370,#20121)
+enclosing_stmt(#20370,#20364)
+expr_containers(#20370,#20001)
+literals("b","b",#20370)
+isOptionalChaining(#20367)
+has_parentheses(#20367,1)
 #20371=*
-exprs(#20371,79,#20369,0,"a")
-hasLocation(#20371,#20117)
+exprs(#20371,0,#20365,1,"c")
+hasLocation(#20371,#20127)
 enclosing_stmt(#20371,#20364)
 expr_containers(#20371,#20001)
-literals("a","a",#20371)
-bind(#20371,#20339)
+literals("c","c",#20371)
 #20372=*
-exprs(#20372,0,#20369,1,"b")
-hasLocation(#20372,#20121)
-enclosing_stmt(#20372,#20364)
-expr_containers(#20372,#20001)
-literals("b","b",#20372)
-isOptionalChaining(#20369)
+stmts(#20372,2,#20001,3,"(a?.b.c).d;")
+hasLocation(#20372,#20015)
+stmt_containers(#20372,#20001)
 #20373=*
-exprs(#20373,0,#20365,1,"c")
-hasLocation(#20373,#20127)
-enclosing_stmt(#20373,#20364)
+exprs(#20373,14,#20372,0,"(a?.b.c).d")
+#20374=@"loc,{#10000},7,1,7,10"
+locations_default(#20374,#10000,7,1,7,10)
+hasLocation(#20373,#20374)
+enclosing_stmt(#20373,#20372)
 expr_containers(#20373,#20001)
-literals("c","c",#20373)
-#20374=*
-stmts(#20374,2,#20001,3,"(a?.b.c).d;")
-hasLocation(#20374,#20015)
-stmt_containers(#20374,#20001)
 #20375=*
-exprs(#20375,14,#20374,0,"(a?.b.c).d")
-#20376=@"loc,{#10000},7,1,7,10"
-locations_default(#20376,#10000,7,1,7,10)
+exprs(#20375,14,#20373,0,"a?.b.c")
+#20376=@"loc,{#10000},7,2,7,7"
+locations_default(#20376,#10000,7,2,7,7)
 hasLocation(#20375,#20376)
-enclosing_stmt(#20375,#20374)
+enclosing_stmt(#20375,#20372)
 expr_containers(#20375,#20001)
 #20377=*
-exprs(#20377,63,#20375,0,"(a?.b.c)")
-#20378=@"loc,{#10000},7,1,7,8"
-locations_default(#20378,#10000,7,1,7,8)
+exprs(#20377,14,#20375,0,"a?.b")
+#20378=@"loc,{#10000},7,2,7,5"
+locations_default(#20378,#10000,7,2,7,5)
 hasLocation(#20377,#20378)
-enclosing_stmt(#20377,#20374)
+enclosing_stmt(#20377,#20372)
 expr_containers(#20377,#20001)
 #20379=*
-exprs(#20379,14,#20377,0,"a?.b.c")
-#20380=@"loc,{#10000},7,2,7,7"
-locations_default(#20380,#10000,7,2,7,7)
-hasLocation(#20379,#20380)
-enclosing_stmt(#20379,#20374)
+exprs(#20379,79,#20377,0,"a")
+hasLocation(#20379,#20133)
+enclosing_stmt(#20379,#20372)
 expr_containers(#20379,#20001)
+literals("a","a",#20379)
+bind(#20379,#20339)
+#20380=*
+exprs(#20380,0,#20377,1,"b")
+hasLocation(#20380,#20137)
+enclosing_stmt(#20380,#20372)
+expr_containers(#20380,#20001)
+literals("b","b",#20380)
+isOptionalChaining(#20377)
 #20381=*
-exprs(#20381,14,#20379,0,"a?.b")
-#20382=@"loc,{#10000},7,2,7,5"
-locations_default(#20382,#10000,7,2,7,5)
-hasLocation(#20381,#20382)
-enclosing_stmt(#20381,#20374)
+exprs(#20381,0,#20375,1,"c")
+hasLocation(#20381,#20141)
+enclosing_stmt(#20381,#20372)
 expr_containers(#20381,#20001)
+literals("c","c",#20381)
+has_parentheses(#20375,1)
+#20382=*
+exprs(#20382,0,#20373,1,"d")
+hasLocation(#20382,#20147)
+enclosing_stmt(#20382,#20372)
+expr_containers(#20382,#20001)
+literals("d","d",#20382)
 #20383=*
-exprs(#20383,79,#20381,0,"a")
-hasLocation(#20383,#20133)
-enclosing_stmt(#20383,#20374)
-expr_containers(#20383,#20001)
-literals("a","a",#20383)
-bind(#20383,#20339)
+stmts(#20383,2,#20001,4,"a?.[b?.c?.d].e?.f;")
+hasLocation(#20383,#20019)
+stmt_containers(#20383,#20001)
 #20384=*
-exprs(#20384,0,#20381,1,"b")
-hasLocation(#20384,#20137)
-enclosing_stmt(#20384,#20374)
+exprs(#20384,14,#20383,0,"a?.[b?.c?.d].e?.f")
+#20385=@"loc,{#10000},9,1,9,17"
+locations_default(#20385,#10000,9,1,9,17)
+hasLocation(#20384,#20385)
+enclosing_stmt(#20384,#20383)
 expr_containers(#20384,#20001)
-literals("b","b",#20384)
-isOptionalChaining(#20381)
-#20385=*
-exprs(#20385,0,#20379,1,"c")
-hasLocation(#20385,#20141)
-enclosing_stmt(#20385,#20374)
-expr_containers(#20385,#20001)
-literals("c","c",#20385)
 #20386=*
-exprs(#20386,0,#20375,1,"d")
-hasLocation(#20386,#20147)
-enclosing_stmt(#20386,#20374)
+exprs(#20386,14,#20384,0,"a?.[b?.c?.d].e")
+#20387=@"loc,{#10000},9,1,9,14"
+locations_default(#20387,#10000,9,1,9,14)
+hasLocation(#20386,#20387)
+enclosing_stmt(#20386,#20383)
 expr_containers(#20386,#20001)
-literals("d","d",#20386)
-#20387=*
-stmts(#20387,2,#20001,4,"a?.[b?.c?.d].e?.f;")
-hasLocation(#20387,#20019)
-stmt_containers(#20387,#20001)
 #20388=*
-exprs(#20388,14,#20387,0,"a?.[b?.c?.d].e?.f")
-#20389=@"loc,{#10000},9,1,9,17"
-locations_default(#20389,#10000,9,1,9,17)
+exprs(#20388,15,#20386,0,"a?.[b?.c?.d]")
+#20389=@"loc,{#10000},9,1,9,12"
+locations_default(#20389,#10000,9,1,9,12)
 hasLocation(#20388,#20389)
-enclosing_stmt(#20388,#20387)
+enclosing_stmt(#20388,#20383)
 expr_containers(#20388,#20001)
 #20390=*
-exprs(#20390,14,#20388,0,"a?.[b?.c?.d].e")
-#20391=@"loc,{#10000},9,1,9,14"
-locations_default(#20391,#10000,9,1,9,14)
-hasLocation(#20390,#20391)
-enclosing_stmt(#20390,#20387)
+exprs(#20390,79,#20388,0,"a")
+hasLocation(#20390,#20151)
+enclosing_stmt(#20390,#20383)
 expr_containers(#20390,#20001)
-#20392=*
-exprs(#20392,15,#20390,0,"a?.[b?.c?.d]")
-#20393=@"loc,{#10000},9,1,9,12"
-locations_default(#20393,#10000,9,1,9,12)
-hasLocation(#20392,#20393)
-enclosing_stmt(#20392,#20387)
-expr_containers(#20392,#20001)
-#20394=*
-exprs(#20394,79,#20392,0,"a")
-hasLocation(#20394,#20151)
-enclosing_stmt(#20394,#20387)
-expr_containers(#20394,#20001)
-literals("a","a",#20394)
-bind(#20394,#20339)
+literals("a","a",#20390)
+bind(#20390,#20339)
+#20391=*
+exprs(#20391,14,#20388,1,"b?.c?.d")
+#20392=@"loc,{#10000},9,5,9,11"
+locations_default(#20392,#10000,9,5,9,11)
+hasLocation(#20391,#20392)
+enclosing_stmt(#20391,#20383)
+expr_containers(#20391,#20001)
+#20393=*
+exprs(#20393,14,#20391,0,"b?.c")
+#20394=@"loc,{#10000},9,5,9,8"
+locations_default(#20394,#10000,9,5,9,8)
+hasLocation(#20393,#20394)
+enclosing_stmt(#20393,#20383)
+expr_containers(#20393,#20001)
 #20395=*
-exprs(#20395,14,#20392,1,"b?.c?.d")
-#20396=@"loc,{#10000},9,5,9,11"
-locations_default(#20396,#10000,9,5,9,11)
-hasLocation(#20395,#20396)
-enclosing_stmt(#20395,#20387)
+exprs(#20395,79,#20393,0,"b")
+hasLocation(#20395,#20157)
+enclosing_stmt(#20395,#20383)
 expr_containers(#20395,#20001)
+literals("b","b",#20395)
+#20396=@"var;{b};{#20000}"
+variables(#20396,"b",#20000)
+bind(#20395,#20396)
 #20397=*
-exprs(#20397,14,#20395,0,"b?.c")
-#20398=@"loc,{#10000},9,5,9,8"
-locations_default(#20398,#10000,9,5,9,8)
-hasLocation(#20397,#20398)
-enclosing_stmt(#20397,#20387)
+exprs(#20397,0,#20393,1,"c")
+hasLocation(#20397,#20161)
+enclosing_stmt(#20397,#20383)
 expr_containers(#20397,#20001)
+literals("c","c",#20397)
+isOptionalChaining(#20393)
+#20398=*
+exprs(#20398,0,#20391,1,"d")
+hasLocation(#20398,#20165)
+enclosing_stmt(#20398,#20383)
+expr_containers(#20398,#20001)
+literals("d","d",#20398)
+isOptionalChaining(#20391)
+isOptionalChaining(#20388)
 #20399=*
-exprs(#20399,79,#20397,0,"b")
-hasLocation(#20399,#20157)
-enclosing_stmt(#20399,#20387)
+exprs(#20399,0,#20386,1,"e")
+hasLocation(#20399,#20171)
+enclosing_stmt(#20399,#20383)
 expr_containers(#20399,#20001)
-literals("b","b",#20399)
-#20400=@"var;{b};{#20000}"
-variables(#20400,"b",#20000)
-bind(#20399,#20400)
+literals("e","e",#20399)
+#20400=*
+exprs(#20400,0,#20384,1,"f")
+hasLocation(#20400,#20175)
+enclosing_stmt(#20400,#20383)
+expr_containers(#20400,#20001)
+literals("f","f",#20400)
+isOptionalChaining(#20384)
 #20401=*
-exprs(#20401,0,#20397,1,"c")
-hasLocation(#20401,#20161)
-enclosing_stmt(#20401,#20387)
-expr_containers(#20401,#20001)
-literals("c","c",#20401)
-isOptionalChaining(#20397)
+stmts(#20401,2,#20001,5,"a?.()[b ... ?.().f;")
+hasLocation(#20401,#20023)
+stmt_containers(#20401,#20001)
 #20402=*
-exprs(#20402,0,#20395,1,"d")
-hasLocation(#20402,#20165)
-enclosing_stmt(#20402,#20387)
+exprs(#20402,14,#20401,0,"a?.()[b ... e?.().f")
+#20403=@"loc,{#10000},11,1,11,28"
+locations_default(#20403,#10000,11,1,11,28)
+hasLocation(#20402,#20403)
+enclosing_stmt(#20402,#20401)
 expr_containers(#20402,#20001)
-literals("d","d",#20402)
-isOptionalChaining(#20395)
-isOptionalChaining(#20392)
-#20403=*
-exprs(#20403,0,#20390,1,"e")
-hasLocation(#20403,#20171)
-enclosing_stmt(#20403,#20387)
-expr_containers(#20403,#20001)
-literals("e","e",#20403)
 #20404=*
-exprs(#20404,0,#20388,1,"f")
-hasLocation(#20404,#20175)
-enclosing_stmt(#20404,#20387)
+exprs(#20404,13,#20402,0,"a?.()[b ... ].e?.()")
+#20405=@"loc,{#10000},11,1,11,26"
+locations_default(#20405,#10000,11,1,11,26)
+hasLocation(#20404,#20405)
+enclosing_stmt(#20404,#20401)
 expr_containers(#20404,#20001)
-literals("f","f",#20404)
-isOptionalChaining(#20388)
-#20405=*
-stmts(#20405,2,#20001,5,"a?.()[b ... ?.().f;")
-hasLocation(#20405,#20023)
-stmt_containers(#20405,#20001)
 #20406=*
-exprs(#20406,14,#20405,0,"a?.()[b ... e?.().f")
-#20407=@"loc,{#10000},11,1,11,28"
-locations_default(#20407,#10000,11,1,11,28)
+exprs(#20406,14,#20404,-1,"a?.()[b ... ().d].e")
+#20407=@"loc,{#10000},11,1,11,22"
+locations_default(#20407,#10000,11,1,11,22)
 hasLocation(#20406,#20407)
-enclosing_stmt(#20406,#20405)
+enclosing_stmt(#20406,#20401)
 expr_containers(#20406,#20001)
 #20408=*
-exprs(#20408,13,#20406,0,"a?.()[b ... ].e?.()")
-#20409=@"loc,{#10000},11,1,11,26"
-locations_default(#20409,#10000,11,1,11,26)
+exprs(#20408,15,#20406,0,"a?.()[b?.().c?.().d]")
+#20409=@"loc,{#10000},11,1,11,20"
+locations_default(#20409,#10000,11,1,11,20)
 hasLocation(#20408,#20409)
-enclosing_stmt(#20408,#20405)
+enclosing_stmt(#20408,#20401)
 expr_containers(#20408,#20001)
 #20410=*
-exprs(#20410,14,#20408,-1,"a?.()[b ... ().d].e")
-#20411=@"loc,{#10000},11,1,11,22"
-locations_default(#20411,#10000,11,1,11,22)
+exprs(#20410,13,#20408,0,"a?.()")
+#20411=@"loc,{#10000},11,1,11,5"
+locations_default(#20411,#10000,11,1,11,5)
 hasLocation(#20410,#20411)
-enclosing_stmt(#20410,#20405)
+enclosing_stmt(#20410,#20401)
 expr_containers(#20410,#20001)
 #20412=*
-exprs(#20412,15,#20410,0,"a?.()[b?.().c?.().d]")
-#20413=@"loc,{#10000},11,1,11,20"
-locations_default(#20413,#10000,11,1,11,20)
-hasLocation(#20412,#20413)
-enclosing_stmt(#20412,#20405)
+exprs(#20412,79,#20410,-1,"a")
+hasLocation(#20412,#20179)
+enclosing_stmt(#20412,#20401)
 expr_containers(#20412,#20001)
-#20414=*
-exprs(#20414,13,#20412,0,"a?.()")
-#20415=@"loc,{#10000},11,1,11,5"
-locations_default(#20415,#10000,11,1,11,5)
-hasLocation(#20414,#20415)
-enclosing_stmt(#20414,#20405)
-expr_containers(#20414,#20001)
-#20416=*
-exprs(#20416,79,#20414,-1,"a")
-hasLocation(#20416,#20179)
-enclosing_stmt(#20416,#20405)
-expr_containers(#20416,#20001)
-literals("a","a",#20416)
-bind(#20416,#20339)
-isOptionalChaining(#20414)
+literals("a","a",#20412)
+bind(#20412,#20339)
+isOptionalChaining(#20410)
+#20413=*
+exprs(#20413,14,#20408,1,"b?.().c?.().d")
+#20414=@"loc,{#10000},11,7,11,19"
+locations_default(#20414,#10000,11,7,11,19)
+hasLocation(#20413,#20414)
+enclosing_stmt(#20413,#20401)
+expr_containers(#20413,#20001)
+#20415=*
+exprs(#20415,13,#20413,0,"b?.().c?.()")
+#20416=@"loc,{#10000},11,7,11,17"
+locations_default(#20416,#10000,11,7,11,17)
+hasLocation(#20415,#20416)
+enclosing_stmt(#20415,#20401)
+expr_containers(#20415,#20001)
 #20417=*
-exprs(#20417,14,#20412,1,"b?.().c?.().d")
-#20418=@"loc,{#10000},11,7,11,19"
-locations_default(#20418,#10000,11,7,11,19)
+exprs(#20417,14,#20415,-1,"b?.().c")
+#20418=@"loc,{#10000},11,7,11,13"
+locations_default(#20418,#10000,11,7,11,13)
 hasLocation(#20417,#20418)
-enclosing_stmt(#20417,#20405)
+enclosing_stmt(#20417,#20401)
 expr_containers(#20417,#20001)
 #20419=*
-exprs(#20419,13,#20417,0,"b?.().c?.()")
-#20420=@"loc,{#10000},11,7,11,17"
-locations_default(#20420,#10000,11,7,11,17)
+exprs(#20419,13,#20417,0,"b?.()")
+#20420=@"loc,{#10000},11,7,11,11"
+locations_default(#20420,#10000,11,7,11,11)
 hasLocation(#20419,#20420)
-enclosing_stmt(#20419,#20405)
+enclosing_stmt(#20419,#20401)
 expr_containers(#20419,#20001)
 #20421=*
-exprs(#20421,14,#20419,-1,"b?.().c")
-#20422=@"loc,{#10000},11,7,11,13"
-locations_default(#20422,#10000,11,7,11,13)
-hasLocation(#20421,#20422)
-enclosing_stmt(#20421,#20405)
+exprs(#20421,79,#20419,-1,"b")
+hasLocation(#20421,#20189)
+enclosing_stmt(#20421,#20401)
 expr_containers(#20421,#20001)
+literals("b","b",#20421)
+bind(#20421,#20396)
+isOptionalChaining(#20419)
+#20422=*
+exprs(#20422,0,#20417,1,"c")
+hasLocation(#20422,#20199)
+enclosing_stmt(#20422,#20401)
+expr_containers(#20422,#20001)
+literals("c","c",#20422)
+isOptionalChaining(#20415)
 #20423=*
-exprs(#20423,13,#20421,0,"b?.()")
-#20424=@"loc,{#10000},11,7,11,11"
-locations_default(#20424,#10000,11,7,11,11)
-hasLocation(#20423,#20424)
-enclosing_stmt(#20423,#20405)
+exprs(#20423,0,#20413,1,"d")
+hasLocation(#20423,#20209)
+enclosing_stmt(#20423,#20401)
 expr_containers(#20423,#20001)
+literals("d","d",#20423)
+#20424=*
+exprs(#20424,0,#20406,1,"e")
+hasLocation(#20424,#20215)
+enclosing_stmt(#20424,#20401)
+expr_containers(#20424,#20001)
+literals("e","e",#20424)
+isOptionalChaining(#20404)
 #20425=*
-exprs(#20425,79,#20423,-1,"b")
-hasLocation(#20425,#20189)
-enclosing_stmt(#20425,#20405)
+exprs(#20425,0,#20402,1,"f")
+hasLocation(#20425,#20225)
+enclosing_stmt(#20425,#20401)
 expr_containers(#20425,#20001)
-literals("b","b",#20425)
-bind(#20425,#20400)
-isOptionalChaining(#20423)
+literals("f","f",#20425)
 #20426=*
-exprs(#20426,0,#20421,1,"c")
-hasLocation(#20426,#20199)
-enclosing_stmt(#20426,#20405)
-expr_containers(#20426,#20001)
-literals("c","c",#20426)
-isOptionalChaining(#20419)
-#20427=*
-exprs(#20427,0,#20417,1,"d")
-hasLocation(#20427,#20209)
-enclosing_stmt(#20427,#20405)
-expr_containers(#20427,#20001)
-literals("d","d",#20427)
+stmts(#20426,3,#20001,6,"if (a?. ... alse;\n}")
+#20427=@"loc,{#10000},13,1,17,1"
+locations_default(#20427,#10000,13,1,17,1)
+hasLocation(#20426,#20427)
+stmt_containers(#20426,#20001)
 #20428=*
-exprs(#20428,0,#20410,1,"e")
-hasLocation(#20428,#20215)
-enclosing_stmt(#20428,#20405)
+exprs(#20428,14,#20426,0,"a?.b")
+#20429=@"loc,{#10000},13,5,13,8"
+locations_default(#20429,#10000,13,5,13,8)
+hasLocation(#20428,#20429)
+enclosing_stmt(#20428,#20426)
 expr_containers(#20428,#20001)
-literals("e","e",#20428)
-isOptionalChaining(#20408)
-#20429=*
-exprs(#20429,0,#20406,1,"f")
-hasLocation(#20429,#20225)
-enclosing_stmt(#20429,#20405)
-expr_containers(#20429,#20001)
-literals("f","f",#20429)
 #20430=*
-stmts(#20430,3,#20001,6,"if (a?. ... alse;\n}")
-#20431=@"loc,{#10000},13,1,17,1"
-locations_default(#20431,#10000,13,1,17,1)
-hasLocation(#20430,#20431)
-stmt_containers(#20430,#20001)
+exprs(#20430,79,#20428,0,"a")
+hasLocation(#20430,#20233)
+enclosing_stmt(#20430,#20426)
+expr_containers(#20430,#20001)
+literals("a","a",#20430)
+bind(#20430,#20339)
+#20431=*
+exprs(#20431,0,#20428,1,"b")
+hasLocation(#20431,#20237)
+enclosing_stmt(#20431,#20426)
+expr_containers(#20431,#20001)
+literals("b","b",#20431)
+isOptionalChaining(#20428)
 #20432=*
-exprs(#20432,14,#20430,0,"a?.b")
-#20433=@"loc,{#10000},13,5,13,8"
-locations_default(#20433,#10000,13,5,13,8)
+stmts(#20432,1,#20426,1,"{\n    true;\n}")
+#20433=@"loc,{#10000},13,11,15,1"
+locations_default(#20433,#10000,13,11,15,1)
 hasLocation(#20432,#20433)
-enclosing_stmt(#20432,#20430)
-expr_containers(#20432,#20001)
+stmt_containers(#20432,#20001)
 #20434=*
-exprs(#20434,79,#20432,0,"a")
-hasLocation(#20434,#20233)
-enclosing_stmt(#20434,#20430)
-expr_containers(#20434,#20001)
-literals("a","a",#20434)
-bind(#20434,#20339)
-#20435=*
-exprs(#20435,0,#20432,1,"b")
-hasLocation(#20435,#20237)
-enclosing_stmt(#20435,#20430)
-expr_containers(#20435,#20001)
-literals("b","b",#20435)
-isOptionalChaining(#20432)
+stmts(#20434,2,#20432,0,"true;")
+#20435=@"loc,{#10000},14,5,14,9"
+locations_default(#20435,#10000,14,5,14,9)
+hasLocation(#20434,#20435)
+stmt_containers(#20434,#20001)
 #20436=*
-stmts(#20436,1,#20430,1,"{\n    true;\n}")
-#20437=@"loc,{#10000},13,11,15,1"
-locations_default(#20437,#10000,13,11,15,1)
-hasLocation(#20436,#20437)
-stmt_containers(#20436,#20001)
-#20438=*
-stmts(#20438,2,#20436,0,"true;")
-#20439=@"loc,{#10000},14,5,14,9"
-locations_default(#20439,#10000,14,5,14,9)
-hasLocation(#20438,#20439)
-stmt_containers(#20438,#20001)
-#20440=*
-exprs(#20440,2,#20438,0,"true")
-hasLocation(#20440,#20243)
-enclosing_stmt(#20440,#20438)
-expr_containers(#20440,#20001)
-literals("true","true",#20440)
+exprs(#20436,2,#20434,0,"true")
+hasLocation(#20436,#20243)
+enclosing_stmt(#20436,#20434)
+expr_containers(#20436,#20001)
+literals("true","true",#20436)
+#20437=*
+stmts(#20437,1,#20426,2,"{\n    false;\n}")
+#20438=@"loc,{#10000},15,8,17,1"
+locations_default(#20438,#10000,15,8,17,1)
+hasLocation(#20437,#20438)
+stmt_containers(#20437,#20001)
+#20439=*
+stmts(#20439,2,#20437,0,"false;")
+#20440=@"loc,{#10000},16,5,16,10"
+locations_default(#20440,#10000,16,5,16,10)
+hasLocation(#20439,#20440)
+stmt_containers(#20439,#20001)
 #20441=*
-stmts(#20441,1,#20430,2,"{\n    false;\n}")
-#20442=@"loc,{#10000},15,8,17,1"
-locations_default(#20442,#10000,15,8,17,1)
-hasLocation(#20441,#20442)
-stmt_containers(#20441,#20001)
-#20443=*
-stmts(#20443,2,#20441,0,"false;")
-#20444=@"loc,{#10000},16,5,16,10"
-locations_default(#20444,#10000,16,5,16,10)
-hasLocation(#20443,#20444)
-stmt_containers(#20443,#20001)
-#20445=*
-exprs(#20445,2,#20443,0,"false")
-hasLocation(#20445,#20253)
-enclosing_stmt(#20445,#20443)
-expr_containers(#20445,#20001)
-literals("false","false",#20445)
+exprs(#20441,2,#20439,0,"false")
+hasLocation(#20441,#20253)
+enclosing_stmt(#20441,#20439)
+expr_containers(#20441,#20001)
+literals("false","false",#20441)
+#20442=*
+stmts(#20442,3,#20001,7,"if (!a? ... alse;\n}")
+#20443=@"loc,{#10000},19,1,23,1"
+locations_default(#20443,#10000,19,1,23,1)
+hasLocation(#20442,#20443)
+stmt_containers(#20442,#20001)
+#20444=*
+exprs(#20444,18,#20442,0,"!a?.b")
+#20445=@"loc,{#10000},19,5,19,9"
+locations_default(#20445,#10000,19,5,19,9)
+hasLocation(#20444,#20445)
+enclosing_stmt(#20444,#20442)
+expr_containers(#20444,#20001)
 #20446=*
-stmts(#20446,3,#20001,7,"if (!a? ... alse;\n}")
-#20447=@"loc,{#10000},19,1,23,1"
-locations_default(#20447,#10000,19,1,23,1)
+exprs(#20446,14,#20444,0,"a?.b")
+#20447=@"loc,{#10000},19,6,19,9"
+locations_default(#20447,#10000,19,6,19,9)
 hasLocation(#20446,#20447)
-stmt_containers(#20446,#20001)
+enclosing_stmt(#20446,#20442)
+expr_containers(#20446,#20001)
 #20448=*
-exprs(#20448,18,#20446,0,"!a?.b")
-#20449=@"loc,{#10000},19,5,19,9"
-locations_default(#20449,#10000,19,5,19,9)
-hasLocation(#20448,#20449)
-enclosing_stmt(#20448,#20446)
+exprs(#20448,79,#20446,0,"a")
+hasLocation(#20448,#20264)
+enclosing_stmt(#20448,#20442)
 expr_containers(#20448,#20001)
+literals("a","a",#20448)
+bind(#20448,#20339)
+#20449=*
+exprs(#20449,0,#20446,1,"b")
+hasLocation(#20449,#20268)
+enclosing_stmt(#20449,#20442)
+expr_containers(#20449,#20001)
+literals("b","b",#20449)
+isOptionalChaining(#20446)
 #20450=*
-exprs(#20450,14,#20448,0,"a?.b")
-#20451=@"loc,{#10000},19,6,19,9"
-locations_default(#20451,#10000,19,6,19,9)
+stmts(#20450,1,#20442,1,"{\n    true;\n}")
+#20451=@"loc,{#10000},19,12,21,1"
+locations_default(#20451,#10000,19,12,21,1)
 hasLocation(#20450,#20451)
-enclosing_stmt(#20450,#20446)
-expr_containers(#20450,#20001)
+stmt_containers(#20450,#20001)
 #20452=*
-exprs(#20452,79,#20450,0,"a")
-hasLocation(#20452,#20264)
-enclosing_stmt(#20452,#20446)
-expr_containers(#20452,#20001)
-literals("a","a",#20452)
-bind(#20452,#20339)
-#20453=*
-exprs(#20453,0,#20450,1,"b")
-hasLocation(#20453,#20268)
-enclosing_stmt(#20453,#20446)
-expr_containers(#20453,#20001)
-literals("b","b",#20453)
-isOptionalChaining(#20450)
+stmts(#20452,2,#20450,0,"true;")
+#20453=@"loc,{#10000},20,5,20,9"
+locations_default(#20453,#10000,20,5,20,9)
+hasLocation(#20452,#20453)
+stmt_containers(#20452,#20001)
 #20454=*
-stmts(#20454,1,#20446,1,"{\n    true;\n}")
-#20455=@"loc,{#10000},19,12,21,1"
-locations_default(#20455,#10000,19,12,21,1)
-hasLocation(#20454,#20455)
-stmt_containers(#20454,#20001)
-#20456=*
-stmts(#20456,2,#20454,0,"true;")
-#20457=@"loc,{#10000},20,5,20,9"
-locations_default(#20457,#10000,20,5,20,9)
-hasLocation(#20456,#20457)
-stmt_containers(#20456,#20001)
-#20458=*
-exprs(#20458,2,#20456,0,"true")
-hasLocation(#20458,#20274)
-enclosing_stmt(#20458,#20456)
-expr_containers(#20458,#20001)
-literals("true","true",#20458)
+exprs(#20454,2,#20452,0,"true")
+hasLocation(#20454,#20274)
+enclosing_stmt(#20454,#20452)
+expr_containers(#20454,#20001)
+literals("true","true",#20454)
+#20455=*
+stmts(#20455,1,#20442,2,"{\n    false;\n}")
+#20456=@"loc,{#10000},21,8,23,1"
+locations_default(#20456,#10000,21,8,23,1)
+hasLocation(#20455,#20456)
+stmt_containers(#20455,#20001)
+#20457=*
+stmts(#20457,2,#20455,0,"false;")
+#20458=@"loc,{#10000},22,5,22,10"
+locations_default(#20458,#10000,22,5,22,10)
+hasLocation(#20457,#20458)
+stmt_containers(#20457,#20001)
 #20459=*
-stmts(#20459,1,#20446,2,"{\n    false;\n}")
-#20460=@"loc,{#10000},21,8,23,1"
-locations_default(#20460,#10000,21,8,23,1)
-hasLocation(#20459,#20460)
-stmt_containers(#20459,#20001)
-#20461=*
-stmts(#20461,2,#20459,0,"false;")
-#20462=@"loc,{#10000},22,5,22,10"
-locations_default(#20462,#10000,22,5,22,10)
-hasLocation(#20461,#20462)
-stmt_containers(#20461,#20001)
-#20463=*
-exprs(#20463,2,#20461,0,"false")
-hasLocation(#20463,#20284)
-enclosing_stmt(#20463,#20461)
-expr_containers(#20463,#20001)
-literals("false","false",#20463)
+exprs(#20459,2,#20457,0,"false")
+hasLocation(#20459,#20284)
+enclosing_stmt(#20459,#20457)
+expr_containers(#20459,#20001)
+literals("false","false",#20459)
+#20460=*
+stmts(#20460,3,#20001,8,"if (a?. ... alse;\n}")
+#20461=@"loc,{#10000},25,1,29,1"
+locations_default(#20461,#10000,25,1,29,1)
+hasLocation(#20460,#20461)
+stmt_containers(#20460,#20001)
+#20462=*
+exprs(#20462,44,#20460,0,"a?.b && c?.d")
+#20463=@"loc,{#10000},25,5,25,16"
+locations_default(#20463,#10000,25,5,25,16)
+hasLocation(#20462,#20463)
+enclosing_stmt(#20462,#20460)
+expr_containers(#20462,#20001)
 #20464=*
-stmts(#20464,3,#20001,8,"if (a?. ... alse;\n}")
-#20465=@"loc,{#10000},25,1,29,1"
-locations_default(#20465,#10000,25,1,29,1)
+exprs(#20464,14,#20462,0,"a?.b")
+#20465=@"loc,{#10000},25,5,25,8"
+locations_default(#20465,#10000,25,5,25,8)
 hasLocation(#20464,#20465)
-stmt_containers(#20464,#20001)
+enclosing_stmt(#20464,#20460)
+expr_containers(#20464,#20001)
 #20466=*
-exprs(#20466,44,#20464,0,"a?.b && c?.d")
-#20467=@"loc,{#10000},25,5,25,16"
-locations_default(#20467,#10000,25,5,25,16)
-hasLocation(#20466,#20467)
-enclosing_stmt(#20466,#20464)
+exprs(#20466,79,#20464,0,"a")
+hasLocation(#20466,#20293)
+enclosing_stmt(#20466,#20460)
 expr_containers(#20466,#20001)
+literals("a","a",#20466)
+bind(#20466,#20339)
+#20467=*
+exprs(#20467,0,#20464,1,"b")
+hasLocation(#20467,#20297)
+enclosing_stmt(#20467,#20460)
+expr_containers(#20467,#20001)
+literals("b","b",#20467)
+isOptionalChaining(#20464)
 #20468=*
-exprs(#20468,14,#20466,0,"a?.b")
-#20469=@"loc,{#10000},25,5,25,8"
-locations_default(#20469,#10000,25,5,25,8)
+exprs(#20468,14,#20462,1,"c?.d")
+#20469=@"loc,{#10000},25,13,25,16"
+locations_default(#20469,#10000,25,13,25,16)
 hasLocation(#20468,#20469)
-enclosing_stmt(#20468,#20464)
+enclosing_stmt(#20468,#20460)
 expr_containers(#20468,#20001)
 #20470=*
-exprs(#20470,79,#20468,0,"a")
-hasLocation(#20470,#20293)
-enclosing_stmt(#20470,#20464)
+exprs(#20470,79,#20468,0,"c")
+hasLocation(#20470,#20301)
+enclosing_stmt(#20470,#20460)
 expr_containers(#20470,#20001)
-literals("a","a",#20470)
-bind(#20470,#20339)
-#20471=*
-exprs(#20471,0,#20468,1,"b")
-hasLocation(#20471,#20297)
-enclosing_stmt(#20471,#20464)
-expr_containers(#20471,#20001)
-literals("b","b",#20471)
-isOptionalChaining(#20468)
+literals("c","c",#20470)
+#20471=@"var;{c};{#20000}"
+variables(#20471,"c",#20000)
+bind(#20470,#20471)
 #20472=*
-exprs(#20472,14,#20466,1,"c?.d")
-#20473=@"loc,{#10000},25,13,25,16"
-locations_default(#20473,#10000,25,13,25,16)
-hasLocation(#20472,#20473)
-enclosing_stmt(#20472,#20464)
+exprs(#20472,0,#20468,1,"d")
+hasLocation(#20472,#20305)
+enclosing_stmt(#20472,#20460)
 expr_containers(#20472,#20001)
-#20474=*
-exprs(#20474,79,#20472,0,"c")
-hasLocation(#20474,#20301)
-enclosing_stmt(#20474,#20464)
-expr_containers(#20474,#20001)
-literals("c","c",#20474)
-#20475=@"var;{c};{#20000}"
-variables(#20475,"c",#20000)
-bind(#20474,#20475)
-#20476=*
-exprs(#20476,0,#20472,1,"d")
-hasLocation(#20476,#20305)
-enclosing_stmt(#20476,#20464)
-expr_containers(#20476,#20001)
-literals("d","d",#20476)
-isOptionalChaining(#20472)
+literals("d","d",#20472)
+isOptionalChaining(#20468)
+#20473=*
+stmts(#20473,1,#20460,1,"{\n    true;\n}")
+#20474=@"loc,{#10000},25,19,27,1"
+locations_default(#20474,#10000,25,19,27,1)
+hasLocation(#20473,#20474)
+stmt_containers(#20473,#20001)
+#20475=*
+stmts(#20475,2,#20473,0,"true;")
+#20476=@"loc,{#10000},26,5,26,9"
+locations_default(#20476,#10000,26,5,26,9)
+hasLocation(#20475,#20476)
+stmt_containers(#20475,#20001)
 #20477=*
-stmts(#20477,1,#20464,1,"{\n    true;\n}")
-#20478=@"loc,{#10000},25,19,27,1"
-locations_default(#20478,#10000,25,19,27,1)
-hasLocation(#20477,#20478)
-stmt_containers(#20477,#20001)
-#20479=*
-stmts(#20479,2,#20477,0,"true;")
-#20480=@"loc,{#10000},26,5,26,9"
-locations_default(#20480,#10000,26,5,26,9)
-hasLocation(#20479,#20480)
-stmt_containers(#20479,#20001)
-#20481=*
-exprs(#20481,2,#20479,0,"true")
-hasLocation(#20481,#20311)
-enclosing_stmt(#20481,#20479)
-expr_containers(#20481,#20001)
-literals("true","true",#20481)
+exprs(#20477,2,#20475,0,"true")
+hasLocation(#20477,#20311)
+enclosing_stmt(#20477,#20475)
+expr_containers(#20477,#20001)
+literals("true","true",#20477)
+#20478=*
+stmts(#20478,1,#20460,2,"{\n    false;\n}")
+#20479=@"loc,{#10000},27,8,29,1"
+locations_default(#20479,#10000,27,8,29,1)
+hasLocation(#20478,#20479)
+stmt_containers(#20478,#20001)
+#20480=*
+stmts(#20480,2,#20478,0,"false;")
+#20481=@"loc,{#10000},28,5,28,10"
+locations_default(#20481,#10000,28,5,28,10)
+hasLocation(#20480,#20481)
+stmt_containers(#20480,#20001)
 #20482=*
-stmts(#20482,1,#20464,2,"{\n    false;\n}")
-#20483=@"loc,{#10000},27,8,29,1"
-locations_default(#20483,#10000,27,8,29,1)
-hasLocation(#20482,#20483)
-stmt_containers(#20482,#20001)
-#20484=*
-stmts(#20484,2,#20482,0,"false;")
-#20485=@"loc,{#10000},28,5,28,10"
-locations_default(#20485,#10000,28,5,28,10)
-hasLocation(#20484,#20485)
-stmt_containers(#20484,#20001)
+exprs(#20482,2,#20480,0,"false")
+hasLocation(#20482,#20321)
+enclosing_stmt(#20482,#20480)
+expr_containers(#20482,#20001)
+literals("false","false",#20482)
+#20483=*
+entry_cfg_node(#20483,#20001)
+#20484=@"loc,{#10000},1,1,1,0"
+locations_default(#20484,#10000,1,1,1,0)
+hasLocation(#20483,#20484)
+#20485=*
+exit_cfg_node(#20485,#20001)
+hasLocation(#20485,#20326)
+successor(#20460,#20462)
+successor(#20462,#20466)
+successor(#20467,#20464)
+successor(#20466,#20467)
 #20486=*
-exprs(#20486,2,#20484,0,"false")
-hasLocation(#20486,#20321)
-enclosing_stmt(#20486,#20484)
-expr_containers(#20486,#20001)
-literals("false","false",#20486)
+guard_node(#20486,1,#20464)
+hasLocation(#20486,#20465)
+successor(#20486,#20470)
 #20487=*
-entry_cfg_node(#20487,#20001)
-#20488=@"loc,{#10000},1,1,1,0"
-locations_default(#20488,#10000,1,1,1,0)
-hasLocation(#20487,#20488)
+guard_node(#20487,0,#20464)
+hasLocation(#20487,#20465)
+successor(#20487,#20478)
+successor(#20464,#20486)
+successor(#20464,#20487)
+successor(#20466,#20478)
+successor(#20472,#20468)
+successor(#20470,#20472)
+#20488=*
+guard_node(#20488,1,#20468)
+hasLocation(#20488,#20469)
+successor(#20488,#20473)
 #20489=*
-exit_cfg_node(#20489,#20001)
-hasLocation(#20489,#20326)
-successor(#20464,#20466)
-successor(#20466,#20470)
-successor(#20471,#20468)
-successor(#20470,#20471)
+guard_node(#20489,0,#20468)
+hasLocation(#20489,#20469)
+successor(#20489,#20478)
+successor(#20468,#20488)
+successor(#20468,#20489)
+successor(#20470,#20478)
+successor(#20475,#20477)
+successor(#20477,#20485)
+successor(#20473,#20475)
+successor(#20480,#20482)
+successor(#20482,#20485)
+successor(#20478,#20480)
+successor(#20442,#20448)
+successor(#20449,#20446)
+successor(#20448,#20449)
+successor(#20446,#20444)
+successor(#20448,#20444)
 #20490=*
-guard_node(#20490,1,#20468)
-hasLocation(#20490,#20469)
-successor(#20490,#20474)
+guard_node(#20490,0,#20446)
+hasLocation(#20490,#20447)
+successor(#20490,#20450)
 #20491=*
-guard_node(#20491,0,#20468)
-hasLocation(#20491,#20469)
-successor(#20491,#20482)
-successor(#20468,#20490)
-successor(#20468,#20491)
-successor(#20470,#20482)
-successor(#20476,#20472)
-successor(#20474,#20476)
+guard_node(#20491,1,#20446)
+hasLocation(#20491,#20447)
+successor(#20491,#20455)
+successor(#20444,#20490)
+successor(#20444,#20491)
+successor(#20452,#20454)
+successor(#20454,#20460)
+successor(#20450,#20452)
+successor(#20457,#20459)
+successor(#20459,#20460)
+successor(#20455,#20457)
+successor(#20426,#20430)
+successor(#20431,#20428)
+successor(#20430,#20431)
 #20492=*
-guard_node(#20492,1,#20472)
-hasLocation(#20492,#20473)
-successor(#20492,#20477)
+guard_node(#20492,1,#20428)
+hasLocation(#20492,#20429)
+successor(#20492,#20432)
 #20493=*
-guard_node(#20493,0,#20472)
-hasLocation(#20493,#20473)
-successor(#20493,#20482)
-successor(#20472,#20492)
-successor(#20472,#20493)
-successor(#20474,#20482)
-successor(#20479,#20481)
-successor(#20481,#20489)
-successor(#20477,#20479)
-successor(#20484,#20486)
-successor(#20486,#20489)
-successor(#20482,#20484)
-successor(#20446,#20452)
-successor(#20453,#20450)
-successor(#20452,#20453)
-successor(#20450,#20448)
-successor(#20452,#20448)
-#20494=*
-guard_node(#20494,0,#20450)
-hasLocation(#20494,#20451)
-successor(#20494,#20454)
-#20495=*
-guard_node(#20495,1,#20450)
-hasLocation(#20495,#20451)
-successor(#20495,#20459)
-successor(#20448,#20494)
-successor(#20448,#20495)
-successor(#20456,#20458)
-successor(#20458,#20464)
-successor(#20454,#20456)
-successor(#20461,#20463)
-successor(#20463,#20464)
-successor(#20459,#20461)
-successor(#20430,#20434)
-successor(#20435,#20432)
-successor(#20434,#20435)
-#20496=*
-guard_node(#20496,1,#20432)
-hasLocation(#20496,#20433)
-successor(#20496,#20436)
-#20497=*
-guard_node(#20497,0,#20432)
-hasLocation(#20497,#20433)
-successor(#20497,#20441)
-successor(#20432,#20496)
-successor(#20432,#20497)
-successor(#20434,#20441)
-successor(#20438,#20440)
-successor(#20440,#20446)
-successor(#20436,#20438)
-successor(#20443,#20445)
-successor(#20445,#20446)
-successor(#20441,#20443)
-successor(#20405,#20416)
-successor(#20429,#20406)
-successor(#20428,#20410)
-successor(#20427,#20417)
-successor(#20426,#20421)
-successor(#20425,#20423)
-successor(#20423,#20426)
-successor(#20425,#20412)
+guard_node(#20493,0,#20428)
+hasLocation(#20493,#20429)
+successor(#20493,#20437)
+successor(#20428,#20492)
+successor(#20428,#20493)
+successor(#20430,#20437)
+successor(#20434,#20436)
+successor(#20436,#20442)
+successor(#20432,#20434)
+successor(#20439,#20441)
+successor(#20441,#20442)
+successor(#20437,#20439)
+successor(#20401,#20412)
+successor(#20425,#20402)
+successor(#20424,#20406)
+successor(#20423,#20413)
+successor(#20422,#20417)
 successor(#20421,#20419)
-successor(#20419,#20427)
-successor(#20421,#20412)
-successor(#20417,#20412)
-successor(#20416,#20414)
-successor(#20414,#20425)
-successor(#20416,#20430)
-successor(#20412,#20428)
-successor(#20410,#20408)
-successor(#20408,#20429)
-successor(#20410,#20430)
-successor(#20406,#20430)
-successor(#20387,#20394)
-successor(#20404,#20388)
-successor(#20403,#20390)
-successor(#20402,#20395)
-successor(#20401,#20397)
-successor(#20399,#20401)
-successor(#20397,#20402)
-successor(#20399,#20392)
-successor(#20395,#20392)
-successor(#20397,#20392)
-successor(#20394,#20399)
-successor(#20392,#20403)
-successor(#20394,#20405)
-successor(#20390,#20404)
-successor(#20388,#20405)
-successor(#20390,#20405)
-successor(#20374,#20377)
-successor(#20386,#20375)
-successor(#20377,#20383)
-successor(#20385,#20379)
-successor(#20384,#20381)
-successor(#20383,#20384)
-successor(#20381,#20385)
-successor(#20383,#20386)
-successor(#20379,#20386)
-successor(#20375,#20387)
-successor(#20364,#20367)
-successor(#20373,#20365)
+successor(#20419,#20422)
+successor(#20421,#20408)
+successor(#20417,#20415)
+successor(#20415,#20423)
+successor(#20417,#20408)
+successor(#20413,#20408)
+successor(#20412,#20410)
+successor(#20410,#20421)
+successor(#20412,#20426)
+successor(#20408,#20424)
+successor(#20406,#20404)
+successor(#20404,#20425)
+successor(#20406,#20426)
+successor(#20402,#20426)
+successor(#20383,#20390)
+successor(#20400,#20384)
+successor(#20399,#20386)
+successor(#20398,#20391)
+successor(#20397,#20393)
+successor(#20395,#20397)
+successor(#20393,#20398)
+successor(#20395,#20388)
+successor(#20391,#20388)
+successor(#20393,#20388)
+successor(#20390,#20395)
+successor(#20388,#20399)
+successor(#20390,#20401)
+successor(#20386,#20400)
+successor(#20384,#20401)
+successor(#20386,#20401)
+successor(#20372,#20379)
+successor(#20382,#20373)
+successor(#20381,#20375)
+successor(#20380,#20377)
+successor(#20379,#20380)
+successor(#20377,#20381)
+successor(#20379,#20382)
+successor(#20375,#20382)
+successor(#20373,#20383)
+successor(#20364,#20369)
+successor(#20371,#20365)
+successor(#20370,#20367)
+successor(#20369,#20370)
 successor(#20367,#20371)
-successor(#20372,#20369)
-successor(#20371,#20372)
-successor(#20369,#20373)
-successor(#20371,#20373)
-successor(#20365,#20374)
+successor(#20369,#20371)
+successor(#20365,#20372)
 successor(#20347,#20358)
 successor(#20363,#20348)
 successor(#20362,#20350)
@@ -1704,6 +1690,6 @@ successor(#20338,#20347)
 successor(#20334,#20344)
 successor(#20332,#20346)
 successor(#20330,#20347)
-successor(#20487,#20329)
+successor(#20483,#20329)
 numlines(#10000,29,21,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/parens.js.trap b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
index e924f9b5ee02..03b37bd059ea 100644
--- a/javascript/extractor/tests/exprs/output/trap/parens.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
@@ -61,33 +61,26 @@ hasLocation(#20018,#20019)
 enclosing_stmt(#20018,#20017)
 expr_containers(#20018,#20001)
 #20020=*
-exprs(#20020,63,#20018,0,"(NaN)")
-#20021=@"loc,{#10000},1,3,1,7"
-locations_default(#20021,#10000,1,3,1,7)
-hasLocation(#20020,#20021)
+exprs(#20020,79,#20018,0,"NaN")
+hasLocation(#20020,#20009)
 enclosing_stmt(#20020,#20017)
 expr_containers(#20020,#20001)
+literals("NaN","NaN",#20020)
+#20021=@"var;{NaN};{#20000}"
+variables(#20021,"NaN",#20000)
+bind(#20020,#20021)
+has_parentheses(#20020,1)
 #20022=*
-exprs(#20022,79,#20020,0,"NaN")
-hasLocation(#20022,#20009)
-enclosing_stmt(#20022,#20017)
-expr_containers(#20022,#20001)
-literals("NaN","NaN",#20022)
-#20023=@"var;{NaN};{#20000}"
-variables(#20023,"NaN",#20000)
-bind(#20022,#20023)
+entry_cfg_node(#20022,#20001)
+#20023=@"loc,{#10000},1,1,1,0"
+locations_default(#20023,#10000,1,1,1,0)
+hasLocation(#20022,#20023)
 #20024=*
-entry_cfg_node(#20024,#20001)
-#20025=@"loc,{#10000},1,1,1,0"
-locations_default(#20025,#10000,1,1,1,0)
-hasLocation(#20024,#20025)
-#20026=*
-exit_cfg_node(#20026,#20001)
-hasLocation(#20026,#20015)
+exit_cfg_node(#20024,#20001)
+hasLocation(#20024,#20015)
 successor(#20017,#20020)
-successor(#20020,#20022)
-successor(#20022,#20018)
-successor(#20018,#20026)
-successor(#20024,#20017)
+successor(#20020,#20018)
+successor(#20018,#20024)
+successor(#20022,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
index f8625fd5cc7e..92789a774f57 100644
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@@ -1128,578 +1128,557 @@ stmts(#20396,2,#20001,14,"(23);")
 hasLocation(#20396,#20031)
 stmt_containers(#20396,#20001)
 #20397=*
-exprs(#20397,63,#20396,0,"(23)")
-#20398=@"loc,{#10000},15,1,15,4"
-locations_default(#20398,#10000,15,1,15,4)
-hasLocation(#20397,#20398)
+exprs(#20397,3,#20396,0,"23")
+hasLocation(#20397,#20121)
 enclosing_stmt(#20397,#20396)
 expr_containers(#20397,#20001)
+literals("23","23",#20397)
+has_parentheses(#20397,1)
+#20398=*
+stmts(#20398,2,#20001,15,"[23, 42, , ""hi"" ];")
+hasLocation(#20398,#20033)
+stmt_containers(#20398,#20001)
 #20399=*
-exprs(#20399,3,#20397,0,"23")
-hasLocation(#20399,#20121)
-enclosing_stmt(#20399,#20396)
+exprs(#20399,7,#20398,0,"[23, 42, , ""hi"" ]")
+#20400=@"loc,{#10000},16,1,16,17"
+locations_default(#20400,#10000,16,1,16,17)
+hasLocation(#20399,#20400)
+enclosing_stmt(#20399,#20398)
 expr_containers(#20399,#20001)
-literals("23","23",#20399)
-#20400=*
-stmts(#20400,2,#20001,15,"[23, 42, , ""hi"" ];")
-hasLocation(#20400,#20033)
-stmt_containers(#20400,#20001)
 #20401=*
-exprs(#20401,7,#20400,0,"[23, 42, , ""hi"" ]")
-#20402=@"loc,{#10000},16,1,16,17"
-locations_default(#20402,#10000,16,1,16,17)
-hasLocation(#20401,#20402)
-enclosing_stmt(#20401,#20400)
+exprs(#20401,3,#20399,0,"23")
+hasLocation(#20401,#20129)
+enclosing_stmt(#20401,#20398)
 expr_containers(#20401,#20001)
+literals("23","23",#20401)
+#20402=*
+exprs(#20402,3,#20399,1,"42")
+hasLocation(#20402,#20133)
+enclosing_stmt(#20402,#20398)
+expr_containers(#20402,#20001)
+literals("42","42",#20402)
 #20403=*
-exprs(#20403,3,#20401,0,"23")
-hasLocation(#20403,#20129)
-enclosing_stmt(#20403,#20400)
+exprs(#20403,4,#20399,3,"""hi""")
+hasLocation(#20403,#20139)
+enclosing_stmt(#20403,#20398)
 expr_containers(#20403,#20001)
-literals("23","23",#20403)
+literals("hi","""hi""",#20403)
 #20404=*
-exprs(#20404,3,#20401,1,"42")
-hasLocation(#20404,#20133)
-enclosing_stmt(#20404,#20400)
-expr_containers(#20404,#20001)
-literals("42","42",#20404)
-#20405=*
-exprs(#20405,4,#20401,3,"""hi""")
-hasLocation(#20405,#20139)
-enclosing_stmt(#20405,#20400)
-expr_containers(#20405,#20001)
-literals("hi","""hi""",#20405)
+regexpterm(#20404,14,#20403,0,"hi")
+#20405=@"loc,{#10000},16,13,16,14"
+locations_default(#20405,#10000,16,13,16,14)
+hasLocation(#20404,#20405)
+regexp_const_value(#20404,"hi")
+array_size(#20399,4)
 #20406=*
-regexpterm(#20406,14,#20405,0,"hi")
-#20407=@"loc,{#10000},16,13,16,14"
-locations_default(#20407,#10000,16,13,16,14)
+stmts(#20406,2,#20001,16,"({ x: 2 ... ) {}});")
+#20407=@"loc,{#10000},17,1,21,17"
+locations_default(#20407,#10000,17,1,21,17)
 hasLocation(#20406,#20407)
-regexp_const_value(#20406,"hi")
-array_size(#20401,4)
+stmt_containers(#20406,#20001)
 #20408=*
-stmts(#20408,2,#20001,16,"({ x: 2 ... ) {}});")
-#20409=@"loc,{#10000},17,1,21,17"
-locations_default(#20409,#10000,17,1,21,17)
+exprs(#20408,8,#20406,0,"{ x: 23 ... (v) {}}")
+#20409=@"loc,{#10000},17,2,21,15"
+locations_default(#20409,#10000,17,2,21,15)
 hasLocation(#20408,#20409)
-stmt_containers(#20408,#20001)
+enclosing_stmt(#20408,#20406)
+expr_containers(#20408,#20001)
 #20410=*
-exprs(#20410,63,#20408,0,"({ x: 2 ... v) {}})")
-#20411=@"loc,{#10000},17,1,21,16"
-locations_default(#20411,#10000,17,1,21,16)
+properties(#20410,#20408,0,0,"x: 23")
+#20411=@"loc,{#10000},17,4,17,8"
+locations_default(#20411,#10000,17,4,17,8)
 hasLocation(#20410,#20411)
-enclosing_stmt(#20410,#20408)
-expr_containers(#20410,#20001)
 #20412=*
-exprs(#20412,8,#20410,0,"{ x: 23 ... (v) {}}")
-#20413=@"loc,{#10000},17,2,21,15"
-locations_default(#20413,#10000,17,2,21,15)
-hasLocation(#20412,#20413)
-enclosing_stmt(#20412,#20408)
+exprs(#20412,0,#20410,0,"x")
+hasLocation(#20412,#20149)
+enclosing_stmt(#20412,#20406)
 expr_containers(#20412,#20001)
+literals("x","x",#20412)
+#20413=*
+exprs(#20413,3,#20410,1,"23")
+hasLocation(#20413,#20153)
+enclosing_stmt(#20413,#20406)
+expr_containers(#20413,#20001)
+literals("23","23",#20413)
 #20414=*
-properties(#20414,#20412,0,0,"x: 23")
-#20415=@"loc,{#10000},17,4,17,8"
-locations_default(#20415,#10000,17,4,17,8)
+properties(#20414,#20408,1,0,"y: this")
+#20415=@"loc,{#10000},18,4,18,10"
+locations_default(#20415,#10000,18,4,18,10)
 hasLocation(#20414,#20415)
 #20416=*
-exprs(#20416,0,#20414,0,"x")
-hasLocation(#20416,#20149)
-enclosing_stmt(#20416,#20408)
+exprs(#20416,0,#20414,0,"y")
+hasLocation(#20416,#20157)
+enclosing_stmt(#20416,#20406)
 expr_containers(#20416,#20001)
-literals("x","x",#20416)
+literals("y","y",#20416)
 #20417=*
-exprs(#20417,3,#20414,1,"23")
-hasLocation(#20417,#20153)
-enclosing_stmt(#20417,#20408)
+exprs(#20417,6,#20414,1,"this")
+hasLocation(#20417,#20161)
+enclosing_stmt(#20417,#20406)
 expr_containers(#20417,#20001)
-literals("23","23",#20417)
+bind(#20417,#20325)
 #20418=*
-properties(#20418,#20412,1,0,"y: this")
-#20419=@"loc,{#10000},18,4,18,10"
-locations_default(#20419,#10000,18,4,18,10)
+properties(#20418,#20408,2,1,"get o() {}")
+#20419=@"loc,{#10000},19,4,19,13"
+locations_default(#20419,#10000,19,4,19,13)
 hasLocation(#20418,#20419)
 #20420=*
-exprs(#20420,0,#20418,0,"y")
-hasLocation(#20420,#20157)
-enclosing_stmt(#20420,#20408)
+exprs(#20420,0,#20418,0,"o")
+hasLocation(#20420,#20167)
+enclosing_stmt(#20420,#20406)
 expr_containers(#20420,#20001)
-literals("y","y",#20420)
+literals("o","o",#20420)
 #20421=*
-exprs(#20421,6,#20418,1,"this")
-hasLocation(#20421,#20161)
-enclosing_stmt(#20421,#20408)
+exprs(#20421,9,#20418,1,"() {}")
+#20422=@"loc,{#10000},19,9,19,13"
+locations_default(#20422,#10000,19,9,19,13)
+hasLocation(#20421,#20422)
+enclosing_stmt(#20421,#20406)
 expr_containers(#20421,#20001)
-bind(#20421,#20325)
-#20422=*
-properties(#20422,#20412,2,1,"get o() {}")
-#20423=@"loc,{#10000},19,4,19,13"
-locations_default(#20423,#10000,19,4,19,13)
-hasLocation(#20422,#20423)
-#20424=*
-exprs(#20424,0,#20422,0,"o")
-hasLocation(#20424,#20167)
-enclosing_stmt(#20424,#20408)
-expr_containers(#20424,#20001)
-literals("o","o",#20424)
-#20425=*
-exprs(#20425,9,#20422,1,"() {}")
-#20426=@"loc,{#10000},19,9,19,13"
-locations_default(#20426,#10000,19,9,19,13)
-hasLocation(#20425,#20426)
-enclosing_stmt(#20425,#20408)
-expr_containers(#20425,#20001)
-#20427=*
-scopes(#20427,1)
-scopenodes(#20425,#20427)
-scopenesting(#20427,#20000)
-#20428=@"var;{this};{#20427}"
-variables(#20428,"this",#20427)
-#20429=@"var;{arguments};{#20427}"
-variables(#20429,"arguments",#20427)
-is_arguments_object(#20429)
+#20423=*
+scopes(#20423,1)
+scopenodes(#20421,#20423)
+scopenesting(#20423,#20000)
+#20424=@"var;{this};{#20423}"
+variables(#20424,"this",#20423)
+#20425=@"var;{arguments};{#20423}"
+variables(#20425,"arguments",#20423)
+is_arguments_object(#20425)
+#20426=*
+stmts(#20426,1,#20421,-2,"{}")
+#20427=@"loc,{#10000},19,12,19,13"
+locations_default(#20427,#10000,19,12,19,13)
+hasLocation(#20426,#20427)
+stmt_containers(#20426,#20421)
+#20428=*
+properties(#20428,#20408,3,1,"get p() {}")
+#20429=@"loc,{#10000},20,4,20,13"
+locations_default(#20429,#10000,20,4,20,13)
+hasLocation(#20428,#20429)
 #20430=*
-stmts(#20430,1,#20425,-2,"{}")
-#20431=@"loc,{#10000},19,12,19,13"
-locations_default(#20431,#10000,19,12,19,13)
-hasLocation(#20430,#20431)
-stmt_containers(#20430,#20425)
-#20432=*
-properties(#20432,#20412,3,1,"get p() {}")
-#20433=@"loc,{#10000},20,4,20,13"
-locations_default(#20433,#10000,20,4,20,13)
-hasLocation(#20432,#20433)
-#20434=*
-exprs(#20434,0,#20432,0,"p")
-hasLocation(#20434,#20181)
-enclosing_stmt(#20434,#20408)
-expr_containers(#20434,#20001)
-literals("p","p",#20434)
-#20435=*
-exprs(#20435,9,#20432,1,"() {}")
-#20436=@"loc,{#10000},20,9,20,13"
-locations_default(#20436,#10000,20,9,20,13)
-hasLocation(#20435,#20436)
-enclosing_stmt(#20435,#20408)
-expr_containers(#20435,#20001)
-#20437=*
-scopes(#20437,1)
-scopenodes(#20435,#20437)
-scopenesting(#20437,#20000)
-#20438=@"var;{this};{#20437}"
-variables(#20438,"this",#20437)
-#20439=@"var;{arguments};{#20437}"
-variables(#20439,"arguments",#20437)
-is_arguments_object(#20439)
+exprs(#20430,0,#20428,0,"p")
+hasLocation(#20430,#20181)
+enclosing_stmt(#20430,#20406)
+expr_containers(#20430,#20001)
+literals("p","p",#20430)
+#20431=*
+exprs(#20431,9,#20428,1,"() {}")
+#20432=@"loc,{#10000},20,9,20,13"
+locations_default(#20432,#10000,20,9,20,13)
+hasLocation(#20431,#20432)
+enclosing_stmt(#20431,#20406)
+expr_containers(#20431,#20001)
+#20433=*
+scopes(#20433,1)
+scopenodes(#20431,#20433)
+scopenesting(#20433,#20000)
+#20434=@"var;{this};{#20433}"
+variables(#20434,"this",#20433)
+#20435=@"var;{arguments};{#20433}"
+variables(#20435,"arguments",#20433)
+is_arguments_object(#20435)
+#20436=*
+stmts(#20436,1,#20431,-2,"{}")
+#20437=@"loc,{#10000},20,12,20,13"
+locations_default(#20437,#10000,20,12,20,13)
+hasLocation(#20436,#20437)
+stmt_containers(#20436,#20431)
+#20438=*
+properties(#20438,#20408,4,2,"set p(v) {}")
+#20439=@"loc,{#10000},21,4,21,14"
+locations_default(#20439,#10000,21,4,21,14)
+hasLocation(#20438,#20439)
 #20440=*
-stmts(#20440,1,#20435,-2,"{}")
-#20441=@"loc,{#10000},20,12,20,13"
-locations_default(#20441,#10000,20,12,20,13)
-hasLocation(#20440,#20441)
-stmt_containers(#20440,#20435)
-#20442=*
-properties(#20442,#20412,4,2,"set p(v) {}")
-#20443=@"loc,{#10000},21,4,21,14"
-locations_default(#20443,#10000,21,4,21,14)
-hasLocation(#20442,#20443)
-#20444=*
-exprs(#20444,0,#20442,0,"p")
-hasLocation(#20444,#20195)
-enclosing_stmt(#20444,#20408)
-expr_containers(#20444,#20001)
-literals("p","p",#20444)
-#20445=*
-exprs(#20445,9,#20442,1,"(v) {}")
-#20446=@"loc,{#10000},21,9,21,14"
-locations_default(#20446,#10000,21,9,21,14)
-hasLocation(#20445,#20446)
-enclosing_stmt(#20445,#20408)
-expr_containers(#20445,#20001)
-#20447=*
-scopes(#20447,1)
-scopenodes(#20445,#20447)
-scopenesting(#20447,#20000)
-#20448=@"var;{this};{#20447}"
-variables(#20448,"this",#20447)
-#20449=@"var;{v};{#20447}"
-variables(#20449,"v",#20447)
+exprs(#20440,0,#20438,0,"p")
+hasLocation(#20440,#20195)
+enclosing_stmt(#20440,#20406)
+expr_containers(#20440,#20001)
+literals("p","p",#20440)
+#20441=*
+exprs(#20441,9,#20438,1,"(v) {}")
+#20442=@"loc,{#10000},21,9,21,14"
+locations_default(#20442,#10000,21,9,21,14)
+hasLocation(#20441,#20442)
+enclosing_stmt(#20441,#20406)
+expr_containers(#20441,#20001)
+#20443=*
+scopes(#20443,1)
+scopenodes(#20441,#20443)
+scopenesting(#20443,#20000)
+#20444=@"var;{this};{#20443}"
+variables(#20444,"this",#20443)
+#20445=@"var;{v};{#20443}"
+variables(#20445,"v",#20443)
+#20446=*
+exprs(#20446,78,#20441,0,"v")
+hasLocation(#20446,#20199)
+expr_containers(#20446,#20441)
+literals("v","v",#20446)
+decl(#20446,#20445)
+#20447=@"var;{arguments};{#20443}"
+variables(#20447,"arguments",#20443)
+is_arguments_object(#20447)
+#20448=*
+stmts(#20448,1,#20441,-2,"{}")
+#20449=@"loc,{#10000},21,13,21,14"
+locations_default(#20449,#10000,21,13,21,14)
+hasLocation(#20448,#20449)
+stmt_containers(#20448,#20441)
+has_parentheses(#20408,1)
 #20450=*
-exprs(#20450,78,#20445,0,"v")
-hasLocation(#20450,#20199)
-expr_containers(#20450,#20445)
-literals("v","v",#20450)
-decl(#20450,#20449)
-#20451=@"var;{arguments};{#20447}"
-variables(#20451,"arguments",#20447)
-is_arguments_object(#20451)
-#20452=*
-stmts(#20452,1,#20445,-2,"{}")
-#20453=@"loc,{#10000},21,13,21,14"
-locations_default(#20453,#10000,21,13,21,14)
-hasLocation(#20452,#20453)
-stmt_containers(#20452,#20445)
-#20454=*
-stmts(#20454,2,#20001,17,"new Array;")
-hasLocation(#20454,#20045)
-stmt_containers(#20454,#20001)
+stmts(#20450,2,#20001,17,"new Array;")
+hasLocation(#20450,#20045)
+stmt_containers(#20450,#20001)
+#20451=*
+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)
+enclosing_stmt(#20451,#20450)
+expr_containers(#20451,#20001)
+#20453=*
+exprs(#20453,79,#20451,-1,"Array")
+hasLocation(#20453,#20215)
+enclosing_stmt(#20453,#20450)
+expr_containers(#20453,#20001)
+literals("Array","Array",#20453)
+#20454=@"var;{Array};{#20000}"
+variables(#20454,"Array",#20000)
+bind(#20453,#20454)
 #20455=*
-exprs(#20455,12,#20454,0,"new Array")
-#20456=@"loc,{#10000},22,1,22,9"
-locations_default(#20456,#10000,22,1,22,9)
-hasLocation(#20455,#20456)
-enclosing_stmt(#20455,#20454)
-expr_containers(#20455,#20001)
-#20457=*
-exprs(#20457,79,#20455,-1,"Array")
-hasLocation(#20457,#20215)
-enclosing_stmt(#20457,#20454)
-expr_containers(#20457,#20001)
-literals("Array","Array",#20457)
-#20458=@"var;{Array};{#20000}"
-variables(#20458,"Array",#20000)
-bind(#20457,#20458)
-#20459=*
-stmts(#20459,2,#20001,18,"new Object();")
-hasLocation(#20459,#20047)
-stmt_containers(#20459,#20001)
+stmts(#20455,2,#20001,18,"new Object();")
+hasLocation(#20455,#20047)
+stmt_containers(#20455,#20001)
+#20456=*
+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)
+enclosing_stmt(#20456,#20455)
+expr_containers(#20456,#20001)
+#20458=*
+exprs(#20458,79,#20456,-1,"Object")
+hasLocation(#20458,#20221)
+enclosing_stmt(#20458,#20455)
+expr_containers(#20458,#20001)
+literals("Object","Object",#20458)
+#20459=@"var;{Object};{#20000}"
+variables(#20459,"Object",#20000)
+bind(#20458,#20459)
 #20460=*
-exprs(#20460,12,#20459,0,"new Object()")
-#20461=@"loc,{#10000},23,1,23,12"
-locations_default(#20461,#10000,23,1,23,12)
-hasLocation(#20460,#20461)
-enclosing_stmt(#20460,#20459)
-expr_containers(#20460,#20001)
-#20462=*
-exprs(#20462,79,#20460,-1,"Object")
-hasLocation(#20462,#20221)
-enclosing_stmt(#20462,#20459)
-expr_containers(#20462,#20001)
-literals("Object","Object",#20462)
-#20463=@"var;{Object};{#20000}"
-variables(#20463,"Object",#20000)
-bind(#20462,#20463)
-#20464=*
-stmts(#20464,2,#20001,19,"new String(""hi"");")
-hasLocation(#20464,#20049)
-stmt_containers(#20464,#20001)
+stmts(#20460,2,#20001,19,"new String(""hi"");")
+hasLocation(#20460,#20049)
+stmt_containers(#20460,#20001)
+#20461=*
+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)
+enclosing_stmt(#20461,#20460)
+expr_containers(#20461,#20001)
+#20463=*
+exprs(#20463,79,#20461,-1,"String")
+hasLocation(#20463,#20231)
+enclosing_stmt(#20463,#20460)
+expr_containers(#20463,#20001)
+literals("String","String",#20463)
+#20464=@"var;{String};{#20000}"
+variables(#20464,"String",#20000)
+bind(#20463,#20464)
 #20465=*
-exprs(#20465,12,#20464,0,"new String(""hi"")")
-#20466=@"loc,{#10000},24,1,24,16"
-locations_default(#20466,#10000,24,1,24,16)
-hasLocation(#20465,#20466)
-enclosing_stmt(#20465,#20464)
+exprs(#20465,4,#20461,0,"""hi""")
+hasLocation(#20465,#20235)
+enclosing_stmt(#20465,#20460)
 expr_containers(#20465,#20001)
-#20467=*
-exprs(#20467,79,#20465,-1,"String")
-hasLocation(#20467,#20231)
-enclosing_stmt(#20467,#20464)
-expr_containers(#20467,#20001)
-literals("String","String",#20467)
-#20468=@"var;{String};{#20000}"
-variables(#20468,"String",#20000)
-bind(#20467,#20468)
+literals("hi","""hi""",#20465)
+#20466=*
+regexpterm(#20466,14,#20465,0,"hi")
+#20467=@"loc,{#10000},24,13,24,14"
+locations_default(#20467,#10000,24,13,24,14)
+hasLocation(#20466,#20467)
+regexp_const_value(#20466,"hi")
+#20468=*
+stmts(#20468,2,#20001,20,"String("""");")
+hasLocation(#20468,#20051)
+stmt_containers(#20468,#20001)
 #20469=*
-exprs(#20469,4,#20465,0,"""hi""")
-hasLocation(#20469,#20235)
-enclosing_stmt(#20469,#20464)
+exprs(#20469,13,#20468,0,"String("""")")
+#20470=@"loc,{#10000},25,1,25,10"
+locations_default(#20470,#10000,25,1,25,10)
+hasLocation(#20469,#20470)
+enclosing_stmt(#20469,#20468)
 expr_containers(#20469,#20001)
-literals("hi","""hi""",#20469)
-#20470=*
-regexpterm(#20470,14,#20469,0,"hi")
-#20471=@"loc,{#10000},24,13,24,14"
-locations_default(#20471,#10000,24,13,24,14)
-hasLocation(#20470,#20471)
-regexp_const_value(#20470,"hi")
+#20471=*
+exprs(#20471,79,#20469,-1,"String")
+hasLocation(#20471,#20241)
+enclosing_stmt(#20471,#20468)
+expr_containers(#20471,#20001)
+literals("String","String",#20471)
+bind(#20471,#20464)
 #20472=*
-stmts(#20472,2,#20001,20,"String("""");")
-hasLocation(#20472,#20051)
-stmt_containers(#20472,#20001)
+exprs(#20472,4,#20469,0,"""""")
+hasLocation(#20472,#20245)
+enclosing_stmt(#20472,#20468)
+expr_containers(#20472,#20001)
+literals("","""""",#20472)
 #20473=*
-exprs(#20473,13,#20472,0,"String("""")")
-#20474=@"loc,{#10000},25,1,25,10"
-locations_default(#20474,#10000,25,1,25,10)
+regexpterm(#20473,1,#20472,0,"")
+#20474=@"loc,{#10000},25,9,25,8"
+locations_default(#20474,#10000,25,9,25,8)
 hasLocation(#20473,#20474)
-enclosing_stmt(#20473,#20472)
-expr_containers(#20473,#20001)
 #20475=*
-exprs(#20475,79,#20473,-1,"String")
-hasLocation(#20475,#20241)
-enclosing_stmt(#20475,#20472)
-expr_containers(#20475,#20001)
-literals("String","String",#20475)
-bind(#20475,#20468)
+stmts(#20475,2,#20001,21,"Object.create({});")
+hasLocation(#20475,#20053)
+stmt_containers(#20475,#20001)
 #20476=*
-exprs(#20476,4,#20473,0,"""""")
-hasLocation(#20476,#20245)
-enclosing_stmt(#20476,#20472)
+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)
+enclosing_stmt(#20476,#20475)
 expr_containers(#20476,#20001)
-literals("","""""",#20476)
-#20477=*
-regexpterm(#20477,1,#20476,0,"")
-#20478=@"loc,{#10000},25,9,25,8"
-locations_default(#20478,#10000,25,9,25,8)
-hasLocation(#20477,#20478)
-#20479=*
-stmts(#20479,2,#20001,21,"Object.create({});")
-hasLocation(#20479,#20053)
-stmt_containers(#20479,#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)
+enclosing_stmt(#20478,#20475)
+expr_containers(#20478,#20001)
 #20480=*
-exprs(#20480,13,#20479,0,"Object.create({})")
-#20481=@"loc,{#10000},26,1,26,17"
-locations_default(#20481,#10000,26,1,26,17)
-hasLocation(#20480,#20481)
-enclosing_stmt(#20480,#20479)
+exprs(#20480,79,#20478,0,"Object")
+hasLocation(#20480,#20251)
+enclosing_stmt(#20480,#20475)
 expr_containers(#20480,#20001)
+literals("Object","Object",#20480)
+bind(#20480,#20459)
+#20481=*
+exprs(#20481,0,#20478,1,"create")
+hasLocation(#20481,#20255)
+enclosing_stmt(#20481,#20475)
+expr_containers(#20481,#20001)
+literals("create","create",#20481)
 #20482=*
-exprs(#20482,14,#20480,-1,"Object.create")
-#20483=@"loc,{#10000},26,1,26,13"
-locations_default(#20483,#10000,26,1,26,13)
+exprs(#20482,8,#20476,0,"{}")
+#20483=@"loc,{#10000},26,15,26,16"
+locations_default(#20483,#10000,26,15,26,16)
 hasLocation(#20482,#20483)
-enclosing_stmt(#20482,#20479)
+enclosing_stmt(#20482,#20475)
 expr_containers(#20482,#20001)
 #20484=*
-exprs(#20484,79,#20482,0,"Object")
-hasLocation(#20484,#20251)
-enclosing_stmt(#20484,#20479)
-expr_containers(#20484,#20001)
-literals("Object","Object",#20484)
-bind(#20484,#20463)
+stmts(#20484,2,#20001,22,"String[ ... rse()];")
+hasLocation(#20484,#20055)
+stmt_containers(#20484,#20001)
 #20485=*
-exprs(#20485,0,#20482,1,"create")
-hasLocation(#20485,#20255)
-enclosing_stmt(#20485,#20479)
+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)
+enclosing_stmt(#20485,#20484)
 expr_containers(#20485,#20001)
-literals("create","create",#20485)
-#20486=*
-exprs(#20486,8,#20480,0,"{}")
-#20487=@"loc,{#10000},26,15,26,16"
-locations_default(#20487,#10000,26,15,26,16)
-hasLocation(#20486,#20487)
-enclosing_stmt(#20486,#20479)
-expr_containers(#20486,#20001)
+#20487=*
+exprs(#20487,79,#20485,0,"String")
+hasLocation(#20487,#20267)
+enclosing_stmt(#20487,#20484)
+expr_containers(#20487,#20001)
+literals("String","String",#20487)
+bind(#20487,#20464)
 #20488=*
-stmts(#20488,2,#20001,22,"String[ ... rse()];")
-hasLocation(#20488,#20055)
-stmt_containers(#20488,#20001)
-#20489=*
-exprs(#20489,15,#20488,0,"String[ ... erse()]")
-#20490=@"loc,{#10000},27,1,27,29"
-locations_default(#20490,#10000,27,1,27,29)
-hasLocation(#20489,#20490)
-enclosing_stmt(#20489,#20488)
-expr_containers(#20489,#20001)
-#20491=*
-exprs(#20491,79,#20489,0,"String")
-hasLocation(#20491,#20267)
-enclosing_stmt(#20491,#20488)
-expr_containers(#20491,#20001)
-literals("String","String",#20491)
-bind(#20491,#20468)
+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)
+enclosing_stmt(#20488,#20484)
+expr_containers(#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)
+enclosing_stmt(#20490,#20484)
+expr_containers(#20490,#20001)
 #20492=*
-exprs(#20492,13,#20489,1,"'epytot ... verse()")
-#20493=@"loc,{#10000},27,8,27,28"
-locations_default(#20493,#10000,27,8,27,28)
-hasLocation(#20492,#20493)
-enclosing_stmt(#20492,#20488)
+exprs(#20492,4,#20490,0,"'epytotorp'")
+hasLocation(#20492,#20271)
+enclosing_stmt(#20492,#20484)
 expr_containers(#20492,#20001)
-#20494=*
-exprs(#20494,14,#20492,-1,"'epytotorp'.reverse")
-#20495=@"loc,{#10000},27,8,27,26"
-locations_default(#20495,#10000,27,8,27,26)
-hasLocation(#20494,#20495)
-enclosing_stmt(#20494,#20488)
-expr_containers(#20494,#20001)
+literals("epytotorp","'epytotorp'",#20492)
+#20493=*
+regexpterm(#20493,14,#20492,0,"epytotorp")
+#20494=@"loc,{#10000},27,9,27,17"
+locations_default(#20494,#10000,27,9,27,17)
+hasLocation(#20493,#20494)
+regexp_const_value(#20493,"epytotorp")
+#20495=*
+exprs(#20495,0,#20490,1,"reverse")
+hasLocation(#20495,#20275)
+enclosing_stmt(#20495,#20484)
+expr_containers(#20495,#20001)
+literals("reverse","reverse",#20495)
 #20496=*
-exprs(#20496,4,#20494,0,"'epytotorp'")
-hasLocation(#20496,#20271)
-enclosing_stmt(#20496,#20488)
-expr_containers(#20496,#20001)
-literals("epytotorp","'epytotorp'",#20496)
+stmts(#20496,2,#20001,23,"[,,];")
+hasLocation(#20496,#20057)
+stmt_containers(#20496,#20001)
 #20497=*
-regexpterm(#20497,14,#20496,0,"epytotorp")
-#20498=@"loc,{#10000},27,9,27,17"
-locations_default(#20498,#10000,27,9,27,17)
+exprs(#20497,7,#20496,0,"[,,]")
+#20498=@"loc,{#10000},28,1,28,4"
+locations_default(#20498,#10000,28,1,28,4)
 hasLocation(#20497,#20498)
-regexp_const_value(#20497,"epytotorp")
+enclosing_stmt(#20497,#20496)
+expr_containers(#20497,#20001)
+array_size(#20497,2)
 #20499=*
-exprs(#20499,0,#20494,1,"reverse")
-hasLocation(#20499,#20275)
-enclosing_stmt(#20499,#20488)
-expr_containers(#20499,#20001)
-literals("reverse","reverse",#20499)
+stmts(#20499,2,#20001,24,"[1,];")
+hasLocation(#20499,#20059)
+stmt_containers(#20499,#20001)
 #20500=*
-stmts(#20500,2,#20001,23,"[,,];")
-hasLocation(#20500,#20057)
-stmt_containers(#20500,#20001)
-#20501=*
-exprs(#20501,7,#20500,0,"[,,]")
-#20502=@"loc,{#10000},28,1,28,4"
-locations_default(#20502,#10000,28,1,28,4)
-hasLocation(#20501,#20502)
-enclosing_stmt(#20501,#20500)
-expr_containers(#20501,#20001)
-array_size(#20501,2)
+exprs(#20500,7,#20499,0,"[1,]")
+#20501=@"loc,{#10000},29,1,29,4"
+locations_default(#20501,#10000,29,1,29,4)
+hasLocation(#20500,#20501)
+enclosing_stmt(#20500,#20499)
+expr_containers(#20500,#20001)
+#20502=*
+exprs(#20502,3,#20500,0,"1")
+hasLocation(#20502,#20297)
+enclosing_stmt(#20502,#20499)
+expr_containers(#20502,#20001)
+literals("1","1",#20502)
+array_size(#20500,1)
 #20503=*
-stmts(#20503,2,#20001,24,"[1,];")
-hasLocation(#20503,#20059)
+stmts(#20503,2,#20001,25,"({ z: 56, });")
+hasLocation(#20503,#20061)
 stmt_containers(#20503,#20001)
 #20504=*
-exprs(#20504,7,#20503,0,"[1,]")
-#20505=@"loc,{#10000},29,1,29,4"
-locations_default(#20505,#10000,29,1,29,4)
+exprs(#20504,8,#20503,0,"{ z: 56, }")
+#20505=@"loc,{#10000},30,2,30,11"
+locations_default(#20505,#10000,30,2,30,11)
 hasLocation(#20504,#20505)
 enclosing_stmt(#20504,#20503)
 expr_containers(#20504,#20001)
 #20506=*
-exprs(#20506,3,#20504,0,"1")
-hasLocation(#20506,#20297)
-enclosing_stmt(#20506,#20503)
-expr_containers(#20506,#20001)
-literals("1","1",#20506)
-array_size(#20504,1)
-#20507=*
-stmts(#20507,2,#20001,25,"({ z: 56, });")
-hasLocation(#20507,#20061)
-stmt_containers(#20507,#20001)
+properties(#20506,#20504,0,0,"z: 56")
+#20507=@"loc,{#10000},30,4,30,8"
+locations_default(#20507,#10000,30,4,30,8)
+hasLocation(#20506,#20507)
 #20508=*
-exprs(#20508,63,#20507,0,"({ z: 56, })")
-#20509=@"loc,{#10000},30,1,30,12"
-locations_default(#20509,#10000,30,1,30,12)
-hasLocation(#20508,#20509)
-enclosing_stmt(#20508,#20507)
+exprs(#20508,0,#20506,0,"z")
+hasLocation(#20508,#20309)
+enclosing_stmt(#20508,#20503)
 expr_containers(#20508,#20001)
+literals("z","z",#20508)
+#20509=*
+exprs(#20509,3,#20506,1,"56")
+hasLocation(#20509,#20313)
+enclosing_stmt(#20509,#20503)
+expr_containers(#20509,#20001)
+literals("56","56",#20509)
+has_parentheses(#20504,1)
 #20510=*
-exprs(#20510,8,#20508,0,"{ z: 56, }")
-#20511=@"loc,{#10000},30,2,30,11"
-locations_default(#20511,#10000,30,2,30,11)
+entry_cfg_node(#20510,#20001)
+#20511=@"loc,{#10000},1,1,1,0"
+locations_default(#20511,#10000,1,1,1,0)
 hasLocation(#20510,#20511)
-enclosing_stmt(#20510,#20507)
-expr_containers(#20510,#20001)
 #20512=*
-properties(#20512,#20510,0,0,"z: 56")
-#20513=@"loc,{#10000},30,4,30,8"
-locations_default(#20513,#10000,30,4,30,8)
-hasLocation(#20512,#20513)
-#20514=*
-exprs(#20514,0,#20512,0,"z")
-hasLocation(#20514,#20309)
-enclosing_stmt(#20514,#20507)
-expr_containers(#20514,#20001)
-literals("z","z",#20514)
-#20515=*
-exprs(#20515,3,#20512,1,"56")
-hasLocation(#20515,#20313)
-enclosing_stmt(#20515,#20507)
-expr_containers(#20515,#20001)
-literals("56","56",#20515)
-#20516=*
-entry_cfg_node(#20516,#20001)
-#20517=@"loc,{#10000},1,1,1,0"
-locations_default(#20517,#10000,1,1,1,0)
-hasLocation(#20516,#20517)
-#20518=*
-exit_cfg_node(#20518,#20001)
-hasLocation(#20518,#20323)
-successor(#20507,#20508)
-successor(#20508,#20510)
-successor(#20510,#20514)
-successor(#20515,#20512)
-successor(#20514,#20515)
-successor(#20512,#20518)
+exit_cfg_node(#20512,#20001)
+hasLocation(#20512,#20323)
 successor(#20503,#20504)
-successor(#20504,#20506)
-successor(#20506,#20507)
-successor(#20500,#20501)
-successor(#20501,#20503)
-successor(#20488,#20491)
-successor(#20499,#20494)
-successor(#20496,#20499)
-successor(#20494,#20492)
-successor(#20492,#20489)
-successor(#20491,#20496)
-successor(#20489,#20500)
-successor(#20479,#20484)
-successor(#20486,#20480)
-successor(#20485,#20482)
-successor(#20484,#20485)
-successor(#20482,#20486)
-successor(#20480,#20488)
-successor(#20472,#20475)
-successor(#20476,#20473)
-successor(#20475,#20476)
-successor(#20473,#20479)
-successor(#20464,#20467)
-successor(#20469,#20465)
-successor(#20467,#20469)
-successor(#20465,#20472)
-successor(#20459,#20462)
-successor(#20462,#20460)
-successor(#20460,#20464)
-successor(#20454,#20457)
-successor(#20457,#20455)
-successor(#20455,#20459)
-successor(#20408,#20410)
-successor(#20410,#20412)
-successor(#20412,#20416)
-successor(#20445,#20442)
+successor(#20504,#20508)
+successor(#20509,#20506)
+successor(#20508,#20509)
+successor(#20506,#20512)
+successor(#20499,#20500)
+successor(#20500,#20502)
+successor(#20502,#20503)
+successor(#20496,#20497)
+successor(#20497,#20499)
+successor(#20484,#20487)
+successor(#20495,#20490)
+successor(#20492,#20495)
+successor(#20490,#20488)
+successor(#20488,#20485)
+successor(#20487,#20492)
+successor(#20485,#20496)
+successor(#20475,#20480)
+successor(#20482,#20476)
+successor(#20481,#20478)
+successor(#20480,#20481)
+successor(#20478,#20482)
+successor(#20476,#20484)
+successor(#20468,#20471)
+successor(#20472,#20469)
+successor(#20471,#20472)
+successor(#20469,#20475)
+successor(#20460,#20463)
+successor(#20465,#20461)
+successor(#20463,#20465)
+successor(#20461,#20468)
+successor(#20455,#20458)
+successor(#20458,#20456)
+successor(#20456,#20460)
+successor(#20450,#20453)
+successor(#20453,#20451)
+successor(#20451,#20455)
+successor(#20406,#20408)
+successor(#20408,#20412)
+successor(#20441,#20438)
+#20513=*
+entry_cfg_node(#20513,#20441)
+#20514=@"loc,{#10000},21,9,21,8"
+locations_default(#20514,#10000,21,9,21,8)
+hasLocation(#20513,#20514)
+#20515=*
+exit_cfg_node(#20515,#20441)
+#20516=@"loc,{#10000},21,15,21,14"
+locations_default(#20516,#10000,21,15,21,14)
+hasLocation(#20515,#20516)
+successor(#20448,#20515)
+successor(#20446,#20448)
+successor(#20513,#20446)
+successor(#20440,#20441)
+successor(#20438,#20450)
+successor(#20431,#20428)
+#20517=*
+entry_cfg_node(#20517,#20431)
+#20518=@"loc,{#10000},20,9,20,8"
+locations_default(#20518,#10000,20,9,20,8)
+hasLocation(#20517,#20518)
 #20519=*
-entry_cfg_node(#20519,#20445)
-#20520=@"loc,{#10000},21,9,21,8"
-locations_default(#20520,#10000,21,9,21,8)
+exit_cfg_node(#20519,#20431)
+#20520=@"loc,{#10000},20,14,20,13"
+locations_default(#20520,#10000,20,14,20,13)
 hasLocation(#20519,#20520)
+successor(#20436,#20519)
+successor(#20517,#20436)
+successor(#20430,#20431)
+successor(#20428,#20440)
+successor(#20421,#20418)
 #20521=*
-exit_cfg_node(#20521,#20445)
-#20522=@"loc,{#10000},21,15,21,14"
-locations_default(#20522,#10000,21,15,21,14)
+entry_cfg_node(#20521,#20421)
+#20522=@"loc,{#10000},19,9,19,8"
+locations_default(#20522,#10000,19,9,19,8)
 hasLocation(#20521,#20522)
-successor(#20452,#20521)
-successor(#20450,#20452)
-successor(#20519,#20450)
-successor(#20444,#20445)
-successor(#20442,#20454)
-successor(#20435,#20432)
 #20523=*
-entry_cfg_node(#20523,#20435)
-#20524=@"loc,{#10000},20,9,20,8"
-locations_default(#20524,#10000,20,9,20,8)
+exit_cfg_node(#20523,#20421)
+#20524=@"loc,{#10000},19,14,19,13"
+locations_default(#20524,#10000,19,14,19,13)
 hasLocation(#20523,#20524)
-#20525=*
-exit_cfg_node(#20525,#20435)
-#20526=@"loc,{#10000},20,14,20,13"
-locations_default(#20526,#10000,20,14,20,13)
-hasLocation(#20525,#20526)
-successor(#20440,#20525)
-successor(#20523,#20440)
-successor(#20434,#20435)
-successor(#20432,#20444)
-successor(#20425,#20422)
-#20527=*
-entry_cfg_node(#20527,#20425)
-#20528=@"loc,{#10000},19,9,19,8"
-locations_default(#20528,#10000,19,9,19,8)
-hasLocation(#20527,#20528)
-#20529=*
-exit_cfg_node(#20529,#20425)
-#20530=@"loc,{#10000},19,14,19,13"
-locations_default(#20530,#10000,19,14,19,13)
-hasLocation(#20529,#20530)
-successor(#20430,#20529)
-successor(#20527,#20430)
-successor(#20424,#20425)
-successor(#20422,#20434)
-successor(#20421,#20418)
+successor(#20426,#20523)
+successor(#20521,#20426)
 successor(#20420,#20421)
-successor(#20418,#20424)
+successor(#20418,#20430)
 successor(#20417,#20414)
 successor(#20416,#20417)
 successor(#20414,#20420)
-successor(#20400,#20401)
-successor(#20401,#20403)
-successor(#20405,#20408)
-successor(#20404,#20405)
-successor(#20403,#20404)
+successor(#20413,#20410)
+successor(#20412,#20413)
+successor(#20410,#20416)
+successor(#20398,#20399)
+successor(#20399,#20401)
+successor(#20403,#20406)
+successor(#20402,#20403)
+successor(#20401,#20402)
 successor(#20396,#20397)
-successor(#20397,#20399)
-successor(#20399,#20400)
+successor(#20397,#20398)
 successor(#20376,#20377)
 successor(#20377,#20396)
 successor(#20364,#20365)
@@ -1728,6 +1707,6 @@ successor(#20328,#20329)
 successor(#20329,#20330)
 successor(#20326,#20327)
 successor(#20327,#20328)
-successor(#20516,#20326)
+successor(#20510,#20326)
 numlines(#10000,30,30,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/unary.js.trap b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
index bf2ceef513d3..09ddfa1085d3 100644
--- a/javascript/extractor/tests/exprs/output/trap/unary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
@@ -287,66 +287,59 @@ hasLocation(#20092,#20093)
 enclosing_stmt(#20092,#20091)
 expr_containers(#20092,#20001)
 #20094=*
-exprs(#20094,63,#20092,0,"(0)")
-#20095=@"loc,{#10000},6,5,6,7"
-locations_default(#20095,#10000,6,5,6,7)
-hasLocation(#20094,#20095)
+exprs(#20094,3,#20092,0,"0")
+hasLocation(#20094,#20051)
 enclosing_stmt(#20094,#20091)
 expr_containers(#20094,#20001)
+literals("0","0",#20094)
+has_parentheses(#20094,1)
+#20095=*
+stmts(#20095,2,#20001,6,"delete  ... totype;")
+hasLocation(#20095,#20015)
+stmt_containers(#20095,#20001)
 #20096=*
-exprs(#20096,3,#20094,0,"0")
-hasLocation(#20096,#20051)
-enclosing_stmt(#20096,#20091)
+exprs(#20096,22,#20095,0,"delete  ... ototype")
+#20097=@"loc,{#10000},7,1,7,23"
+locations_default(#20097,#10000,7,1,7,23)
+hasLocation(#20096,#20097)
+enclosing_stmt(#20096,#20095)
 expr_containers(#20096,#20001)
-literals("0","0",#20096)
-#20097=*
-stmts(#20097,2,#20001,6,"delete  ... totype;")
-hasLocation(#20097,#20015)
-stmt_containers(#20097,#20001)
 #20098=*
-exprs(#20098,22,#20097,0,"delete  ... ototype")
-#20099=@"loc,{#10000},7,1,7,23"
-locations_default(#20099,#10000,7,1,7,23)
+exprs(#20098,14,#20096,0,"Object.prototype")
+#20099=@"loc,{#10000},7,8,7,23"
+locations_default(#20099,#10000,7,8,7,23)
 hasLocation(#20098,#20099)
-enclosing_stmt(#20098,#20097)
+enclosing_stmt(#20098,#20095)
 expr_containers(#20098,#20001)
 #20100=*
-exprs(#20100,14,#20098,0,"Object.prototype")
-#20101=@"loc,{#10000},7,8,7,23"
-locations_default(#20101,#10000,7,8,7,23)
-hasLocation(#20100,#20101)
-enclosing_stmt(#20100,#20097)
+exprs(#20100,79,#20098,0,"Object")
+hasLocation(#20100,#20059)
+enclosing_stmt(#20100,#20095)
 expr_containers(#20100,#20001)
+literals("Object","Object",#20100)
+bind(#20100,#20090)
+#20101=*
+exprs(#20101,0,#20098,1,"prototype")
+hasLocation(#20101,#20063)
+enclosing_stmt(#20101,#20095)
+expr_containers(#20101,#20001)
+literals("prototype","prototype",#20101)
 #20102=*
-exprs(#20102,79,#20100,0,"Object")
-hasLocation(#20102,#20059)
-enclosing_stmt(#20102,#20097)
-expr_containers(#20102,#20001)
-literals("Object","Object",#20102)
-bind(#20102,#20090)
-#20103=*
-exprs(#20103,0,#20100,1,"prototype")
-hasLocation(#20103,#20063)
-enclosing_stmt(#20103,#20097)
-expr_containers(#20103,#20001)
-literals("prototype","prototype",#20103)
+entry_cfg_node(#20102,#20001)
+#20103=@"loc,{#10000},1,1,1,0"
+locations_default(#20103,#10000,1,1,1,0)
+hasLocation(#20102,#20103)
 #20104=*
-entry_cfg_node(#20104,#20001)
-#20105=@"loc,{#10000},1,1,1,0"
-locations_default(#20105,#10000,1,1,1,0)
-hasLocation(#20104,#20105)
-#20106=*
-exit_cfg_node(#20106,#20001)
-hasLocation(#20106,#20067)
-successor(#20097,#20102)
-successor(#20103,#20100)
-successor(#20102,#20103)
-successor(#20100,#20098)
-successor(#20098,#20106)
+exit_cfg_node(#20104,#20001)
+hasLocation(#20104,#20067)
+successor(#20095,#20100)
+successor(#20101,#20098)
+successor(#20100,#20101)
+successor(#20098,#20096)
+successor(#20096,#20104)
 successor(#20091,#20094)
-successor(#20094,#20096)
-successor(#20096,#20092)
-successor(#20092,#20097)
+successor(#20094,#20092)
+successor(#20092,#20095)
 successor(#20086,#20089)
 successor(#20089,#20087)
 successor(#20087,#20091)
@@ -362,6 +355,6 @@ successor(#20075,#20078)
 successor(#20070,#20073)
 successor(#20073,#20071)
 successor(#20071,#20074)
-successor(#20104,#20070)
+successor(#20102,#20070)
 numlines(#10000,7,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
index 4f5ca5d7683c..717c195acf2e 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
@@ -95,33 +95,26 @@ enclosing_stmt(#20029,#20023)
 expr_containers(#20029,#20001)
 literals("2","2",#20029)
 #20030=*
-exprs(#20030,63,#20024,1,"(3)")
-#20031=@"loc,{#10000},1,5,1,7"
-locations_default(#20031,#10000,1,5,1,7)
-hasLocation(#20030,#20031)
+exprs(#20030,3,#20024,1,"3")
+hasLocation(#20030,#20015)
 enclosing_stmt(#20030,#20023)
 expr_containers(#20030,#20001)
-#20032=*
-exprs(#20032,3,#20030,0,"3")
-hasLocation(#20032,#20015)
-enclosing_stmt(#20032,#20023)
-expr_containers(#20032,#20001)
-literals("3","3",#20032)
+literals("3","3",#20030)
+has_parentheses(#20030,1)
+#20031=*
+entry_cfg_node(#20031,#20001)
+#20032=@"loc,{#10000},1,1,1,0"
+locations_default(#20032,#10000,1,1,1,0)
+hasLocation(#20031,#20032)
 #20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},1,1,1,0"
-locations_default(#20034,#10000,1,1,1,0)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20021)
+exit_cfg_node(#20033,#20001)
+hasLocation(#20033,#20021)
 successor(#20023,#20028)
-successor(#20030,#20032)
-successor(#20032,#20024)
+successor(#20030,#20024)
 successor(#20029,#20026)
 successor(#20028,#20029)
 successor(#20026,#20030)
-successor(#20024,#20035)
-successor(#20033,#20023)
+successor(#20024,#20033)
+successor(#20031,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
index e148737d83ee..e84234d89349 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
@@ -128,45 +128,38 @@ literals("g","g",#20040)
 variables(#20041,"g",#20000)
 bind(#20040,#20041)
 #20042=*
-exprs(#20042,63,#20032,1,"(h())")
-#20043=@"loc,{#10000},1,7,1,11"
-locations_default(#20043,#10000,1,7,1,11)
+exprs(#20042,13,#20032,1,"h()")
+#20043=@"loc,{#10000},1,8,1,10"
+locations_default(#20043,#10000,1,8,1,10)
 hasLocation(#20042,#20043)
 enclosing_stmt(#20042,#20031)
 expr_containers(#20042,#20001)
 #20044=*
-exprs(#20044,13,#20042,0,"h()")
-#20045=@"loc,{#10000},1,8,1,10"
-locations_default(#20045,#10000,1,8,1,10)
-hasLocation(#20044,#20045)
+exprs(#20044,79,#20042,-1,"h")
+hasLocation(#20044,#20019)
 enclosing_stmt(#20044,#20031)
 expr_containers(#20044,#20001)
+literals("h","h",#20044)
+#20045=@"var;{h};{#20000}"
+variables(#20045,"h",#20000)
+bind(#20044,#20045)
+has_parentheses(#20042,1)
 #20046=*
-exprs(#20046,79,#20044,-1,"h")
-hasLocation(#20046,#20019)
-enclosing_stmt(#20046,#20031)
-expr_containers(#20046,#20001)
-literals("h","h",#20046)
-#20047=@"var;{h};{#20000}"
-variables(#20047,"h",#20000)
-bind(#20046,#20047)
+entry_cfg_node(#20046,#20001)
+#20047=@"loc,{#10000},1,1,1,0"
+locations_default(#20047,#10000,1,1,1,0)
+hasLocation(#20046,#20047)
 #20048=*
-entry_cfg_node(#20048,#20001)
-#20049=@"loc,{#10000},1,1,1,0"
-locations_default(#20049,#10000,1,1,1,0)
-hasLocation(#20048,#20049)
-#20050=*
-exit_cfg_node(#20050,#20001)
-hasLocation(#20050,#20029)
+exit_cfg_node(#20048,#20001)
+hasLocation(#20048,#20029)
 successor(#20031,#20036)
-successor(#20042,#20046)
-successor(#20046,#20044)
-successor(#20044,#20032)
+successor(#20044,#20042)
+successor(#20042,#20032)
 successor(#20040,#20038)
 successor(#20038,#20034)
 successor(#20036,#20040)
-successor(#20034,#20042)
-successor(#20032,#20050)
-successor(#20048,#20031)
+successor(#20034,#20044)
+successor(#20032,#20048)
+successor(#20046,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
index b424a33bf2bc..48667662650f 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
@@ -101,33 +101,26 @@ enclosing_stmt(#20031,#20023)
 expr_containers(#20031,#20001)
 literals("2","2",#20031)
 #20032=*
-exprs(#20032,63,#20024,1,"(3)")
-#20033=@"loc,{#10000},1,7,1,9"
-locations_default(#20033,#10000,1,7,1,9)
-hasLocation(#20032,#20033)
+exprs(#20032,3,#20024,1,"3")
+hasLocation(#20032,#20015)
 enclosing_stmt(#20032,#20023)
 expr_containers(#20032,#20001)
-#20034=*
-exprs(#20034,3,#20032,0,"3")
-hasLocation(#20034,#20015)
-enclosing_stmt(#20034,#20023)
-expr_containers(#20034,#20001)
-literals("3","3",#20034)
+literals("3","3",#20032)
+has_parentheses(#20032,1)
+#20033=*
+entry_cfg_node(#20033,#20001)
+#20034=@"loc,{#10000},1,1,1,0"
+locations_default(#20034,#10000,1,1,1,0)
+hasLocation(#20033,#20034)
 #20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},1,1,1,0"
-locations_default(#20036,#10000,1,1,1,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20021)
+exit_cfg_node(#20035,#20001)
+hasLocation(#20035,#20021)
 successor(#20023,#20028)
-successor(#20032,#20034)
-successor(#20034,#20024)
+successor(#20032,#20024)
 successor(#20031,#20026)
 successor(#20028,#20031)
 successor(#20026,#20032)
-successor(#20024,#20037)
-successor(#20035,#20023)
+successor(#20024,#20035)
+successor(#20033,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
index 9b299d3c679c..7315e7d8bbfc 100644
--- a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
@@ -575,692 +575,587 @@ hasLocation(#20223,#20224)
 enclosing_stmt(#20223,#20222)
 expr_containers(#20223,#20001)
 #20225=*
-exprs(#20225,63,#20223,0,"(0<(jd|0)&0>(Wc|0))")
-#20226=@"loc,{#10000},1,5,1,23"
-locations_default(#20226,#10000,1,5,1,23)
+exprs(#20225,41,#20223,0,"0<(jd|0)&0>(Wc|0)")
+#20226=@"loc,{#10000},1,6,1,22"
+locations_default(#20226,#10000,1,6,1,22)
 hasLocation(#20225,#20226)
 enclosing_stmt(#20225,#20222)
 expr_containers(#20225,#20001)
 #20227=*
-exprs(#20227,41,#20225,0,"0<(jd|0)&0>(Wc|0)")
-#20228=@"loc,{#10000},1,6,1,22"
-locations_default(#20228,#10000,1,6,1,22)
+exprs(#20227,27,#20225,0,"0<(jd|0)")
+#20228=@"loc,{#10000},1,6,1,13"
+locations_default(#20228,#10000,1,6,1,13)
 hasLocation(#20227,#20228)
 enclosing_stmt(#20227,#20222)
 expr_containers(#20227,#20001)
 #20229=*
-exprs(#20229,27,#20227,0,"0<(jd|0)")
-#20230=@"loc,{#10000},1,6,1,13"
-locations_default(#20230,#10000,1,6,1,13)
-hasLocation(#20229,#20230)
+exprs(#20229,3,#20227,0,"0")
+hasLocation(#20229,#20017)
 enclosing_stmt(#20229,#20222)
 expr_containers(#20229,#20001)
-#20231=*
-exprs(#20231,3,#20229,0,"0")
-hasLocation(#20231,#20017)
-enclosing_stmt(#20231,#20222)
-expr_containers(#20231,#20001)
-literals("0","0",#20231)
+literals("0","0",#20229)
+#20230=*
+exprs(#20230,39,#20227,1,"jd|0")
+#20231=@"loc,{#10000},1,9,1,12"
+locations_default(#20231,#10000,1,9,1,12)
+hasLocation(#20230,#20231)
+enclosing_stmt(#20230,#20222)
+expr_containers(#20230,#20001)
 #20232=*
-exprs(#20232,63,#20229,1,"(jd|0)")
-#20233=@"loc,{#10000},1,8,1,13"
-locations_default(#20233,#10000,1,8,1,13)
-hasLocation(#20232,#20233)
+exprs(#20232,79,#20230,0,"jd")
+hasLocation(#20232,#20023)
 enclosing_stmt(#20232,#20222)
 expr_containers(#20232,#20001)
+literals("jd","jd",#20232)
+#20233=@"var;{jd};{#20000}"
+variables(#20233,"jd",#20000)
+bind(#20232,#20233)
 #20234=*
-exprs(#20234,39,#20232,0,"jd|0")
-#20235=@"loc,{#10000},1,9,1,12"
-locations_default(#20235,#10000,1,9,1,12)
-hasLocation(#20234,#20235)
+exprs(#20234,3,#20230,1,"0")
+hasLocation(#20234,#20027)
 enclosing_stmt(#20234,#20222)
 expr_containers(#20234,#20001)
-#20236=*
-exprs(#20236,79,#20234,0,"jd")
-hasLocation(#20236,#20023)
-enclosing_stmt(#20236,#20222)
-expr_containers(#20236,#20001)
-literals("jd","jd",#20236)
-#20237=@"var;{jd};{#20000}"
-variables(#20237,"jd",#20000)
-bind(#20236,#20237)
+literals("0","0",#20234)
+has_parentheses(#20230,1)
+#20235=*
+exprs(#20235,29,#20225,1,"0>(Wc|0)")
+#20236=@"loc,{#10000},1,15,1,22"
+locations_default(#20236,#10000,1,15,1,22)
+hasLocation(#20235,#20236)
+enclosing_stmt(#20235,#20222)
+expr_containers(#20235,#20001)
+#20237=*
+exprs(#20237,3,#20235,0,"0")
+hasLocation(#20237,#20033)
+enclosing_stmt(#20237,#20222)
+expr_containers(#20237,#20001)
+literals("0","0",#20237)
 #20238=*
-exprs(#20238,3,#20234,1,"0")
-hasLocation(#20238,#20027)
+exprs(#20238,39,#20235,1,"Wc|0")
+#20239=@"loc,{#10000},1,18,1,21"
+locations_default(#20239,#10000,1,18,1,21)
+hasLocation(#20238,#20239)
 enclosing_stmt(#20238,#20222)
 expr_containers(#20238,#20001)
-literals("0","0",#20238)
-#20239=*
-exprs(#20239,29,#20227,1,"0>(Wc|0)")
-#20240=@"loc,{#10000},1,15,1,22"
-locations_default(#20240,#10000,1,15,1,22)
-hasLocation(#20239,#20240)
-enclosing_stmt(#20239,#20222)
-expr_containers(#20239,#20001)
-#20241=*
-exprs(#20241,3,#20239,0,"0")
-hasLocation(#20241,#20033)
-enclosing_stmt(#20241,#20222)
-expr_containers(#20241,#20001)
-literals("0","0",#20241)
+#20240=*
+exprs(#20240,79,#20238,0,"Wc")
+hasLocation(#20240,#20039)
+enclosing_stmt(#20240,#20222)
+expr_containers(#20240,#20001)
+literals("Wc","Wc",#20240)
+#20241=@"var;{Wc};{#20000}"
+variables(#20241,"Wc",#20000)
+bind(#20240,#20241)
 #20242=*
-exprs(#20242,63,#20239,1,"(Wc|0)")
-#20243=@"loc,{#10000},1,17,1,22"
-locations_default(#20243,#10000,1,17,1,22)
-hasLocation(#20242,#20243)
+exprs(#20242,3,#20238,1,"0")
+hasLocation(#20242,#20043)
 enclosing_stmt(#20242,#20222)
 expr_containers(#20242,#20001)
-#20244=*
-exprs(#20244,39,#20242,0,"Wc|0")
-#20245=@"loc,{#10000},1,18,1,21"
-locations_default(#20245,#10000,1,18,1,21)
-hasLocation(#20244,#20245)
-enclosing_stmt(#20244,#20222)
-expr_containers(#20244,#20001)
+literals("0","0",#20242)
+has_parentheses(#20238,1)
+has_parentheses(#20225,1)
+#20243=*
+stmts(#20243,1,#20222,1,"{}")
+#20244=@"loc,{#10000},1,25,1,26"
+locations_default(#20244,#10000,1,25,1,26)
+hasLocation(#20243,#20244)
+stmt_containers(#20243,#20001)
+#20245=*
+stmts(#20245,2,#20001,1,"g=(g|0) ... 0)?e:g;")
+hasLocation(#20245,#20005)
+stmt_containers(#20245,#20001)
 #20246=*
-exprs(#20246,79,#20244,0,"Wc")
-hasLocation(#20246,#20039)
-enclosing_stmt(#20246,#20222)
+exprs(#20246,47,#20245,0,"g=(g|0) ... |0)?e:g")
+#20247=@"loc,{#10000},2,1,2,29"
+locations_default(#20247,#10000,2,1,2,29)
+hasLocation(#20246,#20247)
+enclosing_stmt(#20246,#20245)
 expr_containers(#20246,#20001)
-literals("Wc","Wc",#20246)
-#20247=@"var;{Wc};{#20000}"
-variables(#20247,"Wc",#20000)
-bind(#20246,#20247)
 #20248=*
-exprs(#20248,3,#20244,1,"0")
-hasLocation(#20248,#20043)
-enclosing_stmt(#20248,#20222)
+exprs(#20248,79,#20246,0,"g")
+hasLocation(#20248,#20055)
+enclosing_stmt(#20248,#20245)
 expr_containers(#20248,#20001)
-literals("0","0",#20248)
-#20249=*
-stmts(#20249,1,#20222,1,"{}")
-#20250=@"loc,{#10000},1,25,1,26"
-locations_default(#20250,#10000,1,25,1,26)
-hasLocation(#20249,#20250)
-stmt_containers(#20249,#20001)
-#20251=*
-stmts(#20251,2,#20001,1,"g=(g|0) ... 0)?e:g;")
-hasLocation(#20251,#20005)
-stmt_containers(#20251,#20001)
+literals("g","g",#20248)
+#20249=@"var;{g};{#20000}"
+variables(#20249,"g",#20000)
+bind(#20248,#20249)
+#20250=*
+exprs(#20250,11,#20246,1,"(g|0)<( ... |0)?e:g")
+#20251=@"loc,{#10000},2,3,2,29"
+locations_default(#20251,#10000,2,3,2,29)
+hasLocation(#20250,#20251)
+enclosing_stmt(#20250,#20245)
+expr_containers(#20250,#20001)
 #20252=*
-exprs(#20252,47,#20251,0,"g=(g|0) ... |0)?e:g")
-#20253=@"loc,{#10000},2,1,2,29"
-locations_default(#20253,#10000,2,1,2,29)
+exprs(#20252,39,#20250,0,"(g|0)<( ... )>(b|0)")
+#20253=@"loc,{#10000},2,3,2,25"
+locations_default(#20253,#10000,2,3,2,25)
 hasLocation(#20252,#20253)
-enclosing_stmt(#20252,#20251)
+enclosing_stmt(#20252,#20245)
 expr_containers(#20252,#20001)
 #20254=*
-exprs(#20254,79,#20252,0,"g")
-hasLocation(#20254,#20055)
-enclosing_stmt(#20254,#20251)
+exprs(#20254,27,#20252,0,"(g|0)<(e|0)")
+#20255=@"loc,{#10000},2,3,2,13"
+locations_default(#20255,#10000,2,3,2,13)
+hasLocation(#20254,#20255)
+enclosing_stmt(#20254,#20245)
 expr_containers(#20254,#20001)
-literals("g","g",#20254)
-#20255=@"var;{g};{#20000}"
-variables(#20255,"g",#20000)
-bind(#20254,#20255)
 #20256=*
-exprs(#20256,11,#20252,1,"(g|0)<( ... |0)?e:g")
-#20257=@"loc,{#10000},2,3,2,29"
-locations_default(#20257,#10000,2,3,2,29)
+exprs(#20256,39,#20254,0,"g|0")
+#20257=@"loc,{#10000},2,4,2,6"
+locations_default(#20257,#10000,2,4,2,6)
 hasLocation(#20256,#20257)
-enclosing_stmt(#20256,#20251)
+enclosing_stmt(#20256,#20245)
 expr_containers(#20256,#20001)
 #20258=*
-exprs(#20258,39,#20256,0,"(g|0)<( ... )>(b|0)")
-#20259=@"loc,{#10000},2,3,2,25"
-locations_default(#20259,#10000,2,3,2,25)
-hasLocation(#20258,#20259)
-enclosing_stmt(#20258,#20251)
+exprs(#20258,79,#20256,0,"g")
+hasLocation(#20258,#20061)
+enclosing_stmt(#20258,#20245)
 expr_containers(#20258,#20001)
+literals("g","g",#20258)
+bind(#20258,#20249)
+#20259=*
+exprs(#20259,3,#20256,1,"0")
+hasLocation(#20259,#20065)
+enclosing_stmt(#20259,#20245)
+expr_containers(#20259,#20001)
+literals("0","0",#20259)
+has_parentheses(#20256,1)
 #20260=*
-exprs(#20260,27,#20258,0,"(g|0)<(e|0)")
-#20261=@"loc,{#10000},2,3,2,13"
-locations_default(#20261,#10000,2,3,2,13)
+exprs(#20260,39,#20254,1,"e|0")
+#20261=@"loc,{#10000},2,10,2,12"
+locations_default(#20261,#10000,2,10,2,12)
 hasLocation(#20260,#20261)
-enclosing_stmt(#20260,#20251)
+enclosing_stmt(#20260,#20245)
 expr_containers(#20260,#20001)
 #20262=*
-exprs(#20262,63,#20260,0,"(g|0)")
-#20263=@"loc,{#10000},2,3,2,7"
-locations_default(#20263,#10000,2,3,2,7)
-hasLocation(#20262,#20263)
-enclosing_stmt(#20262,#20251)
+exprs(#20262,79,#20260,0,"e")
+hasLocation(#20262,#20073)
+enclosing_stmt(#20262,#20245)
 expr_containers(#20262,#20001)
+literals("e","e",#20262)
+#20263=@"var;{e};{#20000}"
+variables(#20263,"e",#20000)
+bind(#20262,#20263)
 #20264=*
-exprs(#20264,39,#20262,0,"g|0")
-#20265=@"loc,{#10000},2,4,2,6"
-locations_default(#20265,#10000,2,4,2,6)
-hasLocation(#20264,#20265)
-enclosing_stmt(#20264,#20251)
+exprs(#20264,3,#20260,1,"0")
+hasLocation(#20264,#20077)
+enclosing_stmt(#20264,#20245)
 expr_containers(#20264,#20001)
-#20266=*
-exprs(#20266,79,#20264,0,"g")
-hasLocation(#20266,#20061)
-enclosing_stmt(#20266,#20251)
-expr_containers(#20266,#20001)
-literals("g","g",#20266)
-bind(#20266,#20255)
+literals("0","0",#20264)
+has_parentheses(#20260,1)
+#20265=*
+exprs(#20265,29,#20252,1,"(g|0)>(b|0)")
+#20266=@"loc,{#10000},2,15,2,25"
+locations_default(#20266,#10000,2,15,2,25)
+hasLocation(#20265,#20266)
+enclosing_stmt(#20265,#20245)
+expr_containers(#20265,#20001)
 #20267=*
-exprs(#20267,3,#20264,1,"0")
-hasLocation(#20267,#20065)
-enclosing_stmt(#20267,#20251)
+exprs(#20267,39,#20265,0,"g|0")
+#20268=@"loc,{#10000},2,16,2,18"
+locations_default(#20268,#10000,2,16,2,18)
+hasLocation(#20267,#20268)
+enclosing_stmt(#20267,#20245)
 expr_containers(#20267,#20001)
-literals("0","0",#20267)
-#20268=*
-exprs(#20268,63,#20260,1,"(e|0)")
-#20269=@"loc,{#10000},2,9,2,13"
-locations_default(#20269,#10000,2,9,2,13)
-hasLocation(#20268,#20269)
-enclosing_stmt(#20268,#20251)
-expr_containers(#20268,#20001)
+#20269=*
+exprs(#20269,79,#20267,0,"g")
+hasLocation(#20269,#20085)
+enclosing_stmt(#20269,#20245)
+expr_containers(#20269,#20001)
+literals("g","g",#20269)
+bind(#20269,#20249)
 #20270=*
-exprs(#20270,39,#20268,0,"e|0")
-#20271=@"loc,{#10000},2,10,2,12"
-locations_default(#20271,#10000,2,10,2,12)
-hasLocation(#20270,#20271)
-enclosing_stmt(#20270,#20251)
+exprs(#20270,3,#20267,1,"0")
+hasLocation(#20270,#20089)
+enclosing_stmt(#20270,#20245)
 expr_containers(#20270,#20001)
-#20272=*
-exprs(#20272,79,#20270,0,"e")
-hasLocation(#20272,#20073)
-enclosing_stmt(#20272,#20251)
-expr_containers(#20272,#20001)
-literals("e","e",#20272)
-#20273=@"var;{e};{#20000}"
-variables(#20273,"e",#20000)
-bind(#20272,#20273)
-#20274=*
-exprs(#20274,3,#20270,1,"0")
-hasLocation(#20274,#20077)
-enclosing_stmt(#20274,#20251)
-expr_containers(#20274,#20001)
-literals("0","0",#20274)
+literals("0","0",#20270)
+has_parentheses(#20267,1)
+#20271=*
+exprs(#20271,39,#20265,1,"b|0")
+#20272=@"loc,{#10000},2,22,2,24"
+locations_default(#20272,#10000,2,22,2,24)
+hasLocation(#20271,#20272)
+enclosing_stmt(#20271,#20245)
+expr_containers(#20271,#20001)
+#20273=*
+exprs(#20273,79,#20271,0,"b")
+hasLocation(#20273,#20097)
+enclosing_stmt(#20273,#20245)
+expr_containers(#20273,#20001)
+literals("b","b",#20273)
+#20274=@"var;{b};{#20000}"
+variables(#20274,"b",#20000)
+bind(#20273,#20274)
 #20275=*
-exprs(#20275,29,#20258,1,"(g|0)>(b|0)")
-#20276=@"loc,{#10000},2,15,2,25"
-locations_default(#20276,#10000,2,15,2,25)
-hasLocation(#20275,#20276)
-enclosing_stmt(#20275,#20251)
+exprs(#20275,3,#20271,1,"0")
+hasLocation(#20275,#20101)
+enclosing_stmt(#20275,#20245)
 expr_containers(#20275,#20001)
+literals("0","0",#20275)
+has_parentheses(#20271,1)
+#20276=*
+exprs(#20276,79,#20250,1,"e")
+hasLocation(#20276,#20107)
+enclosing_stmt(#20276,#20245)
+expr_containers(#20276,#20001)
+literals("e","e",#20276)
+bind(#20276,#20263)
 #20277=*
-exprs(#20277,63,#20275,0,"(g|0)")
-#20278=@"loc,{#10000},2,15,2,19"
-locations_default(#20278,#10000,2,15,2,19)
-hasLocation(#20277,#20278)
-enclosing_stmt(#20277,#20251)
+exprs(#20277,79,#20250,2,"g")
+hasLocation(#20277,#20111)
+enclosing_stmt(#20277,#20245)
 expr_containers(#20277,#20001)
+literals("g","g",#20277)
+bind(#20277,#20249)
+#20278=*
+stmts(#20278,3,#20001,2,"if((I|0 ... H|0)){}")
+hasLocation(#20278,#20007)
+stmt_containers(#20278,#20001)
 #20279=*
-exprs(#20279,39,#20277,0,"g|0")
-#20280=@"loc,{#10000},2,16,2,18"
-locations_default(#20280,#10000,2,16,2,18)
+exprs(#20279,39,#20278,0,"(I|0)<( ... )>(H|0)")
+#20280=@"loc,{#10000},3,4,3,50"
+locations_default(#20280,#10000,3,4,3,50)
 hasLocation(#20279,#20280)
-enclosing_stmt(#20279,#20251)
+enclosing_stmt(#20279,#20278)
 expr_containers(#20279,#20001)
 #20281=*
-exprs(#20281,79,#20279,0,"g")
-hasLocation(#20281,#20085)
-enclosing_stmt(#20281,#20251)
+exprs(#20281,39,#20279,0,"(I|0)<( ... )<(F|0)")
+#20282=@"loc,{#10000},3,4,3,38"
+locations_default(#20282,#10000,3,4,3,38)
+hasLocation(#20281,#20282)
+enclosing_stmt(#20281,#20278)
 expr_containers(#20281,#20001)
-literals("g","g",#20281)
-bind(#20281,#20255)
-#20282=*
-exprs(#20282,3,#20279,1,"0")
-hasLocation(#20282,#20089)
-enclosing_stmt(#20282,#20251)
-expr_containers(#20282,#20001)
-literals("0","0",#20282)
 #20283=*
-exprs(#20283,63,#20275,1,"(b|0)")
-#20284=@"loc,{#10000},2,21,2,25"
-locations_default(#20284,#10000,2,21,2,25)
+exprs(#20283,39,#20281,0,"(I|0)<( ... )>(P|0)")
+#20284=@"loc,{#10000},3,4,3,26"
+locations_default(#20284,#10000,3,4,3,26)
 hasLocation(#20283,#20284)
-enclosing_stmt(#20283,#20251)
+enclosing_stmt(#20283,#20278)
 expr_containers(#20283,#20001)
 #20285=*
-exprs(#20285,39,#20283,0,"b|0")
-#20286=@"loc,{#10000},2,22,2,24"
-locations_default(#20286,#10000,2,22,2,24)
+exprs(#20285,27,#20283,0,"(I|0)<(D|0)")
+#20286=@"loc,{#10000},3,4,3,14"
+locations_default(#20286,#10000,3,4,3,14)
 hasLocation(#20285,#20286)
-enclosing_stmt(#20285,#20251)
+enclosing_stmt(#20285,#20278)
 expr_containers(#20285,#20001)
 #20287=*
-exprs(#20287,79,#20285,0,"b")
-hasLocation(#20287,#20097)
-enclosing_stmt(#20287,#20251)
+exprs(#20287,39,#20285,0,"I|0")
+#20288=@"loc,{#10000},3,5,3,7"
+locations_default(#20288,#10000,3,5,3,7)
+hasLocation(#20287,#20288)
+enclosing_stmt(#20287,#20278)
 expr_containers(#20287,#20001)
-literals("b","b",#20287)
-#20288=@"var;{b};{#20000}"
-variables(#20288,"b",#20000)
-bind(#20287,#20288)
 #20289=*
-exprs(#20289,3,#20285,1,"0")
-hasLocation(#20289,#20101)
-enclosing_stmt(#20289,#20251)
+exprs(#20289,79,#20287,0,"I")
+hasLocation(#20289,#20121)
+enclosing_stmt(#20289,#20278)
 expr_containers(#20289,#20001)
-literals("0","0",#20289)
-#20290=*
-exprs(#20290,79,#20256,1,"e")
-hasLocation(#20290,#20107)
-enclosing_stmt(#20290,#20251)
-expr_containers(#20290,#20001)
-literals("e","e",#20290)
-bind(#20290,#20273)
+literals("I","I",#20289)
+#20290=@"var;{I};{#20000}"
+variables(#20290,"I",#20000)
+bind(#20289,#20290)
 #20291=*
-exprs(#20291,79,#20256,2,"g")
-hasLocation(#20291,#20111)
-enclosing_stmt(#20291,#20251)
+exprs(#20291,3,#20287,1,"0")
+hasLocation(#20291,#20125)
+enclosing_stmt(#20291,#20278)
 expr_containers(#20291,#20001)
-literals("g","g",#20291)
-bind(#20291,#20255)
+literals("0","0",#20291)
+has_parentheses(#20287,1)
 #20292=*
-stmts(#20292,3,#20001,2,"if((I|0 ... H|0)){}")
-hasLocation(#20292,#20007)
-stmt_containers(#20292,#20001)
-#20293=*
-exprs(#20293,39,#20292,0,"(I|0)<( ... )>(H|0)")
-#20294=@"loc,{#10000},3,4,3,50"
-locations_default(#20294,#10000,3,4,3,50)
-hasLocation(#20293,#20294)
-enclosing_stmt(#20293,#20292)
-expr_containers(#20293,#20001)
-#20295=*
-exprs(#20295,39,#20293,0,"(I|0)<( ... )<(F|0)")
-#20296=@"loc,{#10000},3,4,3,38"
-locations_default(#20296,#10000,3,4,3,38)
-hasLocation(#20295,#20296)
-enclosing_stmt(#20295,#20292)
-expr_containers(#20295,#20001)
+exprs(#20292,39,#20285,1,"D|0")
+#20293=@"loc,{#10000},3,11,3,13"
+locations_default(#20293,#10000,3,11,3,13)
+hasLocation(#20292,#20293)
+enclosing_stmt(#20292,#20278)
+expr_containers(#20292,#20001)
+#20294=*
+exprs(#20294,79,#20292,0,"D")
+hasLocation(#20294,#20133)
+enclosing_stmt(#20294,#20278)
+expr_containers(#20294,#20001)
+literals("D","D",#20294)
+#20295=@"var;{D};{#20000}"
+variables(#20295,"D",#20000)
+bind(#20294,#20295)
+#20296=*
+exprs(#20296,3,#20292,1,"0")
+hasLocation(#20296,#20137)
+enclosing_stmt(#20296,#20278)
+expr_containers(#20296,#20001)
+literals("0","0",#20296)
+has_parentheses(#20292,1)
 #20297=*
-exprs(#20297,39,#20295,0,"(I|0)<( ... )>(P|0)")
-#20298=@"loc,{#10000},3,4,3,26"
-locations_default(#20298,#10000,3,4,3,26)
+exprs(#20297,29,#20283,1,"(N|0)>(P|0)")
+#20298=@"loc,{#10000},3,16,3,26"
+locations_default(#20298,#10000,3,16,3,26)
 hasLocation(#20297,#20298)
-enclosing_stmt(#20297,#20292)
+enclosing_stmt(#20297,#20278)
 expr_containers(#20297,#20001)
 #20299=*
-exprs(#20299,27,#20297,0,"(I|0)<(D|0)")
-#20300=@"loc,{#10000},3,4,3,14"
-locations_default(#20300,#10000,3,4,3,14)
+exprs(#20299,39,#20297,0,"N|0")
+#20300=@"loc,{#10000},3,17,3,19"
+locations_default(#20300,#10000,3,17,3,19)
 hasLocation(#20299,#20300)
-enclosing_stmt(#20299,#20292)
+enclosing_stmt(#20299,#20278)
 expr_containers(#20299,#20001)
 #20301=*
-exprs(#20301,63,#20299,0,"(I|0)")
-#20302=@"loc,{#10000},3,4,3,8"
-locations_default(#20302,#10000,3,4,3,8)
-hasLocation(#20301,#20302)
-enclosing_stmt(#20301,#20292)
+exprs(#20301,79,#20299,0,"N")
+hasLocation(#20301,#20145)
+enclosing_stmt(#20301,#20278)
 expr_containers(#20301,#20001)
+literals("N","N",#20301)
+#20302=@"var;{N};{#20000}"
+variables(#20302,"N",#20000)
+bind(#20301,#20302)
 #20303=*
-exprs(#20303,39,#20301,0,"I|0")
-#20304=@"loc,{#10000},3,5,3,7"
-locations_default(#20304,#10000,3,5,3,7)
-hasLocation(#20303,#20304)
-enclosing_stmt(#20303,#20292)
+exprs(#20303,3,#20299,1,"0")
+hasLocation(#20303,#20149)
+enclosing_stmt(#20303,#20278)
 expr_containers(#20303,#20001)
-#20305=*
-exprs(#20305,79,#20303,0,"I")
-hasLocation(#20305,#20121)
-enclosing_stmt(#20305,#20292)
-expr_containers(#20305,#20001)
-literals("I","I",#20305)
-#20306=@"var;{I};{#20000}"
-variables(#20306,"I",#20000)
-bind(#20305,#20306)
-#20307=*
-exprs(#20307,3,#20303,1,"0")
-hasLocation(#20307,#20125)
-enclosing_stmt(#20307,#20292)
-expr_containers(#20307,#20001)
-literals("0","0",#20307)
+literals("0","0",#20303)
+has_parentheses(#20299,1)
+#20304=*
+exprs(#20304,39,#20297,1,"P|0")
+#20305=@"loc,{#10000},3,23,3,25"
+locations_default(#20305,#10000,3,23,3,25)
+hasLocation(#20304,#20305)
+enclosing_stmt(#20304,#20278)
+expr_containers(#20304,#20001)
+#20306=*
+exprs(#20306,79,#20304,0,"P")
+hasLocation(#20306,#20157)
+enclosing_stmt(#20306,#20278)
+expr_containers(#20306,#20001)
+literals("P","P",#20306)
+#20307=@"var;{P};{#20000}"
+variables(#20307,"P",#20000)
+bind(#20306,#20307)
 #20308=*
-exprs(#20308,63,#20299,1,"(D|0)")
-#20309=@"loc,{#10000},3,10,3,14"
-locations_default(#20309,#10000,3,10,3,14)
-hasLocation(#20308,#20309)
-enclosing_stmt(#20308,#20292)
+exprs(#20308,3,#20304,1,"0")
+hasLocation(#20308,#20161)
+enclosing_stmt(#20308,#20278)
 expr_containers(#20308,#20001)
-#20310=*
-exprs(#20310,39,#20308,0,"D|0")
-#20311=@"loc,{#10000},3,11,3,13"
-locations_default(#20311,#10000,3,11,3,13)
-hasLocation(#20310,#20311)
-enclosing_stmt(#20310,#20292)
-expr_containers(#20310,#20001)
-#20312=*
-exprs(#20312,79,#20310,0,"D")
-hasLocation(#20312,#20133)
-enclosing_stmt(#20312,#20292)
-expr_containers(#20312,#20001)
-literals("D","D",#20312)
-#20313=@"var;{D};{#20000}"
-variables(#20313,"D",#20000)
-bind(#20312,#20313)
-#20314=*
-exprs(#20314,3,#20310,1,"0")
-hasLocation(#20314,#20137)
-enclosing_stmt(#20314,#20292)
-expr_containers(#20314,#20001)
-literals("0","0",#20314)
+literals("0","0",#20308)
+has_parentheses(#20304,1)
+#20309=*
+exprs(#20309,27,#20281,1,"(M|0)<(F|0)")
+#20310=@"loc,{#10000},3,28,3,38"
+locations_default(#20310,#10000,3,28,3,38)
+hasLocation(#20309,#20310)
+enclosing_stmt(#20309,#20278)
+expr_containers(#20309,#20001)
+#20311=*
+exprs(#20311,39,#20309,0,"M|0")
+#20312=@"loc,{#10000},3,29,3,31"
+locations_default(#20312,#10000,3,29,3,31)
+hasLocation(#20311,#20312)
+enclosing_stmt(#20311,#20278)
+expr_containers(#20311,#20001)
+#20313=*
+exprs(#20313,79,#20311,0,"M")
+hasLocation(#20313,#20169)
+enclosing_stmt(#20313,#20278)
+expr_containers(#20313,#20001)
+literals("M","M",#20313)
+#20314=@"var;{M};{#20000}"
+variables(#20314,"M",#20000)
+bind(#20313,#20314)
 #20315=*
-exprs(#20315,29,#20297,1,"(N|0)>(P|0)")
-#20316=@"loc,{#10000},3,16,3,26"
-locations_default(#20316,#10000,3,16,3,26)
-hasLocation(#20315,#20316)
-enclosing_stmt(#20315,#20292)
+exprs(#20315,3,#20311,1,"0")
+hasLocation(#20315,#20173)
+enclosing_stmt(#20315,#20278)
 expr_containers(#20315,#20001)
-#20317=*
-exprs(#20317,63,#20315,0,"(N|0)")
-#20318=@"loc,{#10000},3,16,3,20"
-locations_default(#20318,#10000,3,16,3,20)
-hasLocation(#20317,#20318)
-enclosing_stmt(#20317,#20292)
-expr_containers(#20317,#20001)
-#20319=*
-exprs(#20319,39,#20317,0,"N|0")
-#20320=@"loc,{#10000},3,17,3,19"
-locations_default(#20320,#10000,3,17,3,19)
-hasLocation(#20319,#20320)
-enclosing_stmt(#20319,#20292)
-expr_containers(#20319,#20001)
+literals("0","0",#20315)
+has_parentheses(#20311,1)
+#20316=*
+exprs(#20316,39,#20309,1,"F|0")
+#20317=@"loc,{#10000},3,35,3,37"
+locations_default(#20317,#10000,3,35,3,37)
+hasLocation(#20316,#20317)
+enclosing_stmt(#20316,#20278)
+expr_containers(#20316,#20001)
+#20318=*
+exprs(#20318,79,#20316,0,"F")
+hasLocation(#20318,#20181)
+enclosing_stmt(#20318,#20278)
+expr_containers(#20318,#20001)
+literals("F","F",#20318)
+#20319=@"var;{F};{#20000}"
+variables(#20319,"F",#20000)
+bind(#20318,#20319)
+#20320=*
+exprs(#20320,3,#20316,1,"0")
+hasLocation(#20320,#20185)
+enclosing_stmt(#20320,#20278)
+expr_containers(#20320,#20001)
+literals("0","0",#20320)
+has_parentheses(#20316,1)
 #20321=*
-exprs(#20321,79,#20319,0,"N")
-hasLocation(#20321,#20145)
-enclosing_stmt(#20321,#20292)
+exprs(#20321,29,#20279,1,"(L|0)>(H|0)")
+#20322=@"loc,{#10000},3,40,3,50"
+locations_default(#20322,#10000,3,40,3,50)
+hasLocation(#20321,#20322)
+enclosing_stmt(#20321,#20278)
 expr_containers(#20321,#20001)
-literals("N","N",#20321)
-#20322=@"var;{N};{#20000}"
-variables(#20322,"N",#20000)
-bind(#20321,#20322)
 #20323=*
-exprs(#20323,3,#20319,1,"0")
-hasLocation(#20323,#20149)
-enclosing_stmt(#20323,#20292)
+exprs(#20323,39,#20321,0,"L|0")
+#20324=@"loc,{#10000},3,41,3,43"
+locations_default(#20324,#10000,3,41,3,43)
+hasLocation(#20323,#20324)
+enclosing_stmt(#20323,#20278)
 expr_containers(#20323,#20001)
-literals("0","0",#20323)
-#20324=*
-exprs(#20324,63,#20315,1,"(P|0)")
-#20325=@"loc,{#10000},3,22,3,26"
-locations_default(#20325,#10000,3,22,3,26)
-hasLocation(#20324,#20325)
-enclosing_stmt(#20324,#20292)
-expr_containers(#20324,#20001)
-#20326=*
-exprs(#20326,39,#20324,0,"P|0")
-#20327=@"loc,{#10000},3,23,3,25"
-locations_default(#20327,#10000,3,23,3,25)
-hasLocation(#20326,#20327)
-enclosing_stmt(#20326,#20292)
-expr_containers(#20326,#20001)
+#20325=*
+exprs(#20325,79,#20323,0,"L")
+hasLocation(#20325,#20193)
+enclosing_stmt(#20325,#20278)
+expr_containers(#20325,#20001)
+literals("L","L",#20325)
+#20326=@"var;{L};{#20000}"
+variables(#20326,"L",#20000)
+bind(#20325,#20326)
+#20327=*
+exprs(#20327,3,#20323,1,"0")
+hasLocation(#20327,#20197)
+enclosing_stmt(#20327,#20278)
+expr_containers(#20327,#20001)
+literals("0","0",#20327)
+has_parentheses(#20323,1)
 #20328=*
-exprs(#20328,79,#20326,0,"P")
-hasLocation(#20328,#20157)
-enclosing_stmt(#20328,#20292)
+exprs(#20328,39,#20321,1,"H|0")
+#20329=@"loc,{#10000},3,47,3,49"
+locations_default(#20329,#10000,3,47,3,49)
+hasLocation(#20328,#20329)
+enclosing_stmt(#20328,#20278)
 expr_containers(#20328,#20001)
-literals("P","P",#20328)
-#20329=@"var;{P};{#20000}"
-variables(#20329,"P",#20000)
-bind(#20328,#20329)
 #20330=*
-exprs(#20330,3,#20326,1,"0")
-hasLocation(#20330,#20161)
-enclosing_stmt(#20330,#20292)
+exprs(#20330,79,#20328,0,"H")
+hasLocation(#20330,#20205)
+enclosing_stmt(#20330,#20278)
 expr_containers(#20330,#20001)
-literals("0","0",#20330)
-#20331=*
-exprs(#20331,27,#20295,1,"(M|0)<(F|0)")
-#20332=@"loc,{#10000},3,28,3,38"
-locations_default(#20332,#10000,3,28,3,38)
-hasLocation(#20331,#20332)
-enclosing_stmt(#20331,#20292)
-expr_containers(#20331,#20001)
+literals("H","H",#20330)
+#20331=@"var;{H};{#20000}"
+variables(#20331,"H",#20000)
+bind(#20330,#20331)
+#20332=*
+exprs(#20332,3,#20328,1,"0")
+hasLocation(#20332,#20209)
+enclosing_stmt(#20332,#20278)
+expr_containers(#20332,#20001)
+literals("0","0",#20332)
+has_parentheses(#20328,1)
 #20333=*
-exprs(#20333,63,#20331,0,"(M|0)")
-#20334=@"loc,{#10000},3,28,3,32"
-locations_default(#20334,#10000,3,28,3,32)
+stmts(#20333,1,#20278,1,"{}")
+#20334=@"loc,{#10000},3,52,3,53"
+locations_default(#20334,#10000,3,52,3,53)
 hasLocation(#20333,#20334)
-enclosing_stmt(#20333,#20292)
-expr_containers(#20333,#20001)
+stmt_containers(#20333,#20001)
 #20335=*
-exprs(#20335,39,#20333,0,"M|0")
-#20336=@"loc,{#10000},3,29,3,31"
-locations_default(#20336,#10000,3,29,3,31)
+entry_cfg_node(#20335,#20001)
+#20336=@"loc,{#10000},1,1,1,0"
+locations_default(#20336,#10000,1,1,1,0)
 hasLocation(#20335,#20336)
-enclosing_stmt(#20335,#20292)
-expr_containers(#20335,#20001)
 #20337=*
-exprs(#20337,79,#20335,0,"M")
-hasLocation(#20337,#20169)
-enclosing_stmt(#20337,#20292)
-expr_containers(#20337,#20001)
-literals("M","M",#20337)
-#20338=@"var;{M};{#20000}"
-variables(#20338,"M",#20000)
-bind(#20337,#20338)
+exit_cfg_node(#20337,#20001)
+hasLocation(#20337,#20219)
+successor(#20278,#20289)
+successor(#20332,#20328)
+successor(#20330,#20332)
+successor(#20328,#20321)
+successor(#20327,#20323)
+successor(#20325,#20327)
+successor(#20323,#20330)
+successor(#20321,#20279)
+successor(#20320,#20316)
+successor(#20318,#20320)
+successor(#20316,#20309)
+successor(#20315,#20311)
+successor(#20313,#20315)
+successor(#20311,#20318)
+successor(#20309,#20281)
+successor(#20308,#20304)
+successor(#20306,#20308)
+successor(#20304,#20297)
+successor(#20303,#20299)
+successor(#20301,#20303)
+successor(#20299,#20306)
+successor(#20297,#20283)
+successor(#20296,#20292)
+successor(#20294,#20296)
+successor(#20292,#20285)
+successor(#20291,#20287)
+successor(#20289,#20291)
+successor(#20287,#20294)
+successor(#20285,#20301)
+successor(#20283,#20313)
+successor(#20281,#20325)
+#20338=*
+guard_node(#20338,1,#20279)
+hasLocation(#20338,#20280)
+successor(#20338,#20333)
 #20339=*
-exprs(#20339,3,#20335,1,"0")
-hasLocation(#20339,#20173)
-enclosing_stmt(#20339,#20292)
-expr_containers(#20339,#20001)
-literals("0","0",#20339)
-#20340=*
-exprs(#20340,63,#20331,1,"(F|0)")
-#20341=@"loc,{#10000},3,34,3,38"
-locations_default(#20341,#10000,3,34,3,38)
-hasLocation(#20340,#20341)
-enclosing_stmt(#20340,#20292)
-expr_containers(#20340,#20001)
-#20342=*
-exprs(#20342,39,#20340,0,"F|0")
-#20343=@"loc,{#10000},3,35,3,37"
-locations_default(#20343,#10000,3,35,3,37)
-hasLocation(#20342,#20343)
-enclosing_stmt(#20342,#20292)
-expr_containers(#20342,#20001)
-#20344=*
-exprs(#20344,79,#20342,0,"F")
-hasLocation(#20344,#20181)
-enclosing_stmt(#20344,#20292)
-expr_containers(#20344,#20001)
-literals("F","F",#20344)
-#20345=@"var;{F};{#20000}"
-variables(#20345,"F",#20000)
-bind(#20344,#20345)
-#20346=*
-exprs(#20346,3,#20342,1,"0")
-hasLocation(#20346,#20185)
-enclosing_stmt(#20346,#20292)
-expr_containers(#20346,#20001)
-literals("0","0",#20346)
-#20347=*
-exprs(#20347,29,#20293,1,"(L|0)>(H|0)")
-#20348=@"loc,{#10000},3,40,3,50"
-locations_default(#20348,#10000,3,40,3,50)
-hasLocation(#20347,#20348)
-enclosing_stmt(#20347,#20292)
-expr_containers(#20347,#20001)
-#20349=*
-exprs(#20349,63,#20347,0,"(L|0)")
-#20350=@"loc,{#10000},3,40,3,44"
-locations_default(#20350,#10000,3,40,3,44)
-hasLocation(#20349,#20350)
-enclosing_stmt(#20349,#20292)
-expr_containers(#20349,#20001)
-#20351=*
-exprs(#20351,39,#20349,0,"L|0")
-#20352=@"loc,{#10000},3,41,3,43"
-locations_default(#20352,#10000,3,41,3,43)
-hasLocation(#20351,#20352)
-enclosing_stmt(#20351,#20292)
-expr_containers(#20351,#20001)
-#20353=*
-exprs(#20353,79,#20351,0,"L")
-hasLocation(#20353,#20193)
-enclosing_stmt(#20353,#20292)
-expr_containers(#20353,#20001)
-literals("L","L",#20353)
-#20354=@"var;{L};{#20000}"
-variables(#20354,"L",#20000)
-bind(#20353,#20354)
-#20355=*
-exprs(#20355,3,#20351,1,"0")
-hasLocation(#20355,#20197)
-enclosing_stmt(#20355,#20292)
-expr_containers(#20355,#20001)
-literals("0","0",#20355)
-#20356=*
-exprs(#20356,63,#20347,1,"(H|0)")
-#20357=@"loc,{#10000},3,46,3,50"
-locations_default(#20357,#10000,3,46,3,50)
-hasLocation(#20356,#20357)
-enclosing_stmt(#20356,#20292)
-expr_containers(#20356,#20001)
-#20358=*
-exprs(#20358,39,#20356,0,"H|0")
-#20359=@"loc,{#10000},3,47,3,49"
-locations_default(#20359,#10000,3,47,3,49)
-hasLocation(#20358,#20359)
-enclosing_stmt(#20358,#20292)
-expr_containers(#20358,#20001)
-#20360=*
-exprs(#20360,79,#20358,0,"H")
-hasLocation(#20360,#20205)
-enclosing_stmt(#20360,#20292)
-expr_containers(#20360,#20001)
-literals("H","H",#20360)
-#20361=@"var;{H};{#20000}"
-variables(#20361,"H",#20000)
-bind(#20360,#20361)
-#20362=*
-exprs(#20362,3,#20358,1,"0")
-hasLocation(#20362,#20209)
-enclosing_stmt(#20362,#20292)
-expr_containers(#20362,#20001)
-literals("0","0",#20362)
-#20363=*
-stmts(#20363,1,#20292,1,"{}")
-#20364=@"loc,{#10000},3,52,3,53"
-locations_default(#20364,#10000,3,52,3,53)
-hasLocation(#20363,#20364)
-stmt_containers(#20363,#20001)
-#20365=*
-entry_cfg_node(#20365,#20001)
-#20366=@"loc,{#10000},1,1,1,0"
-locations_default(#20366,#10000,1,1,1,0)
-hasLocation(#20365,#20366)
-#20367=*
-exit_cfg_node(#20367,#20001)
-hasLocation(#20367,#20219)
-successor(#20292,#20301)
-successor(#20356,#20360)
-successor(#20362,#20358)
-successor(#20360,#20362)
-successor(#20358,#20347)
-successor(#20349,#20353)
-successor(#20355,#20351)
-successor(#20353,#20355)
-successor(#20351,#20356)
-successor(#20347,#20293)
-successor(#20340,#20344)
-successor(#20346,#20342)
-successor(#20344,#20346)
-successor(#20342,#20331)
+guard_node(#20339,0,#20279)
+hasLocation(#20339,#20280)
+successor(#20339,#20337)
+successor(#20279,#20338)
+successor(#20279,#20339)
 successor(#20333,#20337)
-successor(#20339,#20335)
-successor(#20337,#20339)
-successor(#20335,#20340)
-successor(#20331,#20295)
-successor(#20324,#20328)
-successor(#20330,#20326)
-successor(#20328,#20330)
-successor(#20326,#20315)
-successor(#20317,#20321)
-successor(#20323,#20319)
-successor(#20321,#20323)
-successor(#20319,#20324)
-successor(#20315,#20297)
-successor(#20308,#20312)
-successor(#20314,#20310)
-successor(#20312,#20314)
-successor(#20310,#20299)
-successor(#20301,#20305)
-successor(#20307,#20303)
-successor(#20305,#20307)
-successor(#20303,#20308)
-successor(#20299,#20317)
-successor(#20297,#20333)
-successor(#20295,#20349)
-#20368=*
-guard_node(#20368,1,#20293)
-hasLocation(#20368,#20294)
-successor(#20368,#20363)
-#20369=*
-guard_node(#20369,0,#20293)
-hasLocation(#20369,#20294)
-successor(#20369,#20367)
-successor(#20293,#20368)
-successor(#20293,#20369)
-successor(#20363,#20367)
-successor(#20251,#20254)
+successor(#20245,#20248)
+successor(#20250,#20258)
+successor(#20275,#20271)
+successor(#20273,#20275)
+successor(#20271,#20265)
+successor(#20270,#20267)
+successor(#20269,#20270)
+successor(#20267,#20273)
+successor(#20265,#20252)
+successor(#20264,#20260)
+successor(#20262,#20264)
+successor(#20260,#20254)
+successor(#20259,#20256)
+successor(#20258,#20259)
 successor(#20256,#20262)
-successor(#20283,#20287)
-successor(#20289,#20285)
-successor(#20287,#20289)
-successor(#20285,#20275)
-successor(#20277,#20281)
-successor(#20282,#20279)
-successor(#20281,#20282)
-successor(#20279,#20283)
-successor(#20275,#20258)
-successor(#20268,#20272)
-successor(#20274,#20270)
-successor(#20272,#20274)
-successor(#20270,#20260)
-successor(#20262,#20266)
-successor(#20267,#20264)
-successor(#20266,#20267)
-successor(#20264,#20268)
-successor(#20260,#20277)
-#20370=*
-guard_node(#20370,1,#20258)
-hasLocation(#20370,#20259)
-successor(#20370,#20290)
-#20371=*
-guard_node(#20371,0,#20258)
-hasLocation(#20371,#20259)
-successor(#20371,#20291)
-successor(#20258,#20370)
-successor(#20258,#20371)
-successor(#20290,#20252)
-successor(#20291,#20252)
-successor(#20254,#20256)
-successor(#20252,#20292)
-successor(#20222,#20225)
-successor(#20225,#20231)
-successor(#20242,#20246)
-successor(#20248,#20244)
-successor(#20246,#20248)
-successor(#20244,#20239)
-successor(#20241,#20242)
-successor(#20239,#20227)
-successor(#20232,#20236)
-successor(#20238,#20234)
-successor(#20236,#20238)
-successor(#20234,#20229)
-successor(#20231,#20232)
-successor(#20229,#20241)
-successor(#20227,#20223)
-#20372=*
-guard_node(#20372,0,#20227)
-hasLocation(#20372,#20228)
-successor(#20372,#20249)
-#20373=*
-guard_node(#20373,1,#20227)
-hasLocation(#20373,#20228)
-successor(#20373,#20251)
-successor(#20223,#20372)
-successor(#20223,#20373)
-successor(#20249,#20251)
-successor(#20365,#20222)
+successor(#20254,#20269)
+#20340=*
+guard_node(#20340,1,#20252)
+hasLocation(#20340,#20253)
+successor(#20340,#20276)
+#20341=*
+guard_node(#20341,0,#20252)
+hasLocation(#20341,#20253)
+successor(#20341,#20277)
+successor(#20252,#20340)
+successor(#20252,#20341)
+successor(#20276,#20246)
+successor(#20277,#20246)
+successor(#20248,#20250)
+successor(#20246,#20278)
+successor(#20222,#20229)
+successor(#20242,#20238)
+successor(#20240,#20242)
+successor(#20238,#20235)
+successor(#20237,#20240)
+successor(#20235,#20225)
+successor(#20234,#20230)
+successor(#20232,#20234)
+successor(#20230,#20227)
+successor(#20229,#20232)
+successor(#20227,#20237)
+successor(#20225,#20223)
+#20342=*
+guard_node(#20342,0,#20225)
+hasLocation(#20342,#20226)
+successor(#20342,#20243)
+#20343=*
+guard_node(#20343,1,#20225)
+hasLocation(#20343,#20226)
+successor(#20343,#20245)
+successor(#20223,#20342)
+successor(#20223,#20343)
+successor(#20243,#20245)
+successor(#20335,#20222)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/tst.js.trap b/javascript/extractor/tests/flow/output/trap/tst.js.trap
index 92ee708a6016..b58fccb46fa5 100644
--- a/javascript/extractor/tests/flow/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/tst.js.trap
@@ -663,75 +663,68 @@ locations_default(#20233,#10000,13,3,13,12)
 hasLocation(#20232,#20233)
 stmt_containers(#20232,#20220)
 #20234=*
-exprs(#20234,63,#20232,-1,"(42)")
-#20235=@"loc,{#10000},13,8,13,11"
-locations_default(#20235,#10000,13,8,13,11)
-hasLocation(#20234,#20235)
+exprs(#20234,3,#20232,-1,"42")
+hasLocation(#20234,#20129)
 enclosing_stmt(#20234,#20232)
 expr_containers(#20234,#20220)
-#20236=*
-exprs(#20236,3,#20234,0,"42")
-hasLocation(#20236,#20129)
-enclosing_stmt(#20236,#20232)
-expr_containers(#20236,#20220)
-literals("42","42",#20236)
+literals("42","42",#20234)
+has_parentheses(#20234,1)
+#20235=*
+entry_cfg_node(#20235,#20001)
+#20236=@"loc,{#10000},1,1,1,0"
+locations_default(#20236,#10000,1,1,1,0)
+hasLocation(#20235,#20236)
 #20237=*
-entry_cfg_node(#20237,#20001)
-#20238=@"loc,{#10000},1,1,1,0"
-locations_default(#20238,#10000,1,1,1,0)
-hasLocation(#20237,#20238)
-#20239=*
-exit_cfg_node(#20239,#20001)
-hasLocation(#20239,#20188)
-successor(#20220,#20239)
+exit_cfg_node(#20237,#20001)
+hasLocation(#20237,#20188)
+successor(#20220,#20237)
+#20238=*
+entry_cfg_node(#20238,#20220)
+#20239=@"loc,{#10000},11,1,11,0"
+locations_default(#20239,#10000,11,1,11,0)
+hasLocation(#20238,#20239)
 #20240=*
-entry_cfg_node(#20240,#20220)
-#20241=@"loc,{#10000},11,1,11,0"
-locations_default(#20241,#10000,11,1,11,0)
+exit_cfg_node(#20240,#20220)
+#20241=@"loc,{#10000},15,2,15,1"
+locations_default(#20241,#10000,15,2,15,1)
 hasLocation(#20240,#20241)
-#20242=*
-exit_cfg_node(#20242,#20220)
-#20243=@"loc,{#10000},15,2,15,1"
-locations_default(#20243,#10000,15,2,15,1)
-hasLocation(#20242,#20243)
 successor(#20228,#20230)
 successor(#20230,#20232)
 successor(#20232,#20234)
-successor(#20234,#20236)
-successor(#20236,#20242)
+successor(#20234,#20240)
 successor(#20226,#20228)
-successor(#20240,#20226)
+successor(#20238,#20226)
 successor(#20202,#20199)
 successor(#20201,#20213)
-#20244=*
-entry_cfg_node(#20244,#20201)
-hasLocation(#20244,#20214)
+#20242=*
+entry_cfg_node(#20242,#20201)
+hasLocation(#20242,#20214)
 successor(#20199,#20219)
-#20245=*
-exit_cfg_node(#20245,#20201)
-hasLocation(#20245,#20214)
-successor(#20219,#20245)
-successor(#20244,#20202)
+#20243=*
+exit_cfg_node(#20243,#20201)
+hasLocation(#20243,#20214)
+successor(#20219,#20243)
+successor(#20242,#20202)
 successor(#20215,#20201)
 successor(#20213,#20194)
 successor(#20206,#20203)
+#20244=*
+entry_cfg_node(#20244,#20206)
+#20245=@"loc,{#10000},8,4,8,3"
+locations_default(#20245,#10000,8,4,8,3)
+hasLocation(#20244,#20245)
 #20246=*
-entry_cfg_node(#20246,#20206)
-#20247=@"loc,{#10000},8,4,8,3"
-locations_default(#20247,#10000,8,4,8,3)
+exit_cfg_node(#20246,#20206)
+#20247=@"loc,{#10000},8,17,8,16"
+locations_default(#20247,#10000,8,17,8,16)
 hasLocation(#20246,#20247)
-#20248=*
-exit_cfg_node(#20248,#20206)
-#20249=@"loc,{#10000},8,17,8,16"
-locations_default(#20249,#10000,8,17,8,16)
-hasLocation(#20248,#20249)
-successor(#20211,#20248)
-successor(#20246,#20211)
+successor(#20211,#20246)
+successor(#20244,#20211)
 successor(#20205,#20206)
 successor(#20203,#20215)
 successor(#20196,#20205)
 successor(#20194,#20220)
 successor(#20222,#20196)
-successor(#20237,#20222)
+successor(#20235,#20222)
 numlines(#10000,22,17,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/html/output/trap/entities.html.trap b/javascript/extractor/tests/html/output/trap/entities.html.trap
index 794bf948df0e..8d7a4a73064c 100644
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@@ -70,84 +70,77 @@ hasLocation(#20023,#20004)
 enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20002)
 #20024=*
-exprs(#20024,63,#20023,0,"(alert(""Nope!""))")
-#20025=@"loc,{#10000},6,33,6,48"
-locations_default(#20025,#10000,6,33,6,48)
+exprs(#20024,13,#20023,0,"alert(""Nope!"")")
+#20025=@"loc,{#10000},6,34,6,47"
+locations_default(#20025,#10000,6,34,6,47)
 hasLocation(#20024,#20025)
 enclosing_stmt(#20024,#20022)
 expr_containers(#20024,#20002)
 #20026=*
-exprs(#20026,13,#20024,0,"alert(""Nope!"")")
-#20027=@"loc,{#10000},6,34,6,47"
-locations_default(#20027,#10000,6,34,6,47)
-hasLocation(#20026,#20027)
+exprs(#20026,79,#20024,-1,"alert")
+hasLocation(#20026,#20010)
 enclosing_stmt(#20026,#20022)
 expr_containers(#20026,#20002)
+literals("alert","alert",#20026)
+#20027=@"var;{alert};{#20000}"
+variables(#20027,"alert",#20000)
+bind(#20026,#20027)
 #20028=*
-exprs(#20028,79,#20026,-1,"alert")
-hasLocation(#20028,#20010)
+exprs(#20028,4,#20024,0,"""Nope!""")
+hasLocation(#20028,#20014)
 enclosing_stmt(#20028,#20022)
 expr_containers(#20028,#20002)
-literals("alert","alert",#20028)
-#20029=@"var;{alert};{#20000}"
-variables(#20029,"alert",#20000)
-bind(#20028,#20029)
-#20030=*
-exprs(#20030,4,#20026,0,"""Nope!""")
-hasLocation(#20030,#20014)
-enclosing_stmt(#20030,#20022)
-expr_containers(#20030,#20002)
-literals("Nope!","""Nope!""",#20030)
+literals("Nope!","""Nope!""",#20028)
+#20029=*
+regexpterm(#20029,14,#20028,0,"Nope!")
+#20030=@"loc,{#10000},6,41,6,45"
+locations_default(#20030,#10000,6,41,6,45)
+hasLocation(#20029,#20030)
+regexp_const_value(#20029,"Nope!")
+has_parentheses(#20024,1)
 #20031=*
-regexpterm(#20031,14,#20030,0,"Nope!")
-#20032=@"loc,{#10000},6,41,6,45"
-locations_default(#20032,#10000,6,41,6,45)
+entry_cfg_node(#20031,#20002)
+#20032=@"loc,{#10000},6,29,6,28"
+locations_default(#20032,#10000,6,29,6,28)
 hasLocation(#20031,#20032)
-regexp_const_value(#20031,"Nope!")
 #20033=*
-entry_cfg_node(#20033,#20002)
-#20034=@"loc,{#10000},6,29,6,28"
-locations_default(#20034,#10000,6,29,6,28)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20002)
-hasLocation(#20035,#20020)
-successor(#20022,#20024)
-successor(#20024,#20028)
-successor(#20030,#20026)
-successor(#20028,#20030)
-successor(#20026,#20023)
-successor(#20023,#20035)
-successor(#20033,#20022)
+exit_cfg_node(#20033,#20002)
+hasLocation(#20033,#20020)
+successor(#20022,#20026)
+successor(#20028,#20024)
+successor(#20026,#20028)
+successor(#20024,#20023)
+successor(#20023,#20033)
+successor(#20031,#20022)
 toplevel_parent_xml_node(#20002,#20001)
+#20034=*
+xmlElements(#20034,"html",#10000,0,#10000)
+#20035=@"loc,{#10000},1,1,8,7"
+locations_default(#20035,#10000,1,1,8,7)
+xmllocations(#20034,#20035)
 #20036=*
-xmlElements(#20036,"html",#10000,0,#10000)
-#20037=@"loc,{#10000},1,1,8,7"
-locations_default(#20037,#10000,1,1,8,7)
+xmlElements(#20036,"body",#20034,1,#10000)
+#20037=@"loc,{#10000},5,5,7,11"
+locations_default(#20037,#10000,5,5,7,11)
 xmllocations(#20036,#20037)
 #20038=*
-xmlElements(#20038,"body",#20036,1,#10000)
-#20039=@"loc,{#10000},5,5,7,11"
-locations_default(#20039,#10000,5,5,7,11)
+xmlElements(#20038,"a",#20036,0,#10000)
+#20039=@"loc,{#10000},6,9,6,80"
+locations_default(#20039,#10000,6,9,6,80)
 xmllocations(#20038,#20039)
-#20040=*
-xmlElements(#20040,"a",#20038,0,#10000)
-#20041=@"loc,{#10000},6,9,6,80"
-locations_default(#20041,#10000,6,9,6,80)
-xmllocations(#20040,#20041)
-xmlAttrs(#20001,#20040,"href","javascript:void(alert(""Nope!""))",0,#10000)
-#20042=@"loc,{#10000},6,12,6,65"
-locations_default(#20042,#10000,6,12,6,65)
-xmllocations(#20001,#20042)
+xmlAttrs(#20001,#20038,"href","javascript:void(alert(""Nope!""))",0,#10000)
+#20040=@"loc,{#10000},6,12,6,65"
+locations_default(#20040,#10000,6,12,6,65)
+xmllocations(#20001,#20040)
+#20041=*
+xmlElements(#20041,"head",#20034,0,#10000)
+#20042=@"loc,{#10000},2,5,4,11"
+locations_default(#20042,#10000,2,5,4,11)
+xmllocations(#20041,#20042)
 #20043=*
-xmlElements(#20043,"head",#20036,0,#10000)
-#20044=@"loc,{#10000},2,5,4,11"
-locations_default(#20044,#10000,2,5,4,11)
+xmlElements(#20043,"title",#20041,0,#10000)
+#20044=@"loc,{#10000},3,9,3,32"
+locations_default(#20044,#10000,3,9,3,32)
 xmllocations(#20043,#20044)
-#20045=*
-xmlElements(#20045,"title",#20043,0,#10000)
-#20046=@"loc,{#10000},3,9,3,32"
-locations_default(#20046,#10000,3,9,3,32)
-xmllocations(#20045,#20046)
 numlines(#10000,8,1,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/html/output/trap/tst.html.trap b/javascript/extractor/tests/html/output/trap/tst.html.trap
index 522b97260c97..0e8c2004c8e4 100644
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@@ -206,389 +206,382 @@ hasLocation(#20066,#20048)
 enclosing_stmt(#20066,#20065)
 expr_containers(#20066,#20046)
 #20067=*
-exprs(#20067,63,#20066,0,"(alert('Nope!'))")
-#20068=@"loc,{#10000},11,33,11,48"
-locations_default(#20068,#10000,11,33,11,48)
+exprs(#20067,13,#20066,0,"alert('Nope!')")
+#20068=@"loc,{#10000},11,34,11,47"
+locations_default(#20068,#10000,11,34,11,47)
 hasLocation(#20067,#20068)
 enclosing_stmt(#20067,#20065)
 expr_containers(#20067,#20046)
 #20069=*
-exprs(#20069,13,#20067,0,"alert('Nope!')")
-#20070=@"loc,{#10000},11,34,11,47"
-locations_default(#20070,#10000,11,34,11,47)
-hasLocation(#20069,#20070)
+exprs(#20069,79,#20067,-1,"alert")
+hasLocation(#20069,#20054)
 enclosing_stmt(#20069,#20065)
 expr_containers(#20069,#20046)
+literals("alert","alert",#20069)
+bind(#20069,#20028)
+#20070=*
+exprs(#20070,4,#20067,0,"'Nope!'")
+hasLocation(#20070,#20058)
+enclosing_stmt(#20070,#20065)
+expr_containers(#20070,#20046)
+literals("Nope!","'Nope!'",#20070)
 #20071=*
-exprs(#20071,79,#20069,-1,"alert")
-hasLocation(#20071,#20054)
-enclosing_stmt(#20071,#20065)
-expr_containers(#20071,#20046)
-literals("alert","alert",#20071)
-bind(#20071,#20028)
-#20072=*
-exprs(#20072,4,#20069,0,"'Nope!'")
-hasLocation(#20072,#20058)
-enclosing_stmt(#20072,#20065)
-expr_containers(#20072,#20046)
-literals("Nope!","'Nope!'",#20072)
+regexpterm(#20071,14,#20070,0,"Nope!")
+#20072=@"loc,{#10000},11,41,11,45"
+locations_default(#20072,#10000,11,41,11,45)
+hasLocation(#20071,#20072)
+regexp_const_value(#20071,"Nope!")
+has_parentheses(#20067,1)
 #20073=*
-regexpterm(#20073,14,#20072,0,"Nope!")
-#20074=@"loc,{#10000},11,41,11,45"
-locations_default(#20074,#10000,11,41,11,45)
+entry_cfg_node(#20073,#20046)
+#20074=@"loc,{#10000},11,29,11,28"
+locations_default(#20074,#10000,11,29,11,28)
 hasLocation(#20073,#20074)
-regexp_const_value(#20073,"Nope!")
 #20075=*
-entry_cfg_node(#20075,#20046)
-#20076=@"loc,{#10000},11,29,11,28"
-locations_default(#20076,#10000,11,29,11,28)
-hasLocation(#20075,#20076)
-#20077=*
-exit_cfg_node(#20077,#20046)
-hasLocation(#20077,#20064)
-successor(#20065,#20067)
-successor(#20067,#20071)
-successor(#20072,#20069)
-successor(#20071,#20072)
-successor(#20069,#20066)
-successor(#20066,#20077)
-successor(#20075,#20065)
+exit_cfg_node(#20075,#20046)
+hasLocation(#20075,#20064)
+successor(#20065,#20069)
+successor(#20070,#20067)
+successor(#20069,#20070)
+successor(#20067,#20066)
+successor(#20066,#20075)
+successor(#20073,#20065)
 toplevel_parent_xml_node(#20046,#20045)
+#20076=*
+#20077=@"script;{#10000},12,23"
 #20078=*
-#20079=@"script;{#10000},12,23"
+lines(#20078,#20077,"alert('I said don\'t click!')","")
+#20079=@"loc,{#10000},12,23,12,51"
+locations_default(#20079,#10000,12,23,12,51)
+hasLocation(#20078,#20079)
+numlines(#20077,1,1,0)
 #20080=*
-lines(#20080,#20079,"alert('I said don\'t click!')","")
-#20081=@"loc,{#10000},12,23,12,51"
-locations_default(#20081,#10000,12,23,12,51)
+tokeninfo(#20080,6,#20077,0,"alert")
+#20081=@"loc,{#10000},12,23,12,27"
+locations_default(#20081,#10000,12,23,12,27)
 hasLocation(#20080,#20081)
-numlines(#20079,1,1,0)
 #20082=*
-tokeninfo(#20082,6,#20079,0,"alert")
-#20083=@"loc,{#10000},12,23,12,27"
-locations_default(#20083,#10000,12,23,12,27)
+tokeninfo(#20082,8,#20077,1,"(")
+#20083=@"loc,{#10000},12,28,12,28"
+locations_default(#20083,#10000,12,28,12,28)
 hasLocation(#20082,#20083)
 #20084=*
-tokeninfo(#20084,8,#20079,1,"(")
-#20085=@"loc,{#10000},12,28,12,28"
-locations_default(#20085,#10000,12,28,12,28)
+tokeninfo(#20084,4,#20077,2,"'I said don\'t click!'")
+#20085=@"loc,{#10000},12,29,12,50"
+locations_default(#20085,#10000,12,29,12,50)
 hasLocation(#20084,#20085)
 #20086=*
-tokeninfo(#20086,4,#20079,2,"'I said don\'t click!'")
-#20087=@"loc,{#10000},12,29,12,50"
-locations_default(#20087,#10000,12,29,12,50)
+tokeninfo(#20086,8,#20077,3,")")
+#20087=@"loc,{#10000},12,51,12,51"
+locations_default(#20087,#10000,12,51,12,51)
 hasLocation(#20086,#20087)
 #20088=*
-tokeninfo(#20088,8,#20079,3,")")
-#20089=@"loc,{#10000},12,51,12,51"
-locations_default(#20089,#10000,12,51,12,51)
+tokeninfo(#20088,0,#20077,4,"")
+#20089=@"loc,{#10000},12,52,12,51"
+locations_default(#20089,#10000,12,52,12,51)
 hasLocation(#20088,#20089)
-#20090=*
-tokeninfo(#20090,0,#20079,4,"")
-#20091=@"loc,{#10000},12,52,12,51"
-locations_default(#20091,#10000,12,52,12,51)
-hasLocation(#20090,#20091)
-toplevels(#20079,2)
-hasLocation(#20079,#20081)
+toplevels(#20077,2)
+hasLocation(#20077,#20079)
 variables(#20022,"this",#20000)
+#20090=*
+stmts(#20090,2,#20077,0,"alert(' ... lick!')")
+hasLocation(#20090,#20079)
+stmt_containers(#20090,#20077)
+#20091=*
+exprs(#20091,13,#20090,0,"alert(' ... lick!')")
+hasLocation(#20091,#20079)
+enclosing_stmt(#20091,#20090)
+expr_containers(#20091,#20077)
 #20092=*
-stmts(#20092,2,#20079,0,"alert(' ... lick!')")
+exprs(#20092,79,#20091,-1,"alert")
 hasLocation(#20092,#20081)
-stmt_containers(#20092,#20079)
+enclosing_stmt(#20092,#20090)
+expr_containers(#20092,#20077)
+literals("alert","alert",#20092)
+bind(#20092,#20028)
 #20093=*
-exprs(#20093,13,#20092,0,"alert(' ... lick!')")
-hasLocation(#20093,#20081)
-enclosing_stmt(#20093,#20092)
-expr_containers(#20093,#20079)
+exprs(#20093,4,#20091,0,"'I said ... click!'")
+hasLocation(#20093,#20085)
+enclosing_stmt(#20093,#20090)
+expr_containers(#20093,#20077)
+literals("I said don't click!","'I said don\'t click!'",#20093)
 #20094=*
-exprs(#20094,79,#20093,-1,"alert")
-hasLocation(#20094,#20083)
-enclosing_stmt(#20094,#20092)
-expr_containers(#20094,#20079)
-literals("alert","alert",#20094)
-bind(#20094,#20028)
-#20095=*
-exprs(#20095,4,#20093,0,"'I said ... click!'")
-hasLocation(#20095,#20087)
-enclosing_stmt(#20095,#20092)
-expr_containers(#20095,#20079)
-literals("I said don't click!","'I said don\'t click!'",#20095)
+regexpterm(#20094,14,#20093,0,"I said don't click!")
+#20095=@"loc,{#10000},12,30,12,49"
+locations_default(#20095,#10000,12,30,12,49)
+hasLocation(#20094,#20095)
+regexp_const_value(#20094,"I said don't click!")
 #20096=*
-regexpterm(#20096,14,#20095,0,"I said don't click!")
-#20097=@"loc,{#10000},12,30,12,49"
-locations_default(#20097,#10000,12,30,12,49)
+entry_cfg_node(#20096,#20077)
+#20097=@"loc,{#10000},12,23,12,22"
+locations_default(#20097,#10000,12,23,12,22)
 hasLocation(#20096,#20097)
-regexp_const_value(#20096,"I said don't click!")
 #20098=*
-entry_cfg_node(#20098,#20079)
-#20099=@"loc,{#10000},12,23,12,22"
-locations_default(#20099,#10000,12,23,12,22)
-hasLocation(#20098,#20099)
-#20100=*
-exit_cfg_node(#20100,#20079)
-hasLocation(#20100,#20091)
-successor(#20092,#20094)
-successor(#20095,#20093)
-successor(#20094,#20095)
-successor(#20093,#20100)
-successor(#20098,#20092)
-toplevel_parent_xml_node(#20079,#20078)
+exit_cfg_node(#20098,#20077)
+hasLocation(#20098,#20089)
+successor(#20090,#20092)
+successor(#20093,#20091)
+successor(#20092,#20093)
+successor(#20091,#20098)
+successor(#20096,#20090)
+toplevel_parent_xml_node(#20077,#20076)
+#20099=*
+#20100=@"script;{#10000},13,21"
 #20101=*
-#20102=@"script;{#10000},13,21"
+lines(#20101,#20100,"return false;","")
+#20102=@"loc,{#10000},13,21,13,33"
+locations_default(#20102,#10000,13,21,13,33)
+hasLocation(#20101,#20102)
+numlines(#20100,1,1,0)
 #20103=*
-lines(#20103,#20102,"return false;","")
-#20104=@"loc,{#10000},13,21,13,33"
-locations_default(#20104,#10000,13,21,13,33)
+tokeninfo(#20103,7,#20100,0,"return")
+#20104=@"loc,{#10000},13,21,13,26"
+locations_default(#20104,#10000,13,21,13,26)
 hasLocation(#20103,#20104)
-numlines(#20102,1,1,0)
 #20105=*
-tokeninfo(#20105,7,#20102,0,"return")
-#20106=@"loc,{#10000},13,21,13,26"
-locations_default(#20106,#10000,13,21,13,26)
+tokeninfo(#20105,2,#20100,1,"false")
+#20106=@"loc,{#10000},13,28,13,32"
+locations_default(#20106,#10000,13,28,13,32)
 hasLocation(#20105,#20106)
 #20107=*
-tokeninfo(#20107,2,#20102,1,"false")
-#20108=@"loc,{#10000},13,28,13,32"
-locations_default(#20108,#10000,13,28,13,32)
+tokeninfo(#20107,8,#20100,2,";")
+#20108=@"loc,{#10000},13,33,13,33"
+locations_default(#20108,#10000,13,33,13,33)
 hasLocation(#20107,#20108)
 #20109=*
-tokeninfo(#20109,8,#20102,2,";")
-#20110=@"loc,{#10000},13,33,13,33"
-locations_default(#20110,#10000,13,33,13,33)
+tokeninfo(#20109,0,#20100,3,"")
+#20110=@"loc,{#10000},13,34,13,33"
+locations_default(#20110,#10000,13,34,13,33)
 hasLocation(#20109,#20110)
-#20111=*
-tokeninfo(#20111,0,#20102,3,"")
-#20112=@"loc,{#10000},13,34,13,33"
-locations_default(#20112,#10000,13,34,13,33)
-hasLocation(#20111,#20112)
-toplevels(#20102,2)
-hasLocation(#20102,#20104)
+toplevels(#20100,2)
+hasLocation(#20100,#20102)
 variables(#20022,"this",#20000)
+#20111=*
+stmts(#20111,9,#20100,0,"return false;")
+hasLocation(#20111,#20102)
+stmt_containers(#20111,#20100)
+#20112=*
+exprs(#20112,2,#20111,0,"false")
+hasLocation(#20112,#20106)
+enclosing_stmt(#20112,#20111)
+expr_containers(#20112,#20100)
+literals("false","false",#20112)
 #20113=*
-stmts(#20113,9,#20102,0,"return false;")
-hasLocation(#20113,#20104)
-stmt_containers(#20113,#20102)
-#20114=*
-exprs(#20114,2,#20113,0,"false")
-hasLocation(#20114,#20108)
-enclosing_stmt(#20114,#20113)
-expr_containers(#20114,#20102)
-literals("false","false",#20114)
+entry_cfg_node(#20113,#20100)
+#20114=@"loc,{#10000},13,21,13,20"
+locations_default(#20114,#10000,13,21,13,20)
+hasLocation(#20113,#20114)
 #20115=*
-entry_cfg_node(#20115,#20102)
-#20116=@"loc,{#10000},13,21,13,20"
-locations_default(#20116,#10000,13,21,13,20)
-hasLocation(#20115,#20116)
-#20117=*
-exit_cfg_node(#20117,#20102)
-hasLocation(#20117,#20112)
-successor(#20114,#20113)
-successor(#20113,#20117)
-successor(#20115,#20114)
-toplevel_parent_xml_node(#20102,#20101)
+exit_cfg_node(#20115,#20100)
+hasLocation(#20115,#20110)
+successor(#20112,#20111)
+successor(#20111,#20115)
+successor(#20113,#20112)
+toplevel_parent_xml_node(#20100,#20099)
+#20116=*
+xmlElements(#20116,"html",#10000,0,#10000)
+#20117=@"loc,{#10000},1,1,18,7"
+locations_default(#20117,#10000,1,1,18,7)
+xmllocations(#20116,#20117)
 #20118=*
-xmlElements(#20118,"html",#10000,0,#10000)
-#20119=@"loc,{#10000},1,1,18,7"
-locations_default(#20119,#10000,1,1,18,7)
+xmlElements(#20118,"script",#20116,4,#10000)
+#20119=@"loc,{#10000},17,5,17,29"
+locations_default(#20119,#10000,17,5,17,29)
 xmllocations(#20118,#20119)
 #20120=*
-xmlElements(#20120,"script",#20118,4,#10000)
-#20121=@"loc,{#10000},17,5,17,29"
-locations_default(#20121,#10000,17,5,17,29)
+xmlAttrs(#20120,#20118,"type","",0,#10000)
+#20121=@"loc,{#10000},17,13,17,19"
+locations_default(#20121,#10000,17,13,17,19)
 xmllocations(#20120,#20121)
 #20122=*
-xmlAttrs(#20122,#20120,"type","",0,#10000)
-#20123=@"loc,{#10000},17,13,17,19"
-locations_default(#20123,#10000,17,13,17,19)
+xmlElements(#20122,"script",#20116,3,#10000)
+#20123=@"loc,{#10000},16,5,16,71"
+locations_default(#20123,#10000,16,5,16,71)
 xmllocations(#20122,#20123)
 #20124=*
-xmlElements(#20124,"script",#20118,3,#10000)
-#20125=@"loc,{#10000},16,5,16,71"
-locations_default(#20125,#10000,16,5,16,71)
+xmlAttrs(#20124,#20122,"TYPE","text/x-handlebars-template",0,#10000)
+#20125=@"loc,{#10000},16,13,16,45"
+locations_default(#20125,#10000,16,13,16,45)
 xmllocations(#20124,#20125)
 #20126=*
-xmlAttrs(#20126,#20124,"TYPE","text/x-handlebars-template",0,#10000)
-#20127=@"loc,{#10000},16,13,16,45"
-locations_default(#20127,#10000,16,13,16,45)
-xmllocations(#20126,#20127)
-#20128=*
-template_placeholder_tag_info(#20128,#20124,"{{name}}")
-#20129=@"loc,{#10000},16,54,16,61"
-locations_default(#20129,#10000,16,54,16,61)
-hasLocation(#20128,#20129)
+template_placeholder_tag_info(#20126,#20122,"{{name}}")
+#20127=@"loc,{#10000},16,54,16,61"
+locations_default(#20127,#10000,16,54,16,61)
+hasLocation(#20126,#20127)
 scopes(#20000,0)
-#20130=@"script;{#10000},16,56"
+#20128=@"script;{#10000},16,56"
+#20129=*
+lines(#20129,#20128,"name","")
+#20130=@"loc,{#10000},16,56,16,59"
+locations_default(#20130,#10000,16,56,16,59)
+hasLocation(#20129,#20130)
+numlines(#20128,1,1,0)
 #20131=*
-lines(#20131,#20130,"name","")
-#20132=@"loc,{#10000},16,56,16,59"
-locations_default(#20132,#10000,16,56,16,59)
-hasLocation(#20131,#20132)
-numlines(#20130,1,1,0)
-#20133=*
-tokeninfo(#20133,6,#20130,0,"name")
-hasLocation(#20133,#20132)
-#20134=*
-tokeninfo(#20134,0,#20130,1,"")
-#20135=@"loc,{#10000},16,60,16,59"
-locations_default(#20135,#10000,16,60,16,59)
-hasLocation(#20134,#20135)
-toplevels(#20130,4)
-hasLocation(#20130,#20132)
-#20136=@"module;{#10000},16,56"
-scopes(#20136,3)
-scopenodes(#20130,#20136)
-scopenesting(#20136,#20000)
-is_module(#20130)
-#20137=@"var;{this};{#20136}"
-variables(#20137,"this",#20136)
-#20138=*
-stmts(#20138,2,#20130,0,"name")
-hasLocation(#20138,#20132)
-stmt_containers(#20138,#20130)
+tokeninfo(#20131,6,#20128,0,"name")
+hasLocation(#20131,#20130)
+#20132=*
+tokeninfo(#20132,0,#20128,1,"")
+#20133=@"loc,{#10000},16,60,16,59"
+locations_default(#20133,#10000,16,60,16,59)
+hasLocation(#20132,#20133)
+toplevels(#20128,4)
+hasLocation(#20128,#20130)
+#20134=@"module;{#10000},16,56"
+scopes(#20134,3)
+scopenodes(#20128,#20134)
+scopenesting(#20134,#20000)
+is_module(#20128)
+#20135=@"var;{this};{#20134}"
+variables(#20135,"this",#20134)
+#20136=*
+stmts(#20136,2,#20128,0,"name")
+hasLocation(#20136,#20130)
+stmt_containers(#20136,#20128)
+#20137=*
+exprs(#20137,79,#20136,0,"name")
+hasLocation(#20137,#20130)
+enclosing_stmt(#20137,#20136)
+expr_containers(#20137,#20128)
+literals("name","name",#20137)
+#20138=@"var;{name};{#20134}"
+variables(#20138,"name",#20134)
+bind(#20137,#20138)
 #20139=*
-exprs(#20139,79,#20138,0,"name")
-hasLocation(#20139,#20132)
-enclosing_stmt(#20139,#20138)
-expr_containers(#20139,#20130)
-literals("name","name",#20139)
-#20140=@"var;{name};{#20136}"
-variables(#20140,"name",#20136)
-bind(#20139,#20140)
+entry_cfg_node(#20139,#20128)
+#20140=@"loc,{#10000},16,56,16,55"
+locations_default(#20140,#10000,16,56,16,55)
+hasLocation(#20139,#20140)
 #20141=*
-entry_cfg_node(#20141,#20130)
-#20142=@"loc,{#10000},16,56,16,55"
-locations_default(#20142,#10000,16,56,16,55)
-hasLocation(#20141,#20142)
-#20143=*
-exit_cfg_node(#20143,#20130)
-hasLocation(#20143,#20135)
-successor(#20138,#20139)
-successor(#20139,#20143)
-successor(#20141,#20138)
-toplevel_parent_xml_node(#20130,#20128)
+exit_cfg_node(#20141,#20128)
+hasLocation(#20141,#20133)
+successor(#20136,#20137)
+successor(#20137,#20141)
+successor(#20139,#20136)
+toplevel_parent_xml_node(#20128,#20126)
+#20142=*
+xmlElements(#20142,"script",#20116,2,#10000)
+#20143=@"loc,{#10000},15,5,15,71"
+locations_default(#20143,#10000,15,5,15,71)
+xmllocations(#20142,#20143)
 #20144=*
-xmlElements(#20144,"script",#20118,2,#10000)
-#20145=@"loc,{#10000},15,5,15,71"
-locations_default(#20145,#10000,15,5,15,71)
+xmlAttrs(#20144,#20142,"type","text/x-handlebars-template",0,#10000)
+#20145=@"loc,{#10000},15,13,15,45"
+locations_default(#20145,#10000,15,13,15,45)
 xmllocations(#20144,#20145)
 #20146=*
-xmlAttrs(#20146,#20144,"type","text/x-handlebars-template",0,#10000)
-#20147=@"loc,{#10000},15,13,15,45"
-locations_default(#20147,#10000,15,13,15,45)
-xmllocations(#20146,#20147)
-#20148=*
-template_placeholder_tag_info(#20148,#20144,"{{name}}")
-#20149=@"loc,{#10000},15,54,15,61"
-locations_default(#20149,#10000,15,54,15,61)
-hasLocation(#20148,#20149)
+template_placeholder_tag_info(#20146,#20142,"{{name}}")
+#20147=@"loc,{#10000},15,54,15,61"
+locations_default(#20147,#10000,15,54,15,61)
+hasLocation(#20146,#20147)
 scopes(#20000,0)
-#20150=@"script;{#10000},15,56"
+#20148=@"script;{#10000},15,56"
+#20149=*
+lines(#20149,#20148,"name","")
+#20150=@"loc,{#10000},15,56,15,59"
+locations_default(#20150,#10000,15,56,15,59)
+hasLocation(#20149,#20150)
+numlines(#20148,1,1,0)
 #20151=*
-lines(#20151,#20150,"name","")
-#20152=@"loc,{#10000},15,56,15,59"
-locations_default(#20152,#10000,15,56,15,59)
-hasLocation(#20151,#20152)
-numlines(#20150,1,1,0)
-#20153=*
-tokeninfo(#20153,6,#20150,0,"name")
-hasLocation(#20153,#20152)
-#20154=*
-tokeninfo(#20154,0,#20150,1,"")
-#20155=@"loc,{#10000},15,60,15,59"
-locations_default(#20155,#10000,15,60,15,59)
-hasLocation(#20154,#20155)
-toplevels(#20150,4)
-hasLocation(#20150,#20152)
-#20156=@"module;{#10000},15,56"
-scopes(#20156,3)
-scopenodes(#20150,#20156)
-scopenesting(#20156,#20000)
-is_module(#20150)
-#20157=@"var;{this};{#20156}"
-variables(#20157,"this",#20156)
-#20158=*
-stmts(#20158,2,#20150,0,"name")
-hasLocation(#20158,#20152)
-stmt_containers(#20158,#20150)
+tokeninfo(#20151,6,#20148,0,"name")
+hasLocation(#20151,#20150)
+#20152=*
+tokeninfo(#20152,0,#20148,1,"")
+#20153=@"loc,{#10000},15,60,15,59"
+locations_default(#20153,#10000,15,60,15,59)
+hasLocation(#20152,#20153)
+toplevels(#20148,4)
+hasLocation(#20148,#20150)
+#20154=@"module;{#10000},15,56"
+scopes(#20154,3)
+scopenodes(#20148,#20154)
+scopenesting(#20154,#20000)
+is_module(#20148)
+#20155=@"var;{this};{#20154}"
+variables(#20155,"this",#20154)
+#20156=*
+stmts(#20156,2,#20148,0,"name")
+hasLocation(#20156,#20150)
+stmt_containers(#20156,#20148)
+#20157=*
+exprs(#20157,79,#20156,0,"name")
+hasLocation(#20157,#20150)
+enclosing_stmt(#20157,#20156)
+expr_containers(#20157,#20148)
+literals("name","name",#20157)
+#20158=@"var;{name};{#20154}"
+variables(#20158,"name",#20154)
+bind(#20157,#20158)
 #20159=*
-exprs(#20159,79,#20158,0,"name")
-hasLocation(#20159,#20152)
-enclosing_stmt(#20159,#20158)
-expr_containers(#20159,#20150)
-literals("name","name",#20159)
-#20160=@"var;{name};{#20156}"
-variables(#20160,"name",#20156)
-bind(#20159,#20160)
+entry_cfg_node(#20159,#20148)
+#20160=@"loc,{#10000},15,56,15,55"
+locations_default(#20160,#10000,15,56,15,55)
+hasLocation(#20159,#20160)
 #20161=*
-entry_cfg_node(#20161,#20150)
-#20162=@"loc,{#10000},15,56,15,55"
-locations_default(#20162,#10000,15,56,15,55)
-hasLocation(#20161,#20162)
-#20163=*
-exit_cfg_node(#20163,#20150)
-hasLocation(#20163,#20155)
-successor(#20158,#20159)
-successor(#20159,#20163)
-successor(#20161,#20158)
-toplevel_parent_xml_node(#20150,#20148)
+exit_cfg_node(#20161,#20148)
+hasLocation(#20161,#20153)
+successor(#20156,#20157)
+successor(#20157,#20161)
+successor(#20159,#20156)
+toplevel_parent_xml_node(#20148,#20146)
+#20162=*
+xmlElements(#20162,"body",#20116,1,#10000)
+#20163=@"loc,{#10000},10,5,14,11"
+locations_default(#20163,#10000,10,5,14,11)
+xmllocations(#20162,#20163)
 #20164=*
-xmlElements(#20164,"body",#20118,1,#10000)
-#20165=@"loc,{#10000},10,5,14,11"
-locations_default(#20165,#10000,10,5,14,11)
+xmlElements(#20164,"a",#20162,2,#10000)
+#20165=@"loc,{#10000},13,9,13,59"
+locations_default(#20165,#10000,13,9,13,59)
 xmllocations(#20164,#20165)
-#20166=*
-xmlElements(#20166,"a",#20164,2,#10000)
-#20167=@"loc,{#10000},13,9,13,59"
-locations_default(#20167,#10000,13,9,13,59)
-xmllocations(#20166,#20167)
-xmlAttrs(#20101,#20166,"onclick","return false;",0,#10000)
-#20168=@"loc,{#10000},13,12,13,34"
-locations_default(#20168,#10000,13,12,13,34)
-xmllocations(#20101,#20168)
-#20169=*
-xmlElements(#20169,"div",#20164,1,#10000)
-#20170=@"loc,{#10000},12,9,12,75"
-locations_default(#20170,#10000,12,9,12,75)
-xmllocations(#20169,#20170)
-xmlAttrs(#20078,#20169,"onclick","alert('I said don\'t click!')",0,#10000)
-#20171=@"loc,{#10000},12,14,12,52"
-locations_default(#20171,#10000,12,14,12,52)
-xmllocations(#20078,#20171)
-#20172=*
-xmlElements(#20172,"a",#20164,0,#10000)
-#20173=@"loc,{#10000},11,9,11,64"
-locations_default(#20173,#10000,11,9,11,64)
-xmllocations(#20172,#20173)
-xmlAttrs(#20045,#20172,"href","javascript:void(alert('Nope!'))",0,#10000)
-#20174=@"loc,{#10000},11,12,11,49"
-locations_default(#20174,#10000,11,12,11,49)
-xmllocations(#20045,#20174)
-#20175=*
-xmlElements(#20175,"head",#20118,0,#10000)
-#20176=@"loc,{#10000},2,5,9,11"
-locations_default(#20176,#10000,2,5,9,11)
-xmllocations(#20175,#20176)
-xmlElements(#20034,"script",#20175,3,#10000)
-#20177=@"loc,{#10000},8,9,8,26"
-locations_default(#20177,#10000,8,9,8,26)
-xmllocations(#20034,#20177)
-xmlElements(#20001,"script",#20175,2,#10000)
-#20178=@"loc,{#10000},5,9,7,17"
-locations_default(#20178,#10000,5,9,7,17)
-xmllocations(#20001,#20178)
+xmlAttrs(#20099,#20164,"onclick","return false;",0,#10000)
+#20166=@"loc,{#10000},13,12,13,34"
+locations_default(#20166,#10000,13,12,13,34)
+xmllocations(#20099,#20166)
+#20167=*
+xmlElements(#20167,"div",#20162,1,#10000)
+#20168=@"loc,{#10000},12,9,12,75"
+locations_default(#20168,#10000,12,9,12,75)
+xmllocations(#20167,#20168)
+xmlAttrs(#20076,#20167,"onclick","alert('I said don\'t click!')",0,#10000)
+#20169=@"loc,{#10000},12,14,12,52"
+locations_default(#20169,#10000,12,14,12,52)
+xmllocations(#20076,#20169)
+#20170=*
+xmlElements(#20170,"a",#20162,0,#10000)
+#20171=@"loc,{#10000},11,9,11,64"
+locations_default(#20171,#10000,11,9,11,64)
+xmllocations(#20170,#20171)
+xmlAttrs(#20045,#20170,"href","javascript:void(alert('Nope!'))",0,#10000)
+#20172=@"loc,{#10000},11,12,11,49"
+locations_default(#20172,#10000,11,12,11,49)
+xmllocations(#20045,#20172)
+#20173=*
+xmlElements(#20173,"head",#20116,0,#10000)
+#20174=@"loc,{#10000},2,5,9,11"
+locations_default(#20174,#10000,2,5,9,11)
+xmllocations(#20173,#20174)
+xmlElements(#20034,"script",#20173,3,#10000)
+#20175=@"loc,{#10000},8,9,8,26"
+locations_default(#20175,#10000,8,9,8,26)
+xmllocations(#20034,#20175)
+xmlElements(#20001,"script",#20173,2,#10000)
+#20176=@"loc,{#10000},5,9,7,17"
+locations_default(#20176,#10000,5,9,7,17)
+xmllocations(#20001,#20176)
+#20177=*
+xmlElements(#20177,"script",#20173,1,#10000)
+#20178=@"loc,{#10000},4,9,4,43"
+locations_default(#20178,#10000,4,9,4,43)
+xmllocations(#20177,#20178)
 #20179=*
-xmlElements(#20179,"script",#20175,1,#10000)
-#20180=@"loc,{#10000},4,9,4,43"
-locations_default(#20180,#10000,4,9,4,43)
+xmlAttrs(#20179,#20177,"src","external.js",0,#10000)
+#20180=@"loc,{#10000},4,17,4,33"
+locations_default(#20180,#10000,4,17,4,33)
 xmllocations(#20179,#20180)
 #20181=*
-xmlAttrs(#20181,#20179,"src","external.js",0,#10000)
-#20182=@"loc,{#10000},4,17,4,33"
-locations_default(#20182,#10000,4,17,4,33)
+xmlElements(#20181,"title",#20173,0,#10000)
+#20182=@"loc,{#10000},3,9,3,32"
+locations_default(#20182,#10000,3,9,3,32)
 xmllocations(#20181,#20182)
-#20183=*
-xmlElements(#20183,"title",#20175,0,#10000)
-#20184=@"loc,{#10000},3,9,3,32"
-locations_default(#20184,#10000,3,9,3,32)
-xmllocations(#20183,#20184)
 numlines(#10000,18,7,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap b/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
index a6a3e63def78..0a6f5ff66c8e 100644
--- a/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
+++ b/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
@@ -288,102 +288,95 @@ enclosing_stmt(#20098,#20094)
 expr_containers(#20098,#20076)
 literals("true","true",#20098)
 #20099=*
-exprs(#20099,63,#20096,1,"(null, null)")
-#20100=@"loc,{#10000},3,19,3,30"
-locations_default(#20100,#10000,3,19,3,30)
+exprs(#20099,10,#20096,1,"null, null")
+#20100=@"loc,{#10000},3,20,3,29"
+locations_default(#20100,#10000,3,20,3,29)
 hasLocation(#20099,#20100)
 enclosing_stmt(#20099,#20094)
 expr_containers(#20099,#20076)
 #20101=*
-exprs(#20101,10,#20099,0,"null, null")
-#20102=@"loc,{#10000},3,20,3,29"
-locations_default(#20102,#10000,3,20,3,29)
-hasLocation(#20101,#20102)
+exprs(#20101,1,#20099,0,"null")
+hasLocation(#20101,#20051)
 enclosing_stmt(#20101,#20094)
 expr_containers(#20101,#20076)
+literals("null","null",#20101)
+#20102=*
+exprs(#20102,1,#20099,1,"null")
+hasLocation(#20102,#20055)
+enclosing_stmt(#20102,#20094)
+expr_containers(#20102,#20076)
+literals("null","null",#20102)
+has_parentheses(#20099,1)
 #20103=*
-exprs(#20103,1,#20101,0,"null")
-hasLocation(#20103,#20051)
+exprs(#20103,65,#20096,2,"e => { }")
+#20104=@"loc,{#10000},3,34,3,41"
+locations_default(#20104,#10000,3,34,3,41)
+hasLocation(#20103,#20104)
 enclosing_stmt(#20103,#20094)
 expr_containers(#20103,#20076)
-literals("null","null",#20103)
-#20104=*
-exprs(#20104,1,#20101,1,"null")
-hasLocation(#20104,#20055)
-enclosing_stmt(#20104,#20094)
-expr_containers(#20104,#20076)
-literals("null","null",#20104)
 #20105=*
-exprs(#20105,65,#20096,2,"e => { }")
-#20106=@"loc,{#10000},3,34,3,41"
-locations_default(#20106,#10000,3,34,3,41)
-hasLocation(#20105,#20106)
-enclosing_stmt(#20105,#20094)
-expr_containers(#20105,#20076)
+scopes(#20105,1)
+scopenodes(#20103,#20105)
+scopenesting(#20105,#20084)
+#20106=@"var;{e};{#20105}"
+variables(#20106,"e",#20105)
 #20107=*
-scopes(#20107,1)
-scopenodes(#20105,#20107)
-scopenesting(#20107,#20084)
-#20108=@"var;{e};{#20107}"
-variables(#20108,"e",#20107)
-#20109=*
-exprs(#20109,78,#20105,0,"e")
-hasLocation(#20109,#20061)
-expr_containers(#20109,#20105)
-literals("e","e",#20109)
-decl(#20109,#20108)
+exprs(#20107,78,#20103,0,"e")
+hasLocation(#20107,#20061)
+expr_containers(#20107,#20103)
+literals("e","e",#20107)
+decl(#20107,#20106)
+#20108=*
+stmts(#20108,1,#20103,-2,"{ }")
+#20109=@"loc,{#10000},3,39,3,41"
+locations_default(#20109,#10000,3,39,3,41)
+hasLocation(#20108,#20109)
+stmt_containers(#20108,#20103)
 #20110=*
-stmts(#20110,1,#20105,-2,"{ }")
-#20111=@"loc,{#10000},3,39,3,41"
-locations_default(#20111,#10000,3,39,3,41)
+entry_cfg_node(#20110,#20001)
+#20111=@"loc,{#10000},1,1,1,0"
+locations_default(#20111,#10000,1,1,1,0)
 hasLocation(#20110,#20111)
-stmt_containers(#20110,#20105)
 #20112=*
-entry_cfg_node(#20112,#20001)
-#20113=@"loc,{#10000},1,1,1,0"
-locations_default(#20113,#10000,1,1,1,0)
-hasLocation(#20112,#20113)
+exit_cfg_node(#20112,#20001)
+hasLocation(#20112,#20072)
+successor(#20076,#20112)
+#20113=*
+entry_cfg_node(#20113,#20076)
+hasLocation(#20113,#20111)
 #20114=*
-exit_cfg_node(#20114,#20001)
-hasLocation(#20114,#20072)
-successor(#20076,#20114)
-#20115=*
-entry_cfg_node(#20115,#20076)
-hasLocation(#20115,#20113)
-#20116=*
-exit_cfg_node(#20116,#20076)
-#20117=@"loc,{#10000},4,2,4,1"
-locations_default(#20117,#10000,4,2,4,1)
-hasLocation(#20116,#20117)
+exit_cfg_node(#20114,#20076)
+#20115=@"loc,{#10000},4,2,4,1"
+locations_default(#20115,#10000,4,2,4,1)
+hasLocation(#20114,#20115)
 successor(#20096,#20098)
 successor(#20098,#20099)
 successor(#20099,#20101)
-successor(#20101,#20103)
-successor(#20104,#20094)
-successor(#20103,#20104)
-successor(#20105,#20094)
+successor(#20102,#20094)
+successor(#20101,#20102)
+successor(#20103,#20094)
+#20116=*
+entry_cfg_node(#20116,#20103)
+#20117=@"loc,{#10000},3,34,3,33"
+locations_default(#20117,#10000,3,34,3,33)
+hasLocation(#20116,#20117)
 #20118=*
-entry_cfg_node(#20118,#20105)
-#20119=@"loc,{#10000},3,34,3,33"
-locations_default(#20119,#10000,3,34,3,33)
+exit_cfg_node(#20118,#20103)
+#20119=@"loc,{#10000},3,42,3,41"
+locations_default(#20119,#10000,3,42,3,41)
 hasLocation(#20118,#20119)
-#20120=*
-exit_cfg_node(#20120,#20105)
-#20121=@"loc,{#10000},3,42,3,41"
-locations_default(#20121,#10000,3,42,3,41)
-hasLocation(#20120,#20121)
-successor(#20110,#20120)
-successor(#20109,#20110)
-successor(#20118,#20109)
-successor(#20094,#20116)
+successor(#20108,#20118)
+successor(#20107,#20108)
+successor(#20116,#20107)
+successor(#20094,#20114)
 successor(#20086,#20090)
 successor(#20093,#20091)
 successor(#20091,#20088)
 successor(#20090,#20093)
 successor(#20088,#20096)
 successor(#20082,#20086)
-successor(#20115,#20082)
+successor(#20113,#20082)
 successor(#20078,#20076)
-successor(#20112,#20078)
+successor(#20110,#20078)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
index 4be04a1455e9..1de1ec81c088 100644
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@@ -234,224 +234,212 @@ decl(#20081,#20080)
 variables(#20082,"arguments",#20078)
 is_arguments_object(#20082)
 #20083=*
-exprs(#20083,63,#20076,-2,"(""result"")")
-#20084=@"loc,{#10000},1,14,1,23"
-locations_default(#20084,#10000,1,14,1,23)
-hasLocation(#20083,#20084)
+exprs(#20083,4,#20076,-2,"""result""")
+hasLocation(#20083,#20029)
 expr_containers(#20083,#20076)
-#20085=*
-exprs(#20085,4,#20083,0,"""result""")
-hasLocation(#20085,#20029)
-expr_containers(#20085,#20076)
-literals("result","""result""",#20085)
+literals("result","""result""",#20083)
+#20084=*
+regexpterm(#20084,14,#20083,0,"result")
+#20085=@"loc,{#10000},1,16,1,21"
+locations_default(#20085,#10000,1,16,1,21)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"result")
+has_parentheses(#20083,1)
 #20086=*
-regexpterm(#20086,14,#20085,0,"result")
-#20087=@"loc,{#10000},1,16,1,21"
-locations_default(#20087,#10000,1,16,1,21)
+stmts(#20086,2,#20001,1,"functio ... )\n  }\n}")
+#20087=@"loc,{#10000},3,1,7,1"
+locations_default(#20087,#10000,3,1,7,1)
 hasLocation(#20086,#20087)
-regexp_const_value(#20086,"result")
+stmt_containers(#20086,#20001)
 #20088=*
-stmts(#20088,2,#20001,1,"functio ... )\n  }\n}")
-#20089=@"loc,{#10000},3,1,7,1"
-locations_default(#20089,#10000,3,1,7,1)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20001)
-#20090=*
-exprs(#20090,9,#20088,0,"functio ... )\n  }\n}")
-hasLocation(#20090,#20089)
-enclosing_stmt(#20090,#20088)
-expr_containers(#20090,#20001)
-#20091=*
-scopes(#20091,1)
-scopenodes(#20090,#20091)
-scopenesting(#20091,#20000)
-#20092=@"var;{g};{#20091}"
-variables(#20092,"g",#20091)
-#20093=@"var;{this};{#20091}"
-variables(#20093,"this",#20091)
-#20094=@"var;{b};{#20091}"
-variables(#20094,"b",#20091)
+exprs(#20088,9,#20086,0,"functio ... )\n  }\n}")
+hasLocation(#20088,#20087)
+enclosing_stmt(#20088,#20086)
+expr_containers(#20088,#20001)
+#20089=*
+scopes(#20089,1)
+scopenodes(#20088,#20089)
+scopenesting(#20089,#20000)
+#20090=@"var;{g};{#20089}"
+variables(#20090,"g",#20089)
+#20091=@"var;{this};{#20089}"
+variables(#20091,"this",#20089)
+#20092=@"var;{b};{#20089}"
+variables(#20092,"b",#20089)
+#20093=*
+exprs(#20093,78,#20088,0,"b")
+hasLocation(#20093,#20037)
+expr_containers(#20093,#20088)
+literals("b","b",#20093)
+decl(#20093,#20092)
+#20094=@"var;{arguments};{#20089}"
+variables(#20094,"arguments",#20089)
+is_arguments_object(#20094)
 #20095=*
-exprs(#20095,78,#20090,0,"b")
-hasLocation(#20095,#20037)
-expr_containers(#20095,#20090)
-literals("b","b",#20095)
-decl(#20095,#20094)
-#20096=@"var;{arguments};{#20091}"
-variables(#20096,"arguments",#20091)
-is_arguments_object(#20096)
+stmts(#20095,1,#20088,-2,"{\n  if  ... )\n  }\n}")
+#20096=@"loc,{#10000},3,13,7,1"
+locations_default(#20096,#10000,3,13,7,1)
+hasLocation(#20095,#20096)
+stmt_containers(#20095,#20088)
 #20097=*
-stmts(#20097,1,#20090,-2,"{\n  if  ... )\n  }\n}")
-#20098=@"loc,{#10000},3,13,7,1"
-locations_default(#20098,#10000,3,13,7,1)
+stmts(#20097,3,#20095,0,"if (b)  ... t"")\n  }")
+#20098=@"loc,{#10000},4,3,6,3"
+locations_default(#20098,#10000,4,3,6,3)
 hasLocation(#20097,#20098)
-stmt_containers(#20097,#20090)
+stmt_containers(#20097,#20088)
 #20099=*
-stmts(#20099,3,#20097,0,"if (b)  ... t"")\n  }")
-#20100=@"loc,{#10000},4,3,6,3"
-locations_default(#20100,#10000,4,3,6,3)
-hasLocation(#20099,#20100)
-stmt_containers(#20099,#20090)
-#20101=*
-exprs(#20101,79,#20099,0,"b")
-hasLocation(#20101,#20047)
-enclosing_stmt(#20101,#20099)
-expr_containers(#20101,#20090)
-literals("b","b",#20101)
-bind(#20101,#20094)
+exprs(#20099,79,#20097,0,"b")
+hasLocation(#20099,#20047)
+enclosing_stmt(#20099,#20097)
+expr_containers(#20099,#20088)
+literals("b","b",#20099)
+bind(#20099,#20092)
+#20100=*
+stmts(#20100,1,#20097,1,"{\n    f ... t"")\n  }")
+#20101=@"loc,{#10000},4,10,6,3"
+locations_default(#20101,#10000,4,10,6,3)
+hasLocation(#20100,#20101)
+stmt_containers(#20100,#20088)
 #20102=*
-stmts(#20102,1,#20099,1,"{\n    f ... t"")\n  }")
-#20103=@"loc,{#10000},4,10,6,3"
-locations_default(#20103,#10000,4,10,6,3)
+stmts(#20102,17,#20100,0,"functio ... esult"")")
+#20103=@"loc,{#10000},5,5,5,33"
+locations_default(#20103,#10000,5,5,5,33)
 hasLocation(#20102,#20103)
-stmt_containers(#20102,#20090)
+stmt_containers(#20102,#20088)
 #20104=*
-stmts(#20104,17,#20102,0,"functio ... esult"")")
-#20105=@"loc,{#10000},5,5,5,33"
-locations_default(#20105,#10000,5,5,5,33)
-hasLocation(#20104,#20105)
-stmt_containers(#20104,#20090)
-#20106=*
-exprs(#20106,78,#20104,-1,"g")
-hasLocation(#20106,#20055)
-expr_containers(#20106,#20104)
-literals("g","g",#20106)
-decl(#20106,#20092)
-#20107=*
-scopes(#20107,1)
-scopenodes(#20104,#20107)
-scopenesting(#20107,#20091)
-#20108=@"var;{this};{#20107}"
-variables(#20108,"this",#20107)
-#20109=@"var;{y};{#20107}"
-variables(#20109,"y",#20107)
+exprs(#20104,78,#20102,-1,"g")
+hasLocation(#20104,#20055)
+expr_containers(#20104,#20102)
+literals("g","g",#20104)
+decl(#20104,#20090)
+#20105=*
+scopes(#20105,1)
+scopenodes(#20102,#20105)
+scopenesting(#20105,#20089)
+#20106=@"var;{this};{#20105}"
+variables(#20106,"this",#20105)
+#20107=@"var;{y};{#20105}"
+variables(#20107,"y",#20105)
+#20108=*
+exprs(#20108,78,#20102,0,"y")
+hasLocation(#20108,#20059)
+expr_containers(#20108,#20102)
+literals("y","y",#20108)
+decl(#20108,#20107)
+#20109=@"var;{arguments};{#20105}"
+variables(#20109,"arguments",#20105)
+is_arguments_object(#20109)
 #20110=*
-exprs(#20110,78,#20104,0,"y")
-hasLocation(#20110,#20059)
-expr_containers(#20110,#20104)
-literals("y","y",#20110)
-decl(#20110,#20109)
-#20111=@"var;{arguments};{#20107}"
-variables(#20111,"arguments",#20107)
-is_arguments_object(#20111)
-#20112=*
-exprs(#20112,63,#20104,-2,"(""other result"")")
-#20113=@"loc,{#10000},5,18,5,33"
-locations_default(#20113,#10000,5,18,5,33)
-hasLocation(#20112,#20113)
-expr_containers(#20112,#20104)
-#20114=*
-exprs(#20114,4,#20112,0,"""other result""")
-hasLocation(#20114,#20065)
-expr_containers(#20114,#20104)
-literals("other result","""other result""",#20114)
+exprs(#20110,4,#20102,-2,"""other result""")
+hasLocation(#20110,#20065)
+expr_containers(#20110,#20102)
+literals("other result","""other result""",#20110)
+#20111=*
+regexpterm(#20111,14,#20110,0,"other result")
+#20112=@"loc,{#10000},5,20,5,31"
+locations_default(#20112,#10000,5,20,5,31)
+hasLocation(#20111,#20112)
+regexp_const_value(#20111,"other result")
+has_parentheses(#20110,1)
+#20113=*
+entry_cfg_node(#20113,#20001)
+#20114=@"loc,{#10000},1,1,1,0"
+locations_default(#20114,#10000,1,1,1,0)
+hasLocation(#20113,#20114)
 #20115=*
-regexpterm(#20115,14,#20114,0,"other result")
-#20116=@"loc,{#10000},5,20,5,31"
-locations_default(#20116,#10000,5,20,5,31)
-hasLocation(#20115,#20116)
-regexp_const_value(#20115,"other result")
-#20117=*
-entry_cfg_node(#20117,#20001)
-#20118=@"loc,{#10000},1,1,1,0"
-locations_default(#20118,#10000,1,1,1,0)
-hasLocation(#20117,#20118)
-#20119=*
-exit_cfg_node(#20119,#20001)
-hasLocation(#20119,#20072)
-successor(#20088,#20090)
-successor(#20090,#20119)
+exit_cfg_node(#20115,#20001)
+hasLocation(#20115,#20072)
+successor(#20086,#20088)
+successor(#20088,#20115)
+#20116=*
+entry_cfg_node(#20116,#20088)
+#20117=@"loc,{#10000},3,1,3,0"
+locations_default(#20117,#10000,3,1,3,0)
+hasLocation(#20116,#20117)
+#20118=*
+exit_cfg_node(#20118,#20088)
+#20119=@"loc,{#10000},7,2,7,1"
+locations_default(#20119,#10000,7,2,7,1)
+hasLocation(#20118,#20119)
+successor(#20097,#20099)
 #20120=*
-entry_cfg_node(#20120,#20090)
-#20121=@"loc,{#10000},3,1,3,0"
-locations_default(#20121,#10000,3,1,3,0)
-hasLocation(#20120,#20121)
+guard_node(#20120,1,#20099)
+hasLocation(#20120,#20047)
+successor(#20120,#20100)
+#20121=*
+guard_node(#20121,0,#20099)
+hasLocation(#20121,#20047)
+successor(#20121,#20118)
+successor(#20099,#20120)
+successor(#20099,#20121)
+successor(#20102,#20118)
 #20122=*
-exit_cfg_node(#20122,#20090)
-#20123=@"loc,{#10000},7,2,7,1"
-locations_default(#20123,#10000,7,2,7,1)
+entry_cfg_node(#20122,#20102)
+#20123=@"loc,{#10000},5,5,5,4"
+locations_default(#20123,#10000,5,5,5,4)
 hasLocation(#20122,#20123)
-successor(#20099,#20101)
 #20124=*
-guard_node(#20124,1,#20101)
-hasLocation(#20124,#20047)
-successor(#20124,#20102)
-#20125=*
-guard_node(#20125,0,#20101)
-hasLocation(#20125,#20047)
-successor(#20125,#20122)
-successor(#20101,#20124)
-successor(#20101,#20125)
-successor(#20104,#20122)
-#20126=*
-entry_cfg_node(#20126,#20104)
-#20127=@"loc,{#10000},5,5,5,4"
-locations_default(#20127,#10000,5,5,5,4)
-hasLocation(#20126,#20127)
-#20128=*
-exit_cfg_node(#20128,#20104)
-#20129=@"loc,{#10000},5,34,5,33"
-locations_default(#20129,#10000,5,34,5,33)
-hasLocation(#20128,#20129)
-successor(#20112,#20114)
-successor(#20114,#20128)
-successor(#20110,#20112)
-successor(#20126,#20110)
-successor(#20106,#20104)
-successor(#20102,#20106)
-successor(#20097,#20099)
+exit_cfg_node(#20124,#20102)
+#20125=@"loc,{#10000},5,34,5,33"
+locations_default(#20125,#10000,5,34,5,33)
+hasLocation(#20124,#20125)
+successor(#20110,#20124)
+successor(#20108,#20110)
+successor(#20122,#20108)
+successor(#20104,#20102)
+successor(#20100,#20104)
 successor(#20095,#20097)
-successor(#20120,#20095)
-successor(#20076,#20088)
-#20130=*
-entry_cfg_node(#20130,#20076)
-hasLocation(#20130,#20118)
-#20131=*
-exit_cfg_node(#20131,#20076)
-#20132=@"loc,{#10000},1,24,1,23"
-locations_default(#20132,#10000,1,24,1,23)
-hasLocation(#20131,#20132)
-successor(#20083,#20085)
-successor(#20085,#20131)
+successor(#20093,#20095)
+successor(#20116,#20093)
+successor(#20076,#20086)
+#20126=*
+entry_cfg_node(#20126,#20076)
+hasLocation(#20126,#20114)
+#20127=*
+exit_cfg_node(#20127,#20076)
+#20128=@"loc,{#10000},1,24,1,23"
+locations_default(#20128,#10000,1,24,1,23)
+hasLocation(#20127,#20128)
+successor(#20083,#20127)
 successor(#20081,#20083)
-successor(#20130,#20081)
+successor(#20126,#20081)
 successor(#20077,#20076)
-successor(#20117,#20077)
-#20133=*
-js_parse_errors(#20133,#20001,"Error: Missing function name","function(b) {
+successor(#20113,#20077)
+#20129=*
+js_parse_errors(#20129,#20001,"Error: Missing function name","function(b) {
 ")
-hasLocation(#20133,#20035)
-#20134=*
-lines(#20134,#20001,"function f(x)(""result"")","
+hasLocation(#20129,#20035)
+#20130=*
+lines(#20130,#20001,"function f(x)(""result"")","
 ")
-hasLocation(#20134,#20003)
-#20135=*
-lines(#20135,#20001,"","
+hasLocation(#20130,#20003)
+#20131=*
+lines(#20131,#20001,"","
 ")
-hasLocation(#20135,#20005)
-#20136=*
-lines(#20136,#20001,"function(b) {","
+hasLocation(#20131,#20005)
+#20132=*
+lines(#20132,#20001,"function(b) {","
 ")
-hasLocation(#20136,#20007)
-#20137=*
-lines(#20137,#20001,"  if (b) {","
+hasLocation(#20132,#20007)
+#20133=*
+lines(#20133,#20001,"  if (b) {","
 ")
-hasLocation(#20137,#20009)
+hasLocation(#20133,#20009)
 indentation(#10000,4," ",2)
-#20138=*
-lines(#20138,#20001,"    function g(y)(""other result"")","
+#20134=*
+lines(#20134,#20001,"    function g(y)(""other result"")","
 ")
-hasLocation(#20138,#20011)
+hasLocation(#20134,#20011)
 indentation(#10000,5," ",4)
-#20139=*
-lines(#20139,#20001,"  }","
+#20135=*
+lines(#20135,#20001,"  }","
 ")
-hasLocation(#20139,#20013)
+hasLocation(#20135,#20013)
 indentation(#10000,6," ",2)
-#20140=*
-lines(#20140,#20001,"}","
+#20136=*
+lines(#20136,#20001,"}","
 ")
-hasLocation(#20140,#20015)
+hasLocation(#20136,#20015)
 numlines(#20001,7,0,0)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
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 195fa8ff0c09..7b2148614fdc 100644
--- a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
@@ -255,158 +255,151 @@ hasLocation(#20085,#20086)
 enclosing_stmt(#20085,#20076)
 expr_containers(#20085,#20001)
 #20087=*
-exprs(#20087,63,#20085,0,"(r = /[ ... c(""x""))")
-#20088=@"loc,{#10000},5,3,5,25"
-locations_default(#20088,#10000,5,3,5,25)
+exprs(#20087,47,#20085,0,"r = /[\ ... ec(""x"")")
+#20088=@"loc,{#10000},5,4,5,24"
+locations_default(#20088,#10000,5,4,5,24)
 hasLocation(#20087,#20088)
 enclosing_stmt(#20087,#20076)
 expr_containers(#20087,#20001)
 #20089=*
-exprs(#20089,47,#20087,0,"r = /[\ ... ec(""x"")")
-#20090=@"loc,{#10000},5,4,5,24"
-locations_default(#20090,#10000,5,4,5,24)
-hasLocation(#20089,#20090)
+exprs(#20089,79,#20087,0,"r")
+hasLocation(#20089,#20033)
 enclosing_stmt(#20089,#20076)
 expr_containers(#20089,#20001)
-#20091=*
-exprs(#20091,79,#20089,0,"r")
-hasLocation(#20091,#20033)
-enclosing_stmt(#20091,#20076)
-expr_containers(#20091,#20001)
-literals("r","r",#20091)
-bind(#20091,#20071)
+literals("r","r",#20089)
+bind(#20089,#20071)
+#20090=*
+exprs(#20090,13,#20087,1,"/[\x]+/.exec(""x"")")
+#20091=@"loc,{#10000},5,8,5,24"
+locations_default(#20091,#10000,5,8,5,24)
+hasLocation(#20090,#20091)
+enclosing_stmt(#20090,#20076)
+expr_containers(#20090,#20001)
 #20092=*
-exprs(#20092,13,#20089,1,"/[\x]+/.exec(""x"")")
-#20093=@"loc,{#10000},5,8,5,24"
-locations_default(#20093,#10000,5,8,5,24)
+exprs(#20092,14,#20090,-1,"/[\x]+/.exec")
+#20093=@"loc,{#10000},5,8,5,19"
+locations_default(#20093,#10000,5,8,5,19)
 hasLocation(#20092,#20093)
 enclosing_stmt(#20092,#20076)
 expr_containers(#20092,#20001)
 #20094=*
-exprs(#20094,14,#20092,-1,"/[\x]+/.exec")
-#20095=@"loc,{#10000},5,8,5,19"
-locations_default(#20095,#10000,5,8,5,19)
-hasLocation(#20094,#20095)
+exprs(#20094,5,#20092,0,"/[\x]+/")
+hasLocation(#20094,#20037)
 enclosing_stmt(#20094,#20076)
 expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,5,#20094,0,"/[\x]+/")
-hasLocation(#20096,#20037)
-enclosing_stmt(#20096,#20076)
-expr_containers(#20096,#20001)
-literals("/[\x]+/","/[\x]+/",#20096)
+literals("/[\x]+/","/[\x]+/",#20094)
+#20095=*
+regexpterm(#20095,9,#20094,0,"[\x]+")
+#20096=@"loc,{#10000},5,9,5,13"
+locations_default(#20096,#10000,5,9,5,13)
+hasLocation(#20095,#20096)
+is_greedy(#20095)
 #20097=*
-regexpterm(#20097,9,#20096,0,"[\x]+")
-#20098=@"loc,{#10000},5,9,5,13"
-locations_default(#20098,#10000,5,9,5,13)
+regexpterm(#20097,23,#20095,0,"[\x]")
+#20098=@"loc,{#10000},5,9,5,12"
+locations_default(#20098,#10000,5,9,5,12)
 hasLocation(#20097,#20098)
-is_greedy(#20097)
 #20099=*
-regexpterm(#20099,23,#20097,0,"[\x]")
-#20100=@"loc,{#10000},5,9,5,12"
-locations_default(#20100,#10000,5,9,5,12)
+regexpterm(#20099,15,#20097,0,"\x")
+#20100=@"loc,{#10000},5,10,5,11"
+locations_default(#20100,#10000,5,10,5,11)
 hasLocation(#20099,#20100)
+regexp_const_value(#20099,"")
 #20101=*
-regexpterm(#20101,15,#20099,0,"\x")
-#20102=@"loc,{#10000},5,10,5,11"
-locations_default(#20102,#10000,5,10,5,11)
+regexp_parse_errors(#20101,#20095,"expected hexadecimal digit")
+#20102=@"loc,{#10000},5,12,5,12"
+locations_default(#20102,#10000,5,12,5,12)
 hasLocation(#20101,#20102)
-regexp_const_value(#20101,"")
 #20103=*
-regexp_parse_errors(#20103,#20097,"expected hexadecimal digit")
-#20104=@"loc,{#10000},5,12,5,12"
-locations_default(#20104,#10000,5,12,5,12)
-hasLocation(#20103,#20104)
+regexp_parse_errors(#20103,#20095,"expected hexadecimal digit")
+hasLocation(#20103,#20102)
+#20104=*
+exprs(#20104,0,#20092,1,"exec")
+hasLocation(#20104,#20041)
+enclosing_stmt(#20104,#20076)
+expr_containers(#20104,#20001)
+literals("exec","exec",#20104)
 #20105=*
-regexp_parse_errors(#20105,#20097,"expected hexadecimal digit")
-hasLocation(#20105,#20104)
+exprs(#20105,4,#20090,0,"""x""")
+hasLocation(#20105,#20045)
+enclosing_stmt(#20105,#20076)
+expr_containers(#20105,#20001)
+literals("x","""x""",#20105)
 #20106=*
-exprs(#20106,0,#20094,1,"exec")
-hasLocation(#20106,#20041)
-enclosing_stmt(#20106,#20076)
-expr_containers(#20106,#20001)
-literals("exec","exec",#20106)
-#20107=*
-exprs(#20107,4,#20092,0,"""x""")
-hasLocation(#20107,#20045)
-enclosing_stmt(#20107,#20076)
-expr_containers(#20107,#20001)
-literals("x","""x""",#20107)
+regexpterm(#20106,14,#20105,0,"x")
+#20107=@"loc,{#10000},5,22,5,22"
+locations_default(#20107,#10000,5,22,5,22)
+hasLocation(#20106,#20107)
+regexp_const_value(#20106,"x")
+has_parentheses(#20087,1)
 #20108=*
-regexpterm(#20108,14,#20107,0,"x")
-#20109=@"loc,{#10000},5,22,5,22"
-locations_default(#20109,#10000,5,22,5,22)
+exprs(#20108,15,#20085,1,"r[0]")
+#20109=@"loc,{#10000},5,30,5,33"
+locations_default(#20109,#10000,5,30,5,33)
 hasLocation(#20108,#20109)
-regexp_const_value(#20108,"x")
+enclosing_stmt(#20108,#20076)
+expr_containers(#20108,#20001)
 #20110=*
-exprs(#20110,15,#20085,1,"r[0]")
-#20111=@"loc,{#10000},5,30,5,33"
-locations_default(#20111,#10000,5,30,5,33)
-hasLocation(#20110,#20111)
+exprs(#20110,79,#20108,0,"r")
+hasLocation(#20110,#20053)
 enclosing_stmt(#20110,#20076)
 expr_containers(#20110,#20001)
+literals("r","r",#20110)
+bind(#20110,#20071)
+#20111=*
+exprs(#20111,3,#20108,1,"0")
+hasLocation(#20111,#20057)
+enclosing_stmt(#20111,#20076)
+expr_containers(#20111,#20001)
+literals("0","0",#20111)
 #20112=*
-exprs(#20112,79,#20110,0,"r")
-hasLocation(#20112,#20053)
+exprs(#20112,4,#20078,2,"""Section 1""")
+hasLocation(#20112,#20063)
 enclosing_stmt(#20112,#20076)
 expr_containers(#20112,#20001)
-literals("r","r",#20112)
-bind(#20112,#20071)
+literals("Section 1","""Section 1""",#20112)
 #20113=*
-exprs(#20113,3,#20110,1,"0")
-hasLocation(#20113,#20057)
-enclosing_stmt(#20113,#20076)
-expr_containers(#20113,#20001)
-literals("0","0",#20113)
-#20114=*
-exprs(#20114,4,#20078,2,"""Section 1""")
-hasLocation(#20114,#20063)
-enclosing_stmt(#20114,#20076)
-expr_containers(#20114,#20001)
-literals("Section 1","""Section 1""",#20114)
+regexpterm(#20113,14,#20112,0,"Section 1")
+#20114=@"loc,{#10000},6,4,6,12"
+locations_default(#20114,#10000,6,4,6,12)
+hasLocation(#20113,#20114)
+regexp_const_value(#20113,"Section 1")
 #20115=*
-regexpterm(#20115,14,#20114,0,"Section 1")
-#20116=@"loc,{#10000},6,4,6,12"
-locations_default(#20116,#10000,6,4,6,12)
+entry_cfg_node(#20115,#20001)
+#20116=@"loc,{#10000},1,1,1,0"
+locations_default(#20116,#10000,1,1,1,0)
 hasLocation(#20115,#20116)
-regexp_const_value(#20115,"Section 1")
 #20117=*
-entry_cfg_node(#20117,#20001)
-#20118=@"loc,{#10000},1,1,1,0"
-locations_default(#20118,#10000,1,1,1,0)
-hasLocation(#20117,#20118)
-#20119=*
-exit_cfg_node(#20119,#20001)
-hasLocation(#20119,#20069)
+exit_cfg_node(#20117,#20001)
+hasLocation(#20117,#20069)
 successor(#20076,#20080)
-successor(#20114,#20078)
-successor(#20085,#20087)
-successor(#20087,#20091)
-successor(#20107,#20092)
-successor(#20106,#20094)
-successor(#20096,#20106)
-successor(#20094,#20107)
-successor(#20092,#20089)
-successor(#20091,#20096)
-#20120=*
-guard_node(#20120,1,#20089)
-hasLocation(#20120,#20090)
-successor(#20120,#20112)
-#20121=*
-guard_node(#20121,0,#20089)
-hasLocation(#20121,#20090)
-successor(#20121,#20114)
-successor(#20089,#20120)
-successor(#20089,#20121)
-successor(#20113,#20110)
-successor(#20112,#20113)
-successor(#20110,#20114)
+successor(#20112,#20078)
+successor(#20085,#20089)
+successor(#20105,#20090)
+successor(#20104,#20092)
+successor(#20094,#20104)
+successor(#20092,#20105)
+successor(#20090,#20087)
+successor(#20089,#20094)
+#20118=*
+guard_node(#20118,1,#20087)
+hasLocation(#20118,#20088)
+successor(#20118,#20110)
+#20119=*
+guard_node(#20119,0,#20087)
+hasLocation(#20119,#20088)
+successor(#20119,#20112)
+successor(#20087,#20118)
+successor(#20087,#20119)
+successor(#20111,#20108)
+successor(#20110,#20111)
+successor(#20108,#20112)
 successor(#20082,#20085)
 successor(#20080,#20082)
-successor(#20078,#20119)
+successor(#20078,#20117)
 successor(#20073,#20075)
 successor(#20075,#20074)
 successor(#20074,#20076)
-successor(#20117,#20073)
+successor(#20115,#20073)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
index 86f9d4133d88..10169d3de382 100644
--- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
+++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
@@ -24,9 +24,6 @@ predicate inVoidContext(Expr e) {
     )
   )
   or
-  // propagate void context through parenthesized expressions
-  inVoidContext(e.getParent().(ParExpr))
-  or
   exists(SeqExpr seq, int i, int n |
     e = seq.getOperand(i) and
     n = seq.getNumOperands()
@@ -146,8 +143,6 @@ predicate isCompoundExpression(Expr e) {
   e instanceof LogicalBinaryExpr
   or
   e instanceof SeqExpr
-  or
-  e instanceof ParExpr
 }
 
 /**
@@ -180,8 +175,8 @@ predicate hasNoEffect(Expr e) {
     not exists(fe.getName())
   ) and
   // exclude block-level flow type annotations. For example: `(name: empty)`.
-  not exists(ParExpr parent |
-    e.getParent() = parent and
+  not (
+    e.isParenthesized() and
     e.getLastToken().getNextToken().getValue() = ":"
   ) and
   // exclude expressions that are part of a conditional expression
diff --git a/javascript/ql/lib/semmle/javascript/Expr.qll b/javascript/ql/lib/semmle/javascript/Expr.qll
index 008cc1283770..389f73cea39f 100644
--- a/javascript/ql/lib/semmle/javascript/Expr.qll
+++ b/javascript/ql/lib/semmle/javascript/Expr.qll
@@ -45,8 +45,6 @@ class ExprOrType extends @expr_or_type, Documentable {
       exists(DotExpr dot | this = dot.getProperty() | result = dot.getDocumentation())
       or
       exists(AssignExpr e | this = e.getRhs() | result = e.getDocumentation())
-      or
-      exists(ParExpr p | this = p.getExpression() | result = p.getDocumentation())
     )
   }
 
@@ -109,6 +107,12 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
   /** Gets this expression, with any surrounding parentheses removed. */
   override Expr stripParens() { result = this }
 
+  /** Holds if this expression is wrapped in parentheses. */
+  predicate isParenthesized() { has_parentheses(this, _) }
+
+  /** Gets the number of enclosing parentheses around this expression. */
+  int getParenthesisDepth() { has_parentheses(this, result) }
+
   /** Gets the constant integer value this expression evaluates to, if any. */
   int getIntValue() { none() }
 
@@ -235,9 +239,6 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
       this = ctx.(ForOfStmt).getIterationDomain()
       or
       // recursive cases
-      this = ctx.(ParExpr).getExpression() and
-      ctx.(ParExpr).inNullSensitiveContext()
-      or
       this = ctx.(SeqExpr).getLastOperand() and
       ctx.(SeqExpr).inNullSensitiveContext()
       or
@@ -351,6 +352,11 @@ class Literal extends @literal, Expr {
 /**
  * A parenthesized expression.
  *
+ * Note: in new databases, parenthesized expressions are not represented as separate
+ * AST nodes. Instead, the inner expression takes the place of the parenthesized
+ * expression and `Expr.isParenthesized()` indicates whether it was wrapped in
+ * parentheses. This class is retained for backwards compatibility with old databases.
+ *
  * Example:
  *
  * ```
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index a24d7976b3d6..e2e426f64537 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -1641,8 +1641,6 @@ module DataFlow {
     exists(Expr predExpr, Expr succExpr |
       pred = TValueNode(predExpr) and succ = TValueNode(succExpr)
     |
-      predExpr = succExpr.(ParExpr).getExpression()
-      or
       predExpr = succExpr.(SeqExpr).getLastOperand()
       or
       predExpr = succExpr.(AssignExpr).getRhs()
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Refinements.qll b/javascript/ql/lib/semmle/javascript/dataflow/Refinements.qll
index 2fa76caed79a..31ed22eb3d54 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Refinements.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Refinements.qll
@@ -154,20 +154,6 @@ private class VariableRefinement extends RefinementCandidate, VarUse {
   }
 }
 
-/** A parenthesized refinement expression. */
-private class ParRefinement extends RefinementCandidate, ParExpr {
-  ParRefinement() { this.getExpression() instanceof RefinementCandidate }
-
-  override SsaSourceVariable getARefinedVar() {
-    result = this.getExpression().(RefinementCandidate).getARefinedVar()
-  }
-
-  overlay[global]
-  override RefinementValue eval(RefinementContext ctxt) {
-    result = this.getExpression().(RefinementCandidate).eval(ctxt)
-  }
-}
-
 /** A `typeof` refinement expression. */
 private class TypeofRefinement extends RefinementCandidate, TypeofExpr {
   TypeofRefinement() { this.getOperand() instanceof RefinementCandidate }
diff --git a/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
index 43ae4ffd43e6..5bfe3d7003bd 100644
--- a/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
@@ -147,11 +147,6 @@ module NameResolution {
       node2 = type
     )
     or
-    exists(ParenthesisExpr expr |
-      node1 = expr.getExpression() and
-      node2 = expr
-    )
-    or
     exists(NonNullAssertion assertion |
       // For the time being we don't use this for nullness analysis, so just
       // propagate through these assertions.
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme b/javascript/ql/lib/semmlecode.javascript.dbscheme
index 26a123164be8..49e6663bb7d4 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme
@@ -202,6 +202,9 @@ array_size (unique int ae: @arraylike ref,
 
 is_delegating (int yield: @yield_expr ref);
 
+has_parentheses (unique int expr: @expr ref,
+       int depth: int ref);
+
 @expr_or_stmt = @expr | @stmt;
 @expr_or_type = @expr | @typeexpr;
 @expr_parent = @expr_or_stmt | @property | @function_typeexpr;
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
index dd86c7346ef5..e1402f7d9678 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
@@ -7969,6 +7969,54 @@
 <dependencies/>
 </relation>
 <relation>
+<name>has_parentheses</name>
+<cardinality>1</cardinality>
+<columnsizes>
+<e>
+<k>expr</k>
+<v>1</v>
+</e>
+<e>
+<k>depth</k>
+<v>1</v>
+</e>
+</columnsizes>
+<dependencies>
+<dep>
+<src>expr</src>
+<trg>depth</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
+<src>depth</src>
+<trg>expr</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+</dependencies>
+</relation>
+<relation>
 <name>expr_contains_template_tag_location</name>
 <cardinality>31</cardinality>
 <columnsizes>
diff --git a/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme
new file mode 100644
index 000000000000..26a123164be8
--- /dev/null
+++ b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme
@@ -0,0 +1,1217 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access | @this_expr;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..49e6663bb7d4
--- /dev/null
+++ b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme
@@ -0,0 +1,1220 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+has_parentheses (unique int expr: @expr ref,
+       int depth: int ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access | @this_expr;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties
new file mode 100644
index 000000000000..28b7ded87128
--- /dev/null
+++ b/javascript/ql/lib/upgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove parenthesized expression from AST, add has_parentheses relation
+compatibility: full
diff --git a/javascript/ql/src/Expressions/CompareIdenticalValues.ql b/javascript/ql/src/Expressions/CompareIdenticalValues.ql
index 19e9338fb6fd..210821d78595 100644
--- a/javascript/ql/src/Expressions/CompareIdenticalValues.ql
+++ b/javascript/ql/src/Expressions/CompareIdenticalValues.ql
@@ -17,15 +17,13 @@
 import Clones
 
 /**
- * Holds if `e` is a reference to variable `v`, possibly with parentheses or
+ * Holds if `e` is a reference to variable `v`, possibly with
  * numeric conversions (that is, the unary operators `+` or `-` or a call to `Number`)
  * applied.
  */
 predicate accessWithConversions(Expr e, Variable v) {
   e = v.getAnAccess()
   or
-  accessWithConversions(e.(ParExpr).getExpression(), v)
-  or
   exists(UnaryExpr ue | ue instanceof NegExpr or ue instanceof PlusExpr |
     ue = e and accessWithConversions(ue.getOperand(), v)
   )
diff --git a/javascript/ql/src/Expressions/MissingSpaceInAppend.ql b/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
index d4c2bcb18ac6..8ccfa0a740cd 100644
--- a/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
+++ b/javascript/ql/src/Expressions/MissingSpaceInAppend.ql
@@ -14,21 +14,11 @@
 
 import javascript
 
-Expr rightChild(Expr e) {
-  result = e.(ParExpr).getExpression() or
-  result = e.(AddExpr).getRightOperand()
-}
+Expr rightChild(Expr e) { result = e.(AddExpr).getRightOperand() }
 
-Expr leftChild(Expr e) {
-  result = e.(ParExpr).getExpression() or
-  result = e.(AddExpr).getLeftOperand()
-}
+Expr leftChild(Expr e) { result = e.(AddExpr).getLeftOperand() }
 
-predicate isInConcat(Expr e) {
-  exists(ParExpr par | isInConcat(par) and par.getExpression() = e)
-  or
-  exists(AddExpr a | a.getAnOperand() = e)
-}
+predicate isInConcat(Expr e) { exists(AddExpr a | a.getAnOperand() = e) }
 
 class ConcatenationLiteral extends Expr {
   ConcatenationLiteral() {
diff --git a/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql b/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
index 104e7188e7e7..31bba1acfe26 100644
--- a/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
+++ b/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
@@ -25,6 +25,8 @@ where
   // don't flag if the other operand is itself a comparison,
   // since the nesting tends to be visually more obvious in such cases
   not other instanceof Comparison and
+  // don't flag if the comparison is wrapped in parentheses
+  not rel.isParenthesized() and
   // don't flag occurrences in minified code
   not rel.getTopLevel().isMinified()
 select rel,
diff --git a/javascript/ql/test/library-tests/Arrays/printAst.expected b/javascript/ql/test/library-tests/Arrays/printAst.expected
index e79ac5ce84e7..6caf41d1f7a8 100644
--- a/javascript/ql/test/library-tests/Arrays/printAst.expected
+++ b/javascript/ql/test/library-tests/Arrays/printAst.expected
@@ -1,5 +1,4 @@
 nodes
-| arrays.js:1:1:148:2 | [ParExpr] (functi ... } }) | semmle.label | [ParExpr] (functi ... } }) |
 | arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | semmle.label | [ExprStmt] (functi ... } }); |
 | arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | semmle.order | 1 |
 | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | semmle.label | [FunctionExpr] functio ... K } } |
@@ -730,10 +729,8 @@ nodes
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 edges
-| arrays.js:1:1:148:2 | [ParExpr] (functi ... } }) | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | semmle.label | 1 |
-| arrays.js:1:1:148:2 | [ParExpr] (functi ... } }) | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | semmle.order | 1 |
-| arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | arrays.js:1:1:148:2 | [ParExpr] (functi ... } }) | semmle.label | 1 |
-| arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | arrays.js:1:1:148:2 | [ParExpr] (functi ... } }) | semmle.order | 1 |
+| arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | semmle.label | 1 |
+| arrays.js:1:1:148:3 | [ExprStmt] (functi ... } }); | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | semmle.order | 1 |
 | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | arrays.js:1:14:148:1 | [BlockStmt] { let ... K } } | semmle.label | 5 |
 | arrays.js:1:2:148:1 | [FunctionExpr] functio ... K } } | arrays.js:1:14:148:1 | [BlockStmt] { let ... K } } | semmle.order | 5 |
 | arrays.js:1:14:148:1 | [BlockStmt] { let ... K } } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | 1 |
diff --git a/javascript/ql/test/library-tests/CFG/CFG.expected b/javascript/ql/test/library-tests/CFG/CFG.expected
index 235b4f73183d..e6461a6c8b97 100644
--- a/javascript/ql/test/library-tests/CFG/CFG.expected
+++ b/javascript/ql/test/library-tests/CFG/CFG.expected
@@ -722,8 +722,7 @@
 | short-circuit | 9 | y | 9 | guard: y is false |
 | short-circuit | 9 | y | 9 | guard: y is true |
 | short-circuit | 11 | z | 13 | (d\\n\|\|\\ne)\\n&&\\nf; |
-| short-circuit | 13 | (d\\n\|\|\\ne) | 13 | d\\n\|\|\\ne |
-| short-circuit | 13 | (d\\n\|\|\\ne)\\n&&\\nf | 13 | (d\\n\|\|\\ne) |
+| short-circuit | 13 | (d\\n\|\|\\ne)\\n&&\\nf | 13 | d\\n\|\|\\ne |
 | short-circuit | 13 | (d\\n\|\|\\ne)\\n&&\\nf; | 13 | (d\\n\|\|\\ne)\\n&&\\nf |
 | short-circuit | 13 | d | 13 | guard: d is false |
 | short-circuit | 13 | d | 13 | guard: d is true |
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
index 1192c8ec8fb6..2f7f2a30b9ec 100644
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
@@ -48,7 +48,6 @@ test_getAFunctionValue
 | b.js:2:8:2:24 | function bar() {} | b.js:2:8:2:24 | function bar() {} |
 | c.js:1:16:1:27 | function(){} | c.js:1:16:1:27 | function(){} |
 | c.js:2:8:2:24 | function bar() {} | c.js:2:8:2:24 | function bar() {} |
-| classes.js:1:1:19:2 | (functi ... o();\\n}) | classes.js:1:2:19:1 | functio ... lo();\\n} |
 | classes.js:1:2:19:1 | functio ... lo();\\n} | classes.js:1:2:19:1 | functio ... lo();\\n} |
 | classes.js:2:3:10:3 | class A ...   }\\n  } | classes.js:2:11:2:10 | () {} |
 | classes.js:2:9:2:9 | A | classes.js:2:11:2:10 | () {} |
@@ -73,7 +72,6 @@ test_getAFunctionValue
 | es2015.js:10:5:10:20 | arguments.callee | es2015.js:8:2:12:1 | functio ... \\n  };\\n} |
 | es2015.js:10:5:10:22 | arguments.callee() | es2015.js:9:10:11:3 | () => { ... ();\\n  } |
 | es2015.js:14:1:18:1 | class S ... ;\\n  }\\n} | es2015.js:15:14:17:3 | () {\\n   ... ();\\n  } |
-| es2015.js:14:19:14:47 | ("Wait  ... eClass) | es2015.js:2:14:4:3 | () {\\n   ... ");\\n  } |
 | es2015.js:14:20:14:46 | "Wait f ... leClass | es2015.js:2:14:4:3 | () {\\n   ... ");\\n  } |
 | es2015.js:14:35:14:46 | ExampleClass | es2015.js:2:14:4:3 | () {\\n   ... ");\\n  } |
 | es2015.js:15:14:17:3 | () {\\n   ... ();\\n  } | es2015.js:15:14:17:3 | () {\\n   ... ();\\n  } |
@@ -93,7 +91,6 @@ test_getAFunctionValue
 | m.js:3:1:3:16 | module.exports.f | m.js:1:13:1:25 | function() {} |
 | n.js:2:1:2:3 | m.f | m.js:1:13:1:25 | function() {} |
 | n.js:5:1:5:4 | m2.f | m2.js:2:6:2:18 | function() {} |
-| non-strict.js:1:1:8:2 | (functi ... ode.\\n}) | non-strict.js:1:2:8:1 | functio ... mode.\\n} |
 | non-strict.js:1:2:8:1 | functio ... mode.\\n} | non-strict.js:1:2:8:1 | functio ... mode.\\n} |
 | non-strict.js:3:5:5:5 | functio ... ;\\n    } | non-strict.js:3:5:5:5 | functio ... ;\\n    } |
 | non-strict.js:3:14:3:16 | foo | non-strict.js:3:5:5:5 | functio ... ;\\n    } |
@@ -121,10 +118,8 @@ test_getAFunctionValue
 | reflection.js:7:1:7:3 | add | reflection.js:1:1:3:1 | functio ...  x+y;\\n} |
 | reflection.js:8:1:8:3 | add | reflection.js:1:1:3:1 | functio ...  x+y;\\n} |
 | reflection.js:8:1:8:9 | add.apply | reflection.js:5:15:5:39 | functio ... n 56; } |
-| strict2.js:2:1:10:2 | (functi ... ode.\\n}) | strict2.js:2:2:10:1 | functio ... mode.\\n} |
 | strict2.js:2:2:10:1 | functio ... mode.\\n} | strict2.js:2:2:10:1 | functio ... mode.\\n} |
 | strict2.js:5:5:7:5 | functio ... ;\\n    } | strict2.js:5:5:7:5 | functio ... ;\\n    } |
-| strict.js:1:1:8:2 | (functi ... ode.\\n}) | strict.js:1:2:8:1 | functio ... mode.\\n} |
 | strict.js:1:2:8:1 | functio ... mode.\\n} | strict.js:1:2:8:1 | functio ... mode.\\n} |
 | strict.js:3:5:5:5 | functio ... ;\\n    } | strict.js:3:5:5:5 | functio ... ;\\n    } |
 | taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} | taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} |
@@ -168,7 +163,6 @@ test_getAFunctionValue
 | tst.js:22:3:22:3 | k | tst.js:2:9:2:21 | function() {} |
 | tst.js:24:5:24:5 | f | tst.js:1:1:1:15 | function f() {} |
 | tst.js:25:5:25:5 | g | tst.js:2:9:2:21 | function() {} |
-| tst.js:27:1:27:14 | (function(){}) | tst.js:27:2:27:13 | function(){} |
 | tst.js:27:2:27:13 | function(){} | tst.js:27:2:27:13 | function(){} |
 | tst.js:28:2:28:13 | function(){} | tst.js:28:2:28:13 | function(){} |
 | tst.js:32:6:34:3 | functio ... ();\\n\\t\\t} | tst.js:32:6:34:3 | functio ... ();\\n\\t\\t} |
@@ -209,7 +203,6 @@ test_getAFunctionValue
 | tst.js:61:1:61:13 | C.prototype.g | tst.js:61:17:61:29 | function() {} |
 | tst.js:61:1:61:29 | C.proto ... on() {} | tst.js:61:17:61:29 | function() {} |
 | tst.js:61:17:61:29 | function() {} | tst.js:61:17:61:29 | function() {} |
-| tst.js:63:1:67:2 | (functi ... f();\\n}) | tst.js:63:2:67:1 | functio ... .f();\\n} |
 | tst.js:63:2:67:1 | functio ... .f();\\n} | tst.js:63:2:67:1 | functio ... .f();\\n} |
 | tst.js:64:17:64:17 | B | tst.js:50:1:50:15 | function B() {} |
 | tst.js:65:5:65:7 | b.f | tst.js:65:11:65:23 | function() {} |
@@ -364,7 +357,7 @@ test_getCalleeNode
 | n.js:2:1:2:5 | m.f() | n.js:2:1:2:3 | m.f |
 | n.js:4:10:4:24 | require('./m2') | n.js:4:10:4:16 | require |
 | n.js:5:1:5:6 | m2.f() | n.js:5:1:5:4 | m2.f |
-| non-strict.js:1:1:8:4 | (functi ... e.\\n})() | non-strict.js:1:1:8:2 | (functi ... ode.\\n}) |
+| non-strict.js:1:1:8:4 | (functi ... e.\\n})() | non-strict.js:1:2:8:1 | functio ... mode.\\n} |
 | non-strict.js:7:10:7:14 | foo() | non-strict.js:7:10:7:12 | foo |
 | protoclass.js:4:3:4:13 | this.init() | protoclass.js:4:3:4:11 | this.init |
 | protoclass.js:8:3:8:15 | this.method() | protoclass.js:8:3:8:13 | this.method |
@@ -375,9 +368,9 @@ test_getCalleeNode
 | reflection.js:7:1:7:22 | reflective call | reflection.js:7:1:7:3 | add |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | reflection.js:8:1:8:9 | add.apply |
 | reflection.js:8:1:8:25 | reflective call | reflection.js:8:1:8:3 | add |
-| strict2.js:2:1:10:4 | (functi ... e.\\n})() | strict2.js:2:1:10:2 | (functi ... ode.\\n}) |
+| strict2.js:2:1:10:4 | (functi ... e.\\n})() | strict2.js:2:2:10:1 | functio ... mode.\\n} |
 | strict2.js:9:10:9:14 | foo() | strict2.js:9:10:9:12 | foo |
-| strict.js:1:1:8:4 | (functi ... e.\\n})() | strict.js:1:1:8:2 | (functi ... ode.\\n}) |
+| strict.js:1:1:8:4 | (functi ... e.\\n})() | strict.js:1:2:8:1 | functio ... mode.\\n} |
 | strict.js:7:10:7:14 | foo() | strict.js:7:10:7:12 | foo |
 | taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:5:1:5:6 | fooTag |
 | tst.js:6:1:6:3 | f() | tst.js:6:1:6:1 | f |
@@ -393,7 +386,7 @@ test_getCalleeNode
 | tst.js:22:1:22:4 | l(k) | tst.js:22:1:22:1 | l |
 | tst.js:24:1:24:7 | new f() | tst.js:24:5:24:5 | f |
 | tst.js:25:1:25:5 | new g | tst.js:25:5:25:5 | g |
-| tst.js:27:1:27:16 | (function(){})() | tst.js:27:1:27:14 | (function(){}) |
+| tst.js:27:1:27:16 | (function(){})() | tst.js:27:2:27:13 | function(){} |
 | tst.js:28:2:28:15 | function(){}() | tst.js:28:2:28:13 | function(){} |
 | tst.js:33:4:33:11 | this.g() | tst.js:33:4:33:9 | this.g |
 | tst.js:41:1:41:5 | o.f() | tst.js:41:1:41:3 | o.f |
diff --git a/javascript/ql/test/library-tests/Constants/Constants.expected b/javascript/ql/test/library-tests/Constants/Constants.expected
index b108c4a149df..5330b0a916e3 100644
--- a/javascript/ql/test/library-tests/Constants/Constants.expected
+++ b/javascript/ql/test/library-tests/Constants/Constants.expected
@@ -42,7 +42,6 @@
 | tst.js:35:1:35:9 | 1 + 2 + 3 |
 | tst.js:35:5:35:5 | 2 |
 | tst.js:35:9:35:9 | 3 |
-| tst.js:37:1:37:3 | (1) |
 | tst.js:37:2:37:2 | 1 |
 | tst.js:39:1:39:4 | f, 1 |
 | tst.js:39:4:39:4 | 1 |
@@ -95,7 +94,6 @@ getIntValue
 | tst.js:35:1:35:1 | 1 | 1 |
 | tst.js:35:5:35:5 | 2 | 2 |
 | tst.js:35:9:35:9 | 3 | 3 |
-| tst.js:37:1:37:3 | (1) | 1 |
 | tst.js:37:2:37:2 | 1 | 1 |
 | tst.js:39:4:39:4 | 1 | 1 |
 | tst.js:40:1:40:1 | 1 | 1 |
diff --git a/javascript/ql/test/library-tests/DataFlow/tests.expected b/javascript/ql/test/library-tests/DataFlow/tests.expected
index 7ba6cbb60f39..638d4cf6e6f3 100644
--- a/javascript/ql/test/library-tests/DataFlow/tests.expected
+++ b/javascript/ql/test/library-tests/DataFlow/tests.expected
@@ -11,7 +11,6 @@ argumentPassing
 | tst.js:98:1:103:17 | (functi ... 3, 0 ]) | tst.js:103:4:103:16 | [ 19, 23, 0 ] | tst.js:98:11:98:24 | [ x, ...rest ] |
 basicBlock
 | arguments.js:1:1:1:0 | this | arguments.js:1:1:1:0 | entry node of <toplevel> |
-| arguments.js:1:1:12:2 | (functi ...  3);\\n}) | arguments.js:1:1:1:0 | entry node of <toplevel> |
 | arguments.js:1:1:12:4 | (functi ... );\\n})() | arguments.js:1:1:1:0 | entry node of <toplevel> |
 | arguments.js:1:1:12:4 | exceptional return of (functi ... );\\n})() | arguments.js:1:1:1:0 | entry node of <toplevel> |
 | arguments.js:1:2:1:1 | this | arguments.js:1:2:1:1 | entry node of functio ... , 3);\\n} |
@@ -86,7 +85,6 @@ basicBlock
 | sources.js:1:1:1:0 | this | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:1:1:1:12 | exceptional return of new (x => x) | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:1:1:1:12 | new (x => x) | sources.js:1:1:1:0 | entry node of <toplevel> |
-| sources.js:1:5:1:12 | (x => x) | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:5 | entry node of x => x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:5 | entry node of x => x |
 | sources.js:1:6:1:11 | [function self-reference] x => x | sources.js:1:6:1:5 | entry node of x => x |
@@ -94,7 +92,6 @@ basicBlock
 | sources.js:1:6:1:11 | return of anonymous function | sources.js:1:6:1:5 | entry node of x => x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:1:11:1:11 | x | sources.js:1:6:1:5 | entry node of x => x |
-| sources.js:3:1:5:2 | (functi ... +19;\\n}) | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:3:1:5:6 | (functi ... \\n})(23) | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:3:1:5:6 | exceptional return of (functi ... \\n})(23) | sources.js:1:1:1:0 | entry node of <toplevel> |
 | sources.js:3:2:3:1 | this | sources.js:3:2:3:1 | entry node of functio ... x+19;\\n} |
@@ -207,7 +204,6 @@ basicBlock
 | tst.js:5:5:5:5 | z | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:7:1:7:2 | fs | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:8:1:8:1 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:9:1:9:3 | (x) | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:9:2:9:2 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:10:1:10:1 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:10:1:10:4 | x, y | tst.js:1:1:1:0 | entry node of <toplevel> |
@@ -232,7 +228,6 @@ basicBlock
 | tst.js:14:1:14:9 | z ? x : y | tst.js:13:1:13:6 | z = y; |
 | tst.js:14:5:14:5 | x | tst.js:14:1:14:1 | guard: z is true |
 | tst.js:14:9:14:9 | y | tst.js:14:1:14:1 | guard: z is false |
-| tst.js:16:1:20:2 | (functi ...  "";\\n}) | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:16:1:20:9 | (functi ... ("arg") | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:16:1:20:9 | exceptional return of (functi ... ("arg") | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:16:2:16:1 | this | tst.js:16:2:16:1 | entry node of functio ... n "";\\n} |
@@ -266,7 +261,6 @@ basicBlock
 | tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:26:1:26:1 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:28:1:30:1 | (() =>\\n ... ables\\n) | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:28:1:30:3 | exceptional return of (() =>\\n ... les\\n)() | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:28:2:28:1 | x | tst.js:28:2:28:1 | entry node of () =>\\n  x |
@@ -416,7 +410,6 @@ basicBlock
 | tst.js:85:18:85:18 | v | tst.js:85:18:85:18 | v |
 | tst.js:85:23:85:23 | o | tst.js:83:5:83:28 | vs1 = [ ...  o) v ] |
 | tst.js:85:26:85:26 | v | tst.js:85:18:85:18 | v |
-| tst.js:87:1:92:2 | (functi ... + z;\\n}) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:87:1:96:2 | (functi ... r: 0\\n}) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:87:1:96:2 | exceptional return of (functi ... r: 0\\n}) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:87:2:87:1 | this | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
@@ -443,7 +436,6 @@ basicBlock
 | tst.js:88:18:88:18 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:90:3:90:16 | ({ r: z } = o) | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:11 | { r: z } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:6 | r | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
@@ -470,7 +462,6 @@ basicBlock
 | tst.js:95:3:95:6 | r: 0 | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:95:3:95:6 | r: 0 | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:95:6:95:6 | 0 | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
-| tst.js:98:1:103:2 | (functi ... + z;\\n}) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:98:1:103:17 | (functi ... 3, 0 ]) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:98:1:103:17 | exceptional return of (functi ... 3, 0 ]) | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:98:2:98:1 | this | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
@@ -514,7 +505,6 @@ basicBlock
 | tst.js:105:1:105:1 | x | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:105:1:105:6 | x ?? y | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:105:6:105:6 | y | tst.js:105:6:105:6 | y |
-| tst.js:107:1:113:2 | (functi ... v2c;\\n}) | tst.js:107:1:113:3 | (functi ... 2c;\\n}); |
 | tst.js:107:2:107:1 | this | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:107:2:113:1 | [function self-reference] functio ...  v2c;\\n} | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:107:2:113:1 | exceptional return of anonymous function | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -579,7 +569,6 @@ basicBlock
 | tst.js:117:17:117:20 | seal | tst.js:107:1:113:3 | (functi ... 2c;\\n}); |
 | tst.js:117:22:117:23 | x1 | tst.js:107:1:113:3 | (functi ... 2c;\\n}); |
 enclosingExpr
-| arguments.js:1:1:12:2 | (functi ...  3);\\n}) | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
 | arguments.js:1:1:12:4 | (functi ... );\\n})() | arguments.js:1:1:12:4 | (functi ... );\\n})() |
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:2:12:1 | functio ... , 3);\\n} |
 | arguments.js:2:14:2:14 | f | arguments.js:2:14:2:14 | f |
@@ -627,11 +616,9 @@ enclosingExpr
 | eval.js:3:8:3:15 | "x = 23" | eval.js:3:8:3:15 | "x = 23" |
 | eval.js:4:3:4:3 | x | eval.js:4:3:4:3 | x |
 | sources.js:1:1:1:12 | new (x => x) | sources.js:1:1:1:12 | new (x => x) |
-| sources.js:1:5:1:12 | (x => x) | sources.js:1:5:1:12 | (x => x) |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:6:1:11 | x => x |
 | sources.js:1:11:1:11 | x | sources.js:1:11:1:11 | x |
-| sources.js:3:1:5:2 | (functi ... +19;\\n}) | sources.js:3:1:5:2 | (functi ... +19;\\n}) |
 | sources.js:3:1:5:6 | (functi ... \\n})(23) | sources.js:3:1:5:6 | (functi ... \\n})(23) |
 | sources.js:3:2:5:1 | functio ... x+19;\\n} | sources.js:3:2:5:1 | functio ... x+19;\\n} |
 | sources.js:3:11:3:11 | x | sources.js:3:11:3:11 | x |
@@ -701,7 +688,6 @@ enclosingExpr
 | tst.js:5:5:5:5 | z | tst.js:5:5:5:5 | z |
 | tst.js:7:1:7:2 | fs | tst.js:7:1:7:2 | fs |
 | tst.js:8:1:8:1 | x | tst.js:8:1:8:1 | x |
-| tst.js:9:1:9:3 | (x) | tst.js:9:1:9:3 | (x) |
 | tst.js:9:2:9:2 | x | tst.js:9:2:9:2 | x |
 | tst.js:10:1:10:1 | x | tst.js:10:1:10:1 | x |
 | tst.js:10:1:10:4 | x, y | tst.js:10:1:10:4 | x, y |
@@ -719,7 +705,6 @@ enclosingExpr
 | tst.js:14:1:14:9 | z ? x : y | tst.js:14:1:14:9 | z ? x : y |
 | tst.js:14:5:14:5 | x | tst.js:14:5:14:5 | x |
 | tst.js:14:9:14:9 | y | tst.js:14:9:14:9 | y |
-| tst.js:16:1:20:2 | (functi ...  "";\\n}) | tst.js:16:1:20:2 | (functi ...  "";\\n}) |
 | tst.js:16:1:20:9 | (functi ... ("arg") | tst.js:16:1:20:9 | (functi ... ("arg") |
 | tst.js:16:2:20:1 | functio ... n "";\\n} | tst.js:16:2:20:1 | functio ... n "";\\n} |
 | tst.js:16:11:16:11 | f | tst.js:16:11:16:11 | f |
@@ -742,7 +727,6 @@ enclosingExpr
 | tst.js:25:1:25:3 | ++x | tst.js:25:1:25:3 | ++x |
 | tst.js:25:3:25:3 | x | tst.js:25:3:25:3 | x |
 | tst.js:26:1:26:1 | x | tst.js:26:1:26:1 | x |
-| tst.js:28:1:30:1 | (() =>\\n ... ables\\n) | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
 | tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:2:29:3 | () =>\\n  x |
 | tst.js:29:3:29:3 | x | tst.js:29:3:29:3 | x |
@@ -841,7 +825,6 @@ enclosingExpr
 | tst.js:85:18:85:18 | v | tst.js:85:18:85:18 | v |
 | tst.js:85:23:85:23 | o | tst.js:85:23:85:23 | o |
 | tst.js:85:26:85:26 | v | tst.js:85:26:85:26 | v |
-| tst.js:87:1:92:2 | (functi ... + z;\\n}) | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
 | tst.js:87:1:96:2 | (functi ... r: 0\\n}) | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:2:92:1 | functio ...  + z;\\n} |
 | tst.js:87:11:87:24 | { p: x, ...o } | tst.js:87:11:87:24 | { p: x, ...o } |
@@ -855,7 +838,6 @@ enclosingExpr
 | tst.js:88:18:88:18 | o | tst.js:88:18:88:18 | o |
 | tst.js:89:7:89:7 | z | tst.js:89:7:89:7 | z |
 | tst.js:89:7:89:7 | z | tst.js:89:7:89:7 | z |
-| tst.js:90:3:90:16 | ({ r: z } = o) | tst.js:90:3:90:16 | ({ r: z } = o) |
 | tst.js:90:4:90:11 | { r: z } | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:90:6:90:6 | r | tst.js:90:6:90:6 | r |
@@ -873,7 +855,6 @@ enclosingExpr
 | tst.js:94:6:94:7 | 23 | tst.js:94:6:94:7 | 23 |
 | tst.js:95:3:95:3 | r | tst.js:95:3:95:3 | r |
 | tst.js:95:6:95:6 | 0 | tst.js:95:6:95:6 | 0 |
-| tst.js:98:1:103:2 | (functi ... + z;\\n}) | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
 | tst.js:98:1:103:17 | (functi ... 3, 0 ]) | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:2:103:1 | functio ...  + z;\\n} |
 | tst.js:98:11:98:24 | [ x, ...rest ] | tst.js:98:11:98:24 | [ x, ...rest ] |
@@ -901,7 +882,6 @@ enclosingExpr
 | tst.js:105:1:105:1 | x | tst.js:105:1:105:1 | x |
 | tst.js:105:1:105:6 | x ?? y | tst.js:105:1:105:6 | x ?? y |
 | tst.js:105:6:105:6 | y | tst.js:105:6:105:6 | y |
-| tst.js:107:1:113:2 | (functi ... v2c;\\n}) | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:2:113:1 | functio ...  v2c;\\n} |
 | tst.js:108:6:108:32 | {v1a, v ...  = o1c} | tst.js:108:6:108:32 | {v1a, v ...  = o1c} |
 | tst.js:108:6:108:38 | {v1a, v ... } = o1d | tst.js:108:6:108:38 | {v1a, v ... } = o1d |
@@ -945,7 +925,6 @@ enclosingExpr
 | tst.js:117:17:117:20 | seal | tst.js:117:17:117:20 | seal |
 | tst.js:117:22:117:23 | x1 | tst.js:117:22:117:23 | x1 |
 flowStep
-| arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
 | arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
 | arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
 | arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
@@ -967,10 +946,8 @@ flowStep
 | eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
-| sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
 | sources.js:1:11:1:11 | x | sources.js:1:1:1:12 | new (x => x) |
 | sources.js:1:11:1:11 | x | sources.js:1:6:1:11 | return of anonymous function |
-| sources.js:3:2:5:1 | functio ... x+19;\\n} | sources.js:3:1:5:2 | (functi ... +19;\\n}) |
 | sources.js:3:11:3:11 | x | sources.js:3:11:3:11 | x |
 | sources.js:3:11:3:11 | x | sources.js:4:10:4:10 | x |
 | sources.js:4:10:4:13 | x+19 | sources.js:3:1:5:6 | (functi ... \\n})(23) |
@@ -1022,7 +999,6 @@ flowStep
 | tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
 | tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
 | tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
-| tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
 | tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
 | tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
@@ -1041,7 +1017,6 @@ flowStep
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
 | tst.js:14:5:14:5 | x | tst.js:14:1:14:9 | z ? x : y |
 | tst.js:14:9:14:9 | y | tst.js:14:1:14:9 | z ? x : y |
-| tst.js:16:2:20:1 | functio ... n "";\\n} | tst.js:16:1:20:2 | (functi ...  "";\\n}) |
 | tst.js:16:13:16:13 | a | tst.js:16:13:16:13 | a |
 | tst.js:16:13:16:13 | a | tst.js:18:12:18:12 | a |
 | tst.js:18:12:18:12 | a | tst.js:16:1:20:9 | (functi ... ("arg") |
@@ -1058,7 +1033,6 @@ flowStep
 | tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
 | tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
-| tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
 | tst.js:29:3:29:3 | x | tst.js:28:2:29:3 | return of anonymous function |
 | tst.js:32:1:32:0 | x | tst.js:33:10:33:10 | x |
@@ -1089,7 +1063,6 @@ flowStep
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
-| tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
 | tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
 | tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
 | tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
@@ -1098,7 +1071,6 @@ flowStep
 | tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
 | tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
 | tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
 | tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
@@ -1106,7 +1078,6 @@ flowStep
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:2:92:1 | return of anonymous function |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
-| tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
 | tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
 | tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
 | tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
@@ -1124,7 +1095,6 @@ flowStep
 | tst.js:103:4:103:16 | [ 19, 23, 0 ] | tst.js:98:11:98:24 | [ x, ...rest ] |
 | tst.js:105:1:105:1 | x | tst.js:105:1:105:6 | x ?? y |
 | tst.js:105:6:105:6 | y | tst.js:105:1:105:6 | x ?? y |
-| tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
 | tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
 | tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
 | tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
@@ -1145,7 +1115,6 @@ flowStep
 | tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ...  = o2c] |
 | tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
 getImmediatePredecessor
-| arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
 | arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
 | arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
 | arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
@@ -1162,9 +1131,7 @@ getImmediatePredecessor
 | eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
-| sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
 | sources.js:1:11:1:11 | x | sources.js:1:1:1:12 | new (x => x) |
-| sources.js:3:2:5:1 | functio ... x+19;\\n} | sources.js:3:1:5:2 | (functi ... +19;\\n}) |
 | sources.js:3:11:3:11 | x | sources.js:3:11:3:11 | x |
 | sources.js:3:11:3:11 | x | sources.js:4:10:4:10 | x |
 | sources.js:4:10:4:13 | x+19 | sources.js:3:1:5:6 | (functi ... \\n})(23) |
@@ -1210,7 +1177,6 @@ getImmediatePredecessor
 | tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
 | tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
 | tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
-| tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
 | tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
 | tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
@@ -1220,7 +1186,6 @@ getImmediatePredecessor
 | tst.js:13:1:13:6 | x | tst.js:25:3:25:3 | x |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:1 | z |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
-| tst.js:16:2:20:1 | functio ... n "";\\n} | tst.js:16:1:20:2 | (functi ...  "";\\n}) |
 | tst.js:16:13:16:13 | a | tst.js:16:13:16:13 | a |
 | tst.js:16:13:16:13 | a | tst.js:18:12:18:12 | a |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:13:16:13 | a |
@@ -1232,7 +1197,6 @@ getImmediatePredecessor
 | tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
 | tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
-| tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
 | tst.js:32:1:32:0 | x | tst.js:33:10:33:10 | x |
 | tst.js:32:1:34:1 | functio ... ables\\n} | tst.js:32:10:32:10 | g |
@@ -1261,7 +1225,6 @@ getImmediatePredecessor
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
-| tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
 | tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
 | tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
 | tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
@@ -1270,14 +1233,12 @@ getImmediatePredecessor
 | tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
 | tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
 | tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
 | tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
-| tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
 | tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
 | tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
 | tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
@@ -1292,7 +1253,6 @@ getImmediatePredecessor
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:16 | [ , z ] = rest |
 | tst.js:102:10:102:18 | x + y + z | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
 | tst.js:103:4:103:16 | [ 19, 23, 0 ] | tst.js:98:11:98:24 | [ x, ...rest ] |
-| tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
 | tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
 | tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
 | tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
diff --git a/javascript/ql/test/library-tests/Expr/stripParens.qll b/javascript/ql/test/library-tests/Expr/stripParens.qll
index 7d5a4d506fe6..8c2a22073182 100644
--- a/javascript/ql/test/library-tests/Expr/stripParens.qll
+++ b/javascript/ql/test/library-tests/Expr/stripParens.qll
@@ -1,3 +1,3 @@
 import javascript
 
-query predicate test_stripParens(ParExpr e, Expr inner) { inner = e.stripParens() and inner != e }
+query predicate test_stripParens(Expr e) { e.isParenthesized() }
diff --git a/javascript/ql/test/library-tests/Expr/tests.expected b/javascript/ql/test/library-tests/Expr/tests.expected
index 3e48ec37a20f..28d2867b70cb 100644
--- a/javascript/ql/test/library-tests/Expr/tests.expected
+++ b/javascript/ql/test/library-tests/Expr/tests.expected
@@ -191,7 +191,6 @@ test_isPure
 | functions.js:1:10:1:10 | f |
 | functions.js:2:2:2:5 | in_f |
 | functions.js:3:9:3:17 | also_in_f |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
 | functions.js:5:4:5:11 | not_in_f |
 | functions.js:6:6:8:3 | {\\n\\t\\t\\tx: ... ain\\n\\t\\t} |
@@ -342,13 +341,11 @@ test_isPure
 | primaries.js:12:1:12:13 | "'what?'\\x0a" |
 | primaries.js:13:1:13:10 | '"why?"\\n' |
 | primaries.js:14:1:14:15 | /^(need?le)+/gi |
-| primaries.js:15:1:15:4 | (23) |
 | primaries.js:15:2:15:3 | 23 |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] |
 | primaries.js:16:2:16:3 | 23 |
 | primaries.js:16:6:16:7 | 42 |
 | primaries.js:16:12:16:15 | "hi" |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) |
 | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} |
 | primaries.js:17:4:17:4 | x |
 | primaries.js:17:7:17:8 | 23 |
@@ -375,8 +372,6 @@ test_isPure
 | primaries.js:27:8:27:18 | 'epytotorp' |
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse |
 | primaries.js:27:20:27:26 | reverse |
-| primaries.js:28:1:28:6 | ((42)) |
-| primaries.js:28:2:28:5 | (42) |
 | primaries.js:28:3:28:4 | 42 |
 | primaries.js:29:1:29:13 | /\\2147483648/ |
 | primaries.js:30:1:30:26 | /a{2147 ... 83649}/ |
@@ -401,7 +396,6 @@ test_isPure
 | unary.js:5:1:5:13 | typeof Object |
 | unary.js:5:8:5:13 | Object |
 | unary.js:6:1:6:7 | void(0) |
-| unary.js:6:5:6:7 | (0) |
 | unary.js:6:6:6:6 | 0 |
 | unary.js:7:8:7:13 | Object |
 | unary.js:7:8:7:23 | Object.prototype |
@@ -553,9 +547,8 @@ test_getChild
 | es2015.js:25:9:25:14 | foo(1) | -1 | es2015.js:25:9:25:11 | foo |
 | es2015.js:28:19:28:22 | x+19 | 0 | es2015.js:28:19:28:19 | x |
 | es2015.js:28:19:28:22 | x+19 | 1 | es2015.js:28:21:28:22 | 19 |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | 0 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | 0 | functions.js:6:6:8:3 | {\\n\\t\\t\\tx: ... ain\\n\\t\\t} |
-| functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | -1 | functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) |
+| functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | -1 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
 | legacyletexpr.js:1:1:1:11 | console.log | 0 | legacyletexpr.js:1:1:1:7 | console |
 | legacyletexpr.js:1:1:1:11 | console.log | 1 | legacyletexpr.js:1:9:1:11 | log |
 | legacyletexpr.js:1:1:1:39 | console ...  x + y) | 0 | legacyletexpr.js:1:13:1:38 | let (x  ... ) x + y |
@@ -660,11 +653,9 @@ test_getChild
 | others.js:3:1:3:12 | true ? 0 : 1 | 1 | others.js:3:8:3:8 | 0 |
 | others.js:3:1:3:12 | true ? 0 : 1 | 2 | others.js:3:12:3:12 | 1 |
 | others.js:4:10:4:10 | p | 0 | others.js:4:10:4:10 | p |
-| primaries.js:15:1:15:4 | (23) | 0 | primaries.js:15:2:15:3 | 23 |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | 0 | primaries.js:16:2:16:3 | 23 |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | 1 | primaries.js:16:6:16:7 | 42 |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | 3 | primaries.js:16:12:16:15 | "hi" |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | 0 | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} |
 | primaries.js:21:9:21:14 | (v) {} | 0 | primaries.js:21:10:21:10 | v |
 | primaries.js:22:1:22:9 | new Array | -1 | primaries.js:22:5:22:9 | Array |
 | primaries.js:23:1:23:12 | new Object() | -1 | primaries.js:23:5:23:10 | Object |
@@ -681,8 +672,6 @@ test_getChild
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | 0 | primaries.js:27:8:27:18 | 'epytotorp' |
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | 1 | primaries.js:27:20:27:26 | reverse |
 | primaries.js:27:8:27:28 | 'epytot ... verse() | -1 | primaries.js:27:8:27:26 | 'epytotorp'.reverse |
-| primaries.js:28:1:28:6 | ((42)) | 0 | primaries.js:28:2:28:5 | (42) |
-| primaries.js:28:2:28:5 | (42) | 0 | primaries.js:28:3:28:4 | 42 |
 | surrogates.js:1:5:1:16 | a = "\\ud800" | 0 | surrogates.js:1:5:1:5 | a |
 | surrogates.js:1:5:1:16 | a = "\\ud800" | 1 | surrogates.js:1:9:1:16 | "\\ud800" |
 | surrogates.js:2:1:2:13 | /\\uD800/.test | 0 | surrogates.js:2:1:2:8 | /\\uD800/ |
@@ -694,8 +683,7 @@ test_getChild
 | unary.js:3:1:3:5 | !true | 0 | unary.js:3:2:3:5 | true |
 | unary.js:4:1:4:2 | ~2 | 0 | unary.js:4:2:4:2 | 2 |
 | unary.js:5:1:5:13 | typeof Object | 0 | unary.js:5:8:5:13 | Object |
-| unary.js:6:1:6:7 | void(0) | 0 | unary.js:6:5:6:7 | (0) |
-| unary.js:6:5:6:7 | (0) | 0 | unary.js:6:6:6:6 | 0 |
+| unary.js:6:1:6:7 | void(0) | 0 | unary.js:6:6:6:6 | 0 |
 | unary.js:7:1:7:23 | delete  ... ototype | 0 | unary.js:7:8:7:23 | Object.prototype |
 | unary.js:7:8:7:23 | Object.prototype | 0 | unary.js:7:8:7:13 | Object |
 | unary.js:7:8:7:23 | Object.prototype | 1 | unary.js:7:15:7:23 | prototype |
@@ -934,9 +922,8 @@ test_getParent
 | functions.js:1:10:1:10 | f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:2:2:2:5 | in_f | functions.js:2:2:2:6 | in_f; |
 | functions.js:3:9:3:17 | also_in_f | functions.js:3:2:8:5 | while ( ... n\\n\\t\\t}); |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | functions.js:4:3:8:5 | (functi ... n\\n\\t\\t}); |
-| functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) |
+| functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) |
 | functions.js:5:4:5:11 | not_in_f | functions.js:5:4:5:12 | not_in_f; |
 | functions.js:6:6:8:3 | {\\n\\t\\t\\tx: ... ain\\n\\t\\t} | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) |
 | functions.js:7:4:7:4 | x | functions.js:7:4:7:16 | x: in_f_again |
@@ -1114,14 +1101,12 @@ test_getParent
 | primaries.js:12:1:12:13 | "'what?'\\x0a" | primaries.js:12:1:12:14 | "'what?'\\x0a"; |
 | primaries.js:13:1:13:10 | '"why?"\\n' | primaries.js:13:1:13:11 | '"why?"\\n'; |
 | primaries.js:14:1:14:15 | /^(need?le)+/gi | primaries.js:14:1:14:16 | /^(need?le)+/gi; |
-| primaries.js:15:1:15:4 | (23) | primaries.js:15:1:15:5 | (23); |
-| primaries.js:15:2:15:3 | 23 | primaries.js:15:1:15:4 | (23) |
+| primaries.js:15:2:15:3 | 23 | primaries.js:15:1:15:5 | (23); |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | primaries.js:16:1:16:18 | [23, 42, , "hi" ]; |
 | primaries.js:16:2:16:3 | 23 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] |
 | primaries.js:16:6:16:7 | 42 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] |
 | primaries.js:16:12:16:15 | "hi" | primaries.js:16:1:16:17 | [23, 42, , "hi" ] |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
-| primaries.js:17:2:21:15 | { x: 23 ... (v) {}} | primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) |
+| primaries.js:17:2:21:15 | { x: 23 ... (v) {}} | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
 | primaries.js:17:4:17:4 | x | primaries.js:17:4:17:8 | x: 23 |
 | primaries.js:17:7:17:8 | 23 | primaries.js:17:4:17:8 | x: 23 |
 | primaries.js:18:4:18:4 | y | primaries.js:18:4:18:10 | y: this |
@@ -1154,9 +1139,7 @@ test_getParent
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | primaries.js:27:8:27:28 | 'epytot ... verse() |
 | primaries.js:27:8:27:28 | 'epytot ... verse() | primaries.js:27:1:27:29 | String[ ... erse()] |
 | primaries.js:27:20:27:26 | reverse | primaries.js:27:8:27:26 | 'epytotorp'.reverse |
-| primaries.js:28:1:28:6 | ((42)) | primaries.js:28:1:28:7 | ((42)); |
-| primaries.js:28:2:28:5 | (42) | primaries.js:28:1:28:6 | ((42)) |
-| primaries.js:28:3:28:4 | 42 | primaries.js:28:2:28:5 | (42) |
+| primaries.js:28:3:28:4 | 42 | primaries.js:28:1:28:7 | ((42)); |
 | primaries.js:29:1:29:13 | /\\2147483648/ | primaries.js:29:1:29:14 | /\\2147483648/; |
 | primaries.js:30:1:30:26 | /a{2147 ... 83649}/ | primaries.js:30:1:30:27 | /a{2147 ... 3649}/; |
 | primaries.js:31:1:31:16 | /a{-2147483648}/ | primaries.js:31:1:31:17 | /a{-2147483648}/; |
@@ -1182,8 +1165,7 @@ test_getParent
 | unary.js:5:1:5:13 | typeof Object | unary.js:5:1:5:14 | typeof Object; |
 | unary.js:5:8:5:13 | Object | unary.js:5:1:5:13 | typeof Object |
 | unary.js:6:1:6:7 | void(0) | unary.js:6:1:6:8 | void(0); |
-| unary.js:6:5:6:7 | (0) | unary.js:6:1:6:7 | void(0) |
-| unary.js:6:6:6:6 | 0 | unary.js:6:5:6:7 | (0) |
+| unary.js:6:6:6:6 | 0 | unary.js:6:1:6:7 | void(0) |
 | unary.js:7:1:7:23 | delete  ... ototype | unary.js:7:1:7:24 | delete  ... totype; |
 | unary.js:7:8:7:13 | Object | unary.js:7:8:7:23 | Object.prototype |
 | unary.js:7:8:7:23 | Object.prototype | unary.js:7:1:7:23 | delete  ... ototype |
@@ -1424,7 +1406,6 @@ test_getTopLevel
 | functions.js:1:10:1:10 | f | functions.js:1:1:10:7 | <toplevel> |
 | functions.js:2:2:2:5 | in_f | functions.js:1:1:10:7 | <toplevel> |
 | functions.js:3:9:3:17 | also_in_f | functions.js:1:1:10:7 | <toplevel> |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:1:1:10:7 | <toplevel> |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | functions.js:1:1:10:7 | <toplevel> |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:1:1:10:7 | <toplevel> |
 | functions.js:5:4:5:11 | not_in_f | functions.js:1:1:10:7 | <toplevel> |
@@ -1604,13 +1585,11 @@ test_getTopLevel
 | primaries.js:12:1:12:13 | "'what?'\\x0a" | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:13:1:13:10 | '"why?"\\n' | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:14:1:14:15 | /^(need?le)+/gi | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:15:1:15:4 | (23) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:15:2:15:3 | 23 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:2:16:3 | 23 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:6:16:7 | 42 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:12:16:15 | "hi" | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:4:17:4 | x | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:7:17:8 | 23 | primaries.js:1:1:32:17 | <toplevel> |
@@ -1644,8 +1623,6 @@ test_getTopLevel
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:27:8:27:28 | 'epytot ... verse() | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:27:20:27:26 | reverse | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:28:1:28:6 | ((42)) | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:28:2:28:5 | (42) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:28:3:28:4 | 42 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:29:1:29:13 | /\\2147483648/ | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:30:1:30:26 | /a{2147 ... 83649}/ | primaries.js:1:1:32:17 | <toplevel> |
@@ -1672,7 +1649,6 @@ test_getTopLevel
 | unary.js:5:1:5:13 | typeof Object | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:5:8:5:13 | Object | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:6:1:6:7 | void(0) | unary.js:1:1:7:24 | <toplevel> |
-| unary.js:6:5:6:7 | (0) | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:6:6:6:6 | 0 | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:7:1:7:23 | delete  ... ototype | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:7:8:7:13 | Object | unary.js:1:1:7:24 | <toplevel> |
@@ -1687,12 +1663,11 @@ test_getTopLevel
 | update.js:4:1:4:1 | b | update.js:1:1:5:0 | <toplevel> |
 | update.js:4:1:4:3 | b-- | update.js:1:1:5:0 | <toplevel> |
 test_stripParens
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
-| primaries.js:15:1:15:4 | (23) | primaries.js:15:2:15:3 | 23 |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} |
-| primaries.js:28:1:28:6 | ((42)) | primaries.js:28:3:28:4 | 42 |
-| primaries.js:28:2:28:5 | (42) | primaries.js:28:3:28:4 | 42 |
-| unary.js:6:5:6:7 | (0) | unary.js:6:6:6:6 | 0 |
+| functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
+| primaries.js:15:2:15:3 | 23 |
+| primaries.js:17:2:21:15 | { x: 23 ... (v) {}} |
+| primaries.js:28:3:28:4 | 42 |
+| unary.js:6:6:6:6 | 0 |
 test_getContainer
 | assignment2.ts:1:5:1:5 | a | assignment2.ts:1:1:9:8 | <toplevel> |
 | assignment2.ts:1:5:1:9 | a = 2 | assignment2.ts:1:1:9:8 | <toplevel> |
@@ -1921,7 +1896,6 @@ test_getContainer
 | functions.js:1:10:1:10 | f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:2:2:2:5 | in_f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:3:9:3:17 | also_in_f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:5:4:5:11 | not_in_f | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
@@ -2101,13 +2075,11 @@ test_getContainer
 | primaries.js:12:1:12:13 | "'what?'\\x0a" | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:13:1:13:10 | '"why?"\\n' | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:14:1:14:15 | /^(need?le)+/gi | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:15:1:15:4 | (23) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:15:2:15:3 | 23 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:2:16:3 | 23 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:6:16:7 | 42 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:16:12:16:15 | "hi" | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:4:17:4 | x | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:17:7:17:8 | 23 | primaries.js:1:1:32:17 | <toplevel> |
@@ -2141,8 +2113,6 @@ test_getContainer
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:27:8:27:28 | 'epytot ... verse() | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:27:20:27:26 | reverse | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:28:1:28:6 | ((42)) | primaries.js:1:1:32:17 | <toplevel> |
-| primaries.js:28:2:28:5 | (42) | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:28:3:28:4 | 42 | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:29:1:29:13 | /\\2147483648/ | primaries.js:1:1:32:17 | <toplevel> |
 | primaries.js:30:1:30:26 | /a{2147 ... 83649}/ | primaries.js:1:1:32:17 | <toplevel> |
@@ -2169,7 +2139,6 @@ test_getContainer
 | unary.js:5:1:5:13 | typeof Object | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:5:8:5:13 | Object | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:6:1:6:7 | void(0) | unary.js:1:1:7:24 | <toplevel> |
-| unary.js:6:5:6:7 | (0) | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:6:6:6:6 | 0 | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:7:1:7:23 | delete  ... ototype | unary.js:1:1:7:24 | <toplevel> |
 | unary.js:7:8:7:13 | Object | unary.js:1:1:7:24 | <toplevel> |
@@ -2382,7 +2351,6 @@ test_getEnclosingStmt
 | es2015.js:25:13:25:13 | 1 | es2015.js:25:2:25:15 | yield* foo(1); |
 | functions.js:2:2:2:5 | in_f | functions.js:2:2:2:6 | in_f; |
 | functions.js:3:9:3:17 | also_in_f | functions.js:3:2:8:5 | while ( ... n\\n\\t\\t}); |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:4:3:8:5 | (functi ... n\\n\\t\\t}); |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | functions.js:4:3:8:5 | (functi ... n\\n\\t\\t}); |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:4:3:8:5 | (functi ... n\\n\\t\\t}); |
 | functions.js:5:4:5:11 | not_in_f | functions.js:5:4:5:12 | not_in_f; |
@@ -2558,13 +2526,11 @@ test_getEnclosingStmt
 | primaries.js:12:1:12:13 | "'what?'\\x0a" | primaries.js:12:1:12:14 | "'what?'\\x0a"; |
 | primaries.js:13:1:13:10 | '"why?"\\n' | primaries.js:13:1:13:11 | '"why?"\\n'; |
 | primaries.js:14:1:14:15 | /^(need?le)+/gi | primaries.js:14:1:14:16 | /^(need?le)+/gi; |
-| primaries.js:15:1:15:4 | (23) | primaries.js:15:1:15:5 | (23); |
 | primaries.js:15:2:15:3 | 23 | primaries.js:15:1:15:5 | (23); |
 | primaries.js:16:1:16:17 | [23, 42, , "hi" ] | primaries.js:16:1:16:18 | [23, 42, , "hi" ]; |
 | primaries.js:16:2:16:3 | 23 | primaries.js:16:1:16:18 | [23, 42, , "hi" ]; |
 | primaries.js:16:6:16:7 | 42 | primaries.js:16:1:16:18 | [23, 42, , "hi" ]; |
 | primaries.js:16:12:16:15 | "hi" | primaries.js:16:1:16:18 | [23, 42, , "hi" ]; |
-| primaries.js:17:1:21:16 | ({ x: 2 ... v) {}}) | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
 | primaries.js:17:2:21:15 | { x: 23 ... (v) {}} | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
 | primaries.js:17:4:17:4 | x | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
 | primaries.js:17:7:17:8 | 23 | primaries.js:17:1:21:17 | ({ x: 2 ... ) {}}); |
@@ -2597,8 +2563,6 @@ test_getEnclosingStmt
 | primaries.js:27:8:27:26 | 'epytotorp'.reverse | primaries.js:27:1:27:30 | String[ ... rse()]; |
 | primaries.js:27:8:27:28 | 'epytot ... verse() | primaries.js:27:1:27:30 | String[ ... rse()]; |
 | primaries.js:27:20:27:26 | reverse | primaries.js:27:1:27:30 | String[ ... rse()]; |
-| primaries.js:28:1:28:6 | ((42)) | primaries.js:28:1:28:7 | ((42)); |
-| primaries.js:28:2:28:5 | (42) | primaries.js:28:1:28:7 | ((42)); |
 | primaries.js:28:3:28:4 | 42 | primaries.js:28:1:28:7 | ((42)); |
 | primaries.js:29:1:29:13 | /\\2147483648/ | primaries.js:29:1:29:14 | /\\2147483648/; |
 | primaries.js:30:1:30:26 | /a{2147 ... 83649}/ | primaries.js:30:1:30:27 | /a{2147 ... 3649}/; |
@@ -2625,7 +2589,6 @@ test_getEnclosingStmt
 | unary.js:5:1:5:13 | typeof Object | unary.js:5:1:5:14 | typeof Object; |
 | unary.js:5:8:5:13 | Object | unary.js:5:1:5:14 | typeof Object; |
 | unary.js:6:1:6:7 | void(0) | unary.js:6:1:6:8 | void(0); |
-| unary.js:6:5:6:7 | (0) | unary.js:6:1:6:8 | void(0); |
 | unary.js:6:6:6:6 | 0 | unary.js:6:1:6:8 | void(0); |
 | unary.js:7:1:7:23 | delete  ... ototype | unary.js:7:1:7:24 | delete  ... totype; |
 | unary.js:7:8:7:13 | Object | unary.js:7:1:7:24 | delete  ... totype; |
@@ -2705,7 +2668,6 @@ test_getEnclosingFunction
 | functions.js:1:10:1:10 | f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:2:2:2:5 | in_f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:3:9:3:17 | also_in_f | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:4:3:8:4 | (functi ... in\\n\\t\\t}) | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} | functions.js:1:1:9:1 | functio ... \\t\\t});\\n} |
 | functions.js:5:4:5:11 | not_in_f | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
@@ -2806,7 +2768,6 @@ test_inNullSensitiveContext
 | es2015.js:25:9:25:11 | foo |
 | es2015.js:28:19:28:19 | x |
 | es2015.js:28:21:28:22 | 19 |
-| functions.js:4:3:6:4 | (functi ... f;\\n\\t\\t}) |
 | functions.js:4:4:6:3 | functio ... _f;\\n\\t\\t} |
 | legacyletexpr.js:1:1:1:7 | console |
 | legacyletexpr.js:1:1:1:11 | console.log |
diff --git a/javascript/ql/test/library-tests/Flow/tests.expected b/javascript/ql/test/library-tests/Flow/tests.expected
index 90a17f638c92..b90bc827caeb 100644
--- a/javascript/ql/test/library-tests/Flow/tests.expected
+++ b/javascript/ql/test/library-tests/Flow/tests.expected
@@ -986,8 +986,6 @@ refinement_eval
 | refinements.js:17:10:17:10 | a | [a = non-zero value] | non-zero number |
 | refinements.js:17:10:17:10 | a | [a = null] | any null |
 | refinements.js:17:10:17:10 | a | [a = null] | any null |
-| refinements.js:28:7:28:16 | (typeof a) | [a = undefined] | 'undefined' |
-| refinements.js:28:7:28:16 | (typeof a) | [a = undefined] | 'undefined' |
 | refinements.js:28:7:28:19 | (typeof a)[0] | [a = undefined] | 'u' |
 | refinements.js:28:7:28:19 | (typeof a)[0] | [a = undefined] | 'u' |
 | refinements.js:28:7:28:27 | (typeof ... !== 'u' | [a = undefined] | false |
@@ -1000,10 +998,6 @@ refinement_eval
 | refinements.js:28:18:28:18 | 0 | [a = undefined] | 0 |
 | refinements.js:28:25:28:27 | 'u' | [a = undefined] | 'u' |
 | refinements.js:28:25:28:27 | 'u' | [a = undefined] | 'u' |
-| refinements.js:36:7:36:16 | (typeof a) | [a = anonymous function] | 'function' |
-| refinements.js:36:7:36:16 | (typeof a) | [a = anonymous function] | 'function' |
-| refinements.js:36:7:36:16 | (typeof a) | [a = object literal] | 'object' |
-| refinements.js:36:7:36:16 | (typeof a) | [a = object literal] | 'object' |
 | refinements.js:36:7:36:19 | (typeof a)[0] | [a = anonymous function] | 'f' |
 | refinements.js:36:7:36:19 | (typeof a)[0] | [a = anonymous function] | 'f' |
 | refinements.js:36:7:36:19 | (typeof a)[0] | [a = object literal] | 'o' |
diff --git a/javascript/ql/test/library-tests/HTML/HTMLElementAndHTMLAttribute/printAst.expected b/javascript/ql/test/library-tests/HTML/HTMLElementAndHTMLAttribute/printAst.expected
index f252910db6cd..5e2e3fca5482 100644
--- a/javascript/ql/test/library-tests/HTML/HTMLElementAndHTMLAttribute/printAst.expected
+++ b/javascript/ql/test/library-tests/HTML/HTMLElementAndHTMLAttribute/printAst.expected
@@ -23,7 +23,6 @@ nodes
 | tst.html:11:29:11:48 | (Script) | semmle.label | (Script) |
 | tst.html:11:29:11:48 | [ExprStmt] void(alert('Nope!')) | semmle.label | [ExprStmt] void(alert('Nope!')) |
 | tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | semmle.label | [UnaryExpr] void(alert('Nope!')) |
-| tst.html:11:33:11:48 | [ParExpr] (alert('Nope!')) | semmle.label | [ParExpr] (alert('Nope!')) |
 | tst.html:11:34:11:38 | [VarRef] alert | semmle.label | [VarRef] alert |
 | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | semmle.label | [CallExpr] alert('Nope!') |
 | tst.html:11:40:11:46 | [Literal] 'Nope!' | semmle.label | [Literal] 'Nope!' |
@@ -72,10 +71,8 @@ edges
 | tst.html:11:29:11:48 | (Script) | tst.html:11:29:11:48 | [ExprStmt] void(alert('Nope!')) | semmle.order | 0 |
 | tst.html:11:29:11:48 | [ExprStmt] void(alert('Nope!')) | tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | semmle.label | 1 |
 | tst.html:11:29:11:48 | [ExprStmt] void(alert('Nope!')) | tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | semmle.order | 1 |
-| tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | tst.html:11:33:11:48 | [ParExpr] (alert('Nope!')) | semmle.label | 1 |
-| tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | tst.html:11:33:11:48 | [ParExpr] (alert('Nope!')) | semmle.order | 1 |
-| tst.html:11:33:11:48 | [ParExpr] (alert('Nope!')) | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | semmle.label | 1 |
-| tst.html:11:33:11:48 | [ParExpr] (alert('Nope!')) | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | semmle.order | 1 |
+| tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | semmle.label | 1 |
+| tst.html:11:29:11:48 | [UnaryExpr] void(alert('Nope!')) | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | semmle.order | 1 |
 | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
 | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
 | tst.html:11:34:11:47 | [CallExpr] alert('Nope!') | tst.html:11:34:11:38 | [VarRef] alert | semmle.label | 0 |
diff --git a/javascript/ql/test/library-tests/JSDoc/Nodes/ParExpr_getDocumentation.qll b/javascript/ql/test/library-tests/JSDoc/Nodes/ParExpr_getDocumentation.qll
index e2f63af6b2e8..f2cb8b64b2ee 100644
--- a/javascript/ql/test/library-tests/JSDoc/Nodes/ParExpr_getDocumentation.qll
+++ b/javascript/ql/test/library-tests/JSDoc/Nodes/ParExpr_getDocumentation.qll
@@ -1,3 +1,5 @@
 import javascript
 
-query predicate test_ParExpr_getDocumentation(ParExpr pe, JSDoc res) { res = pe.getDocumentation() }
+query predicate test_ParExpr_getDocumentation(Expr e, JSDoc res) {
+  e.isParenthesized() and res = e.getDocumentation()
+}
diff --git a/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected b/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
index 8c243f7a804a..57eb10277f68 100644
--- a/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
+++ b/javascript/ql/test/library-tests/JSDoc/Nodes/tests.expected
@@ -477,8 +477,6 @@ test_JSDocNonNullableTypeExpr
 | tst.js:358:23:358:29 | !number | tst.js:358:24:358:29 | number | prefix |
 | tst.js:358:34:358:40 | !number | tst.js:358:35:358:40 | number | prefix |
 test_ParExpr_getDocumentation
-| tst.js:117:42:119:10 | ({\\n     ...      }) | tst.js:117:9:117:40 | /** @le ... ype} */ |
-| tst.js:259:40:259:50 | (new Foo()) | tst.js:259:11:259:38 | /** @ty ... ng>} */ |
 test_JSDocRestParameterTypeExpr
 | tst.js:237:32:237:39 | ...[number] | tst.js:237:32:237:39 | [number] |
 | tst.js:238:12:238:20 | ...number | tst.js:238:15:238:20 | number |
@@ -488,7 +486,6 @@ test_Parameter_getDocumentation
 test_ObjectExpr_getDocumentation
 | tst.js:48:25:48:36 | { 'x': 321 } | tst.js:48:12:48:23 | /** @dict */ |
 | tst.js:55:20:59:1 | {\\n  TRU ... BE: 0\\n} | tst.js:51:1:54:3 | /**\\n *  ... er}\\n */ |
-| tst.js:117:43:119:9 | {\\n      ...       } | tst.js:117:9:117:40 | /** @le ... ype} */ |
 | tst.js:192:27:192:36 | { x: 321 } | tst.js:192:12:192:25 | /** @struct */ |
 test_AssignExpr_getDocumentation
 | tst.js:12:1:12:29 | mynames ... 'stout' | tst.js:7:1:11:3 | /**\\n *  ... ng}\\n */ |
@@ -647,8 +644,6 @@ test_OtherExpr_getDocumentation
 | tst.js:104:9:104:16 | SubClass | tst.js:101:1:103:17 | /**\\n *  ... tDoc */ |
 | tst.js:104:18:104:26 | prototype | tst.js:101:1:103:17 | /**\\n *  ... tDoc */ |
 | tst.js:104:28:104:35 | toString | tst.js:101:1:103:17 | /**\\n *  ... tDoc */ |
-| tst.js:117:42:119:10 | ({\\n     ...      }) | tst.js:117:9:117:40 | /** @le ... ype} */ |
-| tst.js:117:43:119:9 | {\\n      ...       } | tst.js:117:9:117:40 | /** @le ... ype} */ |
 | tst.js:137:1:137:4 | goog | tst.js:131:1:136:3 | /**\\n *  ... age\\n */ |
 | tst.js:137:1:137:8 | goog.net | tst.js:131:1:136:3 | /**\\n *  ... age\\n */ |
 | tst.js:137:1:137:12 | goog.net.xpc | tst.js:131:1:136:3 | /**\\n *  ... age\\n */ |
@@ -728,8 +723,6 @@ test_OtherExpr_getDocumentation
 | tst.js:258:34:258:36 | foo | tst.js:258:1:258:28 | /** @ty ... ng>} */ |
 | tst.js:258:34:258:48 | foo = new Foo() | tst.js:258:1:258:28 | /** @ty ... ng>} */ |
 | tst.js:258:40:258:48 | new Foo() | tst.js:258:1:258:28 | /** @ty ... ng>} */ |
-| tst.js:259:40:259:50 | (new Foo()) | tst.js:259:11:259:38 | /** @ty ... ng>} */ |
-| tst.js:259:41:259:49 | new Foo() | tst.js:259:11:259:38 | /** @ty ... ng>} */ |
 | tst.js:266:1:266:3 | Bar | tst.js:261:1:265:3 | /**\\n *  ... e T\\n */ |
 | tst.js:273:5:273:9 | MyMap | tst.js:269:1:272:3 | /**\\n *  ... Val\\n */ |
 | tst.js:273:5:273:26 | MyMap = ... n() { } | tst.js:269:1:272:3 | /**\\n *  ... Val\\n */ |
diff --git a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
index c21fbad32923..3cd5315d7ea8 100644
--- a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
+++ b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
@@ -97,8 +97,8 @@ concatenationOperand
 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:19:19:23 | "two" |
 | tst.js:20:3:20:3 | x |
-| tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:15 | "three" |
+| tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:20:19:20:24 | "four" |
 | tst.js:21:10:21:10 | x |
 | tst.js:21:14:21:19 | "five" |
@@ -148,8 +148,8 @@ concatenationOperand
 | tst.js:105:19:105:23 | "foo" |
 | tst.js:105:27:105:31 | "bar" |
 | tst.js:106:11:106:15 | "foo" |
-| tst.js:106:19:106:33 | ("bar" + "baz") |
 | tst.js:106:20:106:24 | "bar" |
+| tst.js:106:20:106:32 | "bar" + "baz" |
 | tst.js:106:28:106:32 | "baz" |
 concatenationLeaf
 | closure.js:5:7:5:11 | 'one' |
@@ -190,7 +190,6 @@ concatenationLeaf
 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:19:19:23 | "two" |
 | tst.js:20:3:20:3 | x |
-| tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:15 | "three" |
 | tst.js:20:19:20:24 | "four" |
 | tst.js:21:10:21:10 | x |
@@ -233,7 +232,6 @@ concatenationLeaf
 | tst.js:105:19:105:23 | "foo" |
 | tst.js:105:27:105:31 | "bar" |
 | tst.js:106:11:106:15 | "foo" |
-| tst.js:106:19:106:33 | ("bar" + "baz") |
 | tst.js:106:20:106:24 | "bar" |
 | tst.js:106:28:106:32 | "baz" |
 concatenationNode
@@ -303,7 +301,6 @@ concatenationNode
 | tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") |
-| tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:15 | "three" |
 | tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:20:19:20:24 | "four" |
@@ -372,7 +369,6 @@ concatenationNode
 | tst.js:105:27:105:31 | "bar" |
 | tst.js:106:11:106:15 | "foo" |
 | tst.js:106:11:106:33 | "foo" + ...  "baz") |
-| tst.js:106:19:106:33 | ("bar" + "baz") |
 | tst.js:106:20:106:24 | "bar" |
 | tst.js:106:20:106:32 | "bar" + "baz" |
 | tst.js:106:28:106:32 | "baz" |
@@ -435,9 +431,9 @@ operand
 | tst.js:19:11:19:23 | "one" + "two" | 0 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:11:19:23 | "one" + "two" | 1 | tst.js:19:19:19:23 | "two" |
 | tst.js:20:3:20:3 | x | 0 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:3 | x | 1 | tst.js:20:8:20:25 | ("three" + "four") |
+| tst.js:20:3:20:3 | x | 1 | tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:20:3:20:25 | x += (" ... "four") | 0 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:25 | x += (" ... "four") | 1 | tst.js:20:8:20:25 | ("three" + "four") |
+| tst.js:20:3:20:25 | x += (" ... "four") | 1 | tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:20:9:20:24 | "three" + "four" | 0 | tst.js:20:9:20:15 | "three" |
 | tst.js:20:9:20:24 | "three" + "four" | 1 | tst.js:20:19:20:24 | "four" |
 | tst.js:21:10:21:19 | x + "five" | 0 | tst.js:21:10:21:10 | x |
@@ -492,7 +488,7 @@ operand
 | tst.js:105:11:105:31 | value + ... + "bar" | 0 | tst.js:105:11:105:23 | value + "foo" |
 | tst.js:105:11:105:31 | value + ... + "bar" | 1 | tst.js:105:27:105:31 | "bar" |
 | tst.js:106:11:106:33 | "foo" + ...  "baz") | 0 | tst.js:106:11:106:15 | "foo" |
-| tst.js:106:11:106:33 | "foo" + ...  "baz") | 1 | tst.js:106:19:106:33 | ("bar" + "baz") |
+| tst.js:106:11:106:33 | "foo" + ...  "baz") | 1 | tst.js:106:20:106:32 | "bar" + "baz" |
 | tst.js:106:20:106:32 | "bar" + "baz" | 0 | tst.js:106:20:106:24 | "bar" |
 | tst.js:106:20:106:32 | "bar" + "baz" | 1 | tst.js:106:28:106:32 | "baz" |
 nextLeaf
@@ -519,7 +515,7 @@ nextLeaf
 | tst.js:12:18:12:18 | y | tst.js:12:22:12:26 | "two" |
 | tst.js:14:3:14:3 | x | tst.js:14:8:14:13 | "last" |
 | tst.js:19:11:19:15 | "one" | tst.js:19:19:19:23 | "two" |
-| tst.js:20:3:20:3 | x | tst.js:20:8:20:25 | ("three" + "four") |
+| tst.js:20:3:20:3 | x | tst.js:20:9:20:15 | "three" |
 | tst.js:20:9:20:15 | "three" | tst.js:20:19:20:24 | "four" |
 | tst.js:21:10:21:10 | x | tst.js:21:14:21:19 | "five" |
 | tst.js:25:11:25:15 | "one" | tst.js:25:18:25:22 | "two" |
@@ -546,7 +542,7 @@ nextLeaf
 | tst.js:104:19:104:23 | "bar" | tst.js:104:27:104:31 | value |
 | tst.js:105:11:105:15 | value | tst.js:105:19:105:23 | "foo" |
 | tst.js:105:19:105:23 | "foo" | tst.js:105:27:105:31 | "bar" |
-| tst.js:106:11:106:15 | "foo" | tst.js:106:19:106:33 | ("bar" + "baz") |
+| tst.js:106:11:106:15 | "foo" | tst.js:106:20:106:24 | "bar" |
 | tst.js:106:20:106:24 | "bar" | tst.js:106:28:106:32 | "baz" |
 htmlRoot
 | html-concat.js:2:14:2:26 | `<b>${x}</b>` |
diff --git a/javascript/ql/test/library-tests/TypeInference/CallWithAnalyzedReturnFlow/CalleeNodeValue.expected b/javascript/ql/test/library-tests/TypeInference/CallWithAnalyzedReturnFlow/CalleeNodeValue.expected
index a2e93dab288d..5bc68de3d8f9 100644
--- a/javascript/ql/test/library-tests/TypeInference/CallWithAnalyzedReturnFlow/CalleeNodeValue.expected
+++ b/javascript/ql/test/library-tests/TypeInference/CallWithAnalyzedReturnFlow/CalleeNodeValue.expected
@@ -1,10 +1,10 @@
 | tst.js:1:18:1:24 | require | file://:0:0:0:0 | indefinite value (heap) |
 | tst.js:2:16:2:22 | require | file://:0:0:0:0 | indefinite value (heap) |
-| tst.js:4:1:4:14 | (function(){}) | tst.js:4:2:4:13 | anonymous function |
-| tst.js:5:1:5:23 | (functi ... urn; }) | tst.js:5:2:5:22 | anonymous function |
-| tst.js:6:1:6:28 | (functi ... rue; }) | tst.js:6:2:6:27 | anonymous function |
-| tst.js:7:1:7:55 | (functi ... lse; }) | tst.js:7:2:7:54 | anonymous function |
-| tst.js:8:1:8:31 | (functi ... own; }) | tst.js:8:2:8:30 | anonymous function |
+| tst.js:4:2:4:13 | function(){} | tst.js:4:2:4:13 | anonymous function |
+| tst.js:5:2:5:22 | functio ... turn; } | tst.js:5:2:5:22 | anonymous function |
+| tst.js:6:2:6:27 | functio ... true; } | tst.js:6:2:6:27 | anonymous function |
+| tst.js:7:2:7:54 | functio ... alse; } | tst.js:7:2:7:54 | anonymous function |
+| tst.js:8:2:8:30 | functio ... nown; } | tst.js:8:2:8:30 | anonymous function |
 | tst.js:11:5:11:6 | f1 | tst.js:10:5:10:19 | function f1 |
 | tst.js:14:5:14:6 | f2 | tst.js:13:5:13:19 | function f2 |
 | tst.js:15:5:15:6 | f2 | tst.js:13:5:13:19 | function f2 |
diff --git a/javascript/ql/test/library-tests/Util/tests.expected b/javascript/ql/test/library-tests/Util/tests.expected
index 69316fbd090e..67c02fd4f33f 100644
--- a/javascript/ql/test/library-tests/Util/tests.expected
+++ b/javascript/ql/test/library-tests/Util/tests.expected
@@ -6,7 +6,6 @@ capitalize
 | Xx | Xx |
 | Xx | xx |
 describeExpression
-| tst.js:1:1:15:2 | (functi ... !'';\\n}) | expression |
 | tst.js:1:2:15:1 | functio ...  !'';\\n} | expression |
 | tst.js:2:5:2:5 | v | use of variable 'v' |
 | tst.js:3:5:3:5 | o | use of variable 'o' |
diff --git a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
index ae3d98f8f143..2322d471560d 100644
--- a/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
+++ b/javascript/ql/test/query-tests/Expressions/CompareIdenticalValues/CompareIdenticalValues.expected
@@ -1,2 +1,2 @@
 | tst.js:11:10:11:15 | y <= y | This expression compares $@ to itself. | tst.js:11:10:11:10 | y | y |
-| tst.js:21:1:21:35 | (functi ... n() {}) | This expression compares $@ to itself. | tst.js:21:1:21:16 | (function() { }) | (function() { }) |
+| tst.js:21:1:21:35 | (functi ... n() {}) | This expression compares $@ to itself. | tst.js:21:2:21:15 | function() { } | function() { } |
diff --git a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
index 60c9c95e2484..b57299bde577 100644
--- a/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
+++ b/javascript/ql/test/query-tests/Expressions/HeterogeneousComparison/HeterogeneousComparison.expected
@@ -6,10 +6,10 @@
 | tst.js:17:1:17:4 | null | This expression is of type null, but it is compared to $@ of type number. | tst.js:17:9:17:9 | 0 | an expression |
 | tst.js:20:6:20:7 | 42 | This expression is of type number, but it is compared to $@ of type string. | tst.js:19:9:19:12 | "hi" | an expression |
 | tst.js:23:1:23:23 | Object. ... ) + "!" | This expression is of type string, but it is compared to $@ of type undefined. | tst.js:23:28:23:36 | undefined | 'undefined' |
-| tst.js:25:1:25:29 | (+f() \| ... + k())) | This expression is of type boolean, number or string, but it is compared to $@ of type undefined. | tst.js:25:34:25:42 | undefined | 'undefined' |
+| tst.js:25:2:25:28 | +f() \|\| ...  + k()) | This expression is of type boolean, number or string, but it is compared to $@ of type undefined. | tst.js:25:34:25:42 | undefined | 'undefined' |
 | tst.js:27:5:27:19 | !Module['load'] | This expression is of type boolean, but it is compared to $@ of type string. | tst.js:27:24:27:34 | 'undefined' | an expression |
 | tst.js:41:3:41:8 | number | Variable 'number' is of type number, but it is compared to $@ of type string. | tst.js:41:13:41:18 | "zero" | an expression |
-| tst.js:44:1:44:1 | 0 | This expression is of type number, but it is compared to $@ of type object or undefined. | tst.js:44:5:44:43 | (Math.r ... [1, 2]) | an expression |
+| tst.js:44:1:44:1 | 0 | This expression is of type number, but it is compared to $@ of type object or undefined. | tst.js:44:6:44:42 | Math.ra ...  [1, 2] | an expression |
 | tst.js:78:31:78:32 | x2 | Variable 'x2' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:78:38:78:41 | null | an expression |
 | tst.js:81:35:81:36 | x3 | Variable 'x3' is of type date, object or regular expression, but it is compared to $@ of type null. | tst.js:81:42:81:45 | null | an expression |
 | tst.js:91:5:91:6 | x5 | Variable 'x5' cannot be of type null, but it is compared to $@ of type null. | tst.js:91:12:91:15 | null | an expression |
diff --git a/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.expected b/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.expected
index 27b7fbea49d3..80c97a3dfd54 100644
--- a/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.expected
+++ b/javascript/ql/test/query-tests/Expressions/RedundantExpression/RedundantExpression.expected
@@ -1,6 +1,6 @@
 | tst.js:1:1:1:11 | (x + x) / 2 | Operands $@ and $@ are identical. | tst.js:1:2:1:2 | x | x | tst.js:1:6:1:6 | x | x |
 | tst.js:2:1:2:11 | e[i] - e[i] | Operands $@ and $@ are identical. | tst.js:2:1:2:4 | e[i] | e[i] | tst.js:2:8:2:11 | e[i] | e[i] |
-| tst.js:3:1:3:15 | (x + y)/(x + y) | Operands $@ and $@ are identical. | tst.js:3:1:3:7 | (x + y) | (x + y) | tst.js:3:9:3:15 | (x + y) | (x + y) |
+| tst.js:3:1:3:15 | (x + y)/(x + y) | Operands $@ and $@ are identical. | tst.js:3:2:3:6 | x + y | x + y | tst.js:3:10:3:14 | x + y | x + y |
 | tst.js:4:1:4:29 | window. ... .height | Operands $@ and $@ are identical. | tst.js:4:1:4:13 | window.height | window.height | tst.js:4:17:4:29 | window.height | window.height |
 | tst.js:5:1:5:18 | x == 23 \|\| x == 23 | Operands $@ and $@ are identical. | tst.js:5:1:5:7 | x == 23 | x == 23 | tst.js:5:12:5:18 | x == 23 | x == 23 |
 | tst.js:9:1:9:14 | pop() && pop() | Operands $@ and $@ are identical. | tst.js:9:1:9:5 | pop() | pop() | tst.js:9:10:9:14 | pop() | pop() |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
index 75d8c23b51f6..89a35c7ba6d7 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
+++ b/javascript/ql/test/query-tests/LanguageFeatures/PropertyWriteOnPrimitive/PropertyWriteOnPrimitive.expected
@@ -1,3 +1,3 @@
-| tst.js:1:1:1:3 | (0) | Assignment to property foo of a primitive value with type number. |
+| tst.js:1:2:1:2 | 0 | Assignment to property foo of a primitive value with type number. |
 | tst.js:8:5:8:5 | s | Assignment to a property of a primitive value with type string. |
 | tst.js:13:3:13:3 | x | Assignment to property y of a primitive value with type number or string. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
index f1d547bdfb1c..d45b1952868f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
@@ -188,9 +188,7 @@ edges
 | exec-sh.js:19:15:19:38 | url.par ... , true) | exec-sh.js:19:9:19:11 | cmd | provenance |  |
 | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:19:15:19:38 | url.par ... , true) | provenance |  |
 | exec-sh.js:20:12:20:14 | cmd | exec-sh.js:13:17:13:23 | command | provenance |  |
-| execSeries.js:3:20:3:22 | arr [0] | execSeries.js:5:3:10:4 | (functi ... );\\n  }) [arr, 0] | provenance |  |
 | execSeries.js:3:20:3:22 | arr [0] | execSeries.js:6:14:6:16 | arr [0] | provenance |  |
-| execSeries.js:5:3:10:4 | (functi ... );\\n  }) [arr, 0] | execSeries.js:6:14:6:16 | arr [0] | provenance |  |
 | execSeries.js:6:14:6:16 | arr [0] | execSeries.js:6:14:6:21 | arr[i++] | provenance |  |
 | execSeries.js:6:14:6:21 | arr[i++] | execSeries.js:14:24:14:30 | command | provenance |  |
 | execSeries.js:13:19:13:26 | commands [0] | execSeries.js:14:13:14:20 | commands [0] | provenance |  |
@@ -429,7 +427,6 @@ nodes
 | exec-sh.js:19:25:19:31 | req.url | semmle.label | req.url |
 | exec-sh.js:20:12:20:14 | cmd | semmle.label | cmd |
 | execSeries.js:3:20:3:22 | arr [0] | semmle.label | arr [0] |
-| execSeries.js:5:3:10:4 | (functi ... );\\n  }) [arr, 0] | semmle.label | (functi ... );\\n  }) [arr, 0] |
 | execSeries.js:6:14:6:16 | arr [0] | semmle.label | arr [0] |
 | execSeries.js:6:14:6:21 | arr[i++] | semmle.label | arr[i++] |
 | execSeries.js:13:19:13:26 | commands [0] | semmle.label | commands [0] |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
index fce55fec2936..c8e5ac24568b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
@@ -550,12 +550,10 @@ edges
 | tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
 | tst.js:14:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
 | tst.js:14:7:14:12 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
 | tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
 | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | params [MapValue] | provenance |  |
-| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
-| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
 | tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
@@ -779,8 +777,8 @@ edges
 | various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | provenance |  |
 | various-concat-obfuscations.js:12:19:12:25 | tainted | various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | provenance | Config |
 | various-concat-obfuscations.js:14:24:14:28 | attrs | various-concat-obfuscations.js:15:28:15:32 | attrs | provenance |  |
-| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | provenance | Config |
-| various-concat-obfuscations.js:15:28:15:32 | attrs | various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | provenance |  |
+| various-concat-obfuscations.js:15:28:15:32 | attrs | various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | provenance |  |
+| various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | provenance | Config |
 | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:32:18:36 | attrs | provenance |  |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | provenance |  |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) [ArrayElement] | provenance |  |
@@ -1182,8 +1180,6 @@ nodes
 | tst.js:9:28:9:33 | target | semmle.label | target |
 | tst.js:14:7:14:12 | params | semmle.label | params |
 | tst.js:14:7:14:12 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
 | tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
 | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
@@ -1442,8 +1438,8 @@ nodes
 | various-concat-obfuscations.js:12:19:12:25 | tainted | semmle.label | tainted |
 | various-concat-obfuscations.js:14:24:14:28 | attrs | semmle.label | attrs |
 | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | semmle.label | '<div a ... </div>' |
-| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | semmle.label | (attrs. ... 'left') |
 | various-concat-obfuscations.js:15:28:15:32 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | semmle.label | attrs.d ...  'left' |
 | various-concat-obfuscations.js:17:24:17:28 | attrs | semmle.label | attrs |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | semmle.label | '<div a ... 'left') |
 | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | semmle.label | '<div a ... ntent)) |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
index f8781e6741b9..84e6fe2f0731 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
@@ -489,8 +489,6 @@ nodes
 | tst.js:9:28:9:33 | target | semmle.label | target |
 | tst.js:14:7:14:12 | params | semmle.label | params |
 | tst.js:14:7:14:12 | params [MapValue] | semmle.label | params [MapValue] |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
 | tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
 | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | semmle.label | (new UR ... hParams [MapValue] |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
@@ -751,8 +749,8 @@ nodes
 | various-concat-obfuscations.js:12:19:12:25 | tainted | semmle.label | tainted |
 | various-concat-obfuscations.js:14:24:14:28 | attrs | semmle.label | attrs |
 | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | semmle.label | '<div a ... </div>' |
-| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | semmle.label | (attrs. ... 'left') |
 | various-concat-obfuscations.js:15:28:15:32 | attrs | semmle.label | attrs |
+| various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | semmle.label | attrs.d ...  'left' |
 | various-concat-obfuscations.js:17:24:17:28 | attrs | semmle.label | attrs |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | semmle.label | '<div a ... 'left') |
 | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | semmle.label | '<div a ... ntent)) |
@@ -1150,12 +1148,10 @@ edges
 | tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
 | tst.js:14:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
 | tst.js:14:7:14:12 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
-| tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
 | tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
 | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | params [MapValue] | provenance |  |
-| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
-| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
+| tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
 | tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
@@ -1380,8 +1376,8 @@ edges
 | various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | various-concat-obfuscations.js:12:4:12:41 | ["<div  ... .join() | provenance |  |
 | various-concat-obfuscations.js:12:19:12:25 | tainted | various-concat-obfuscations.js:12:4:12:34 | ["<div  ... "\\"/>"] | provenance | Config |
 | various-concat-obfuscations.js:14:24:14:28 | attrs | various-concat-obfuscations.js:15:28:15:32 | attrs | provenance |  |
-| various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | provenance | Config |
-| various-concat-obfuscations.js:15:28:15:32 | attrs | various-concat-obfuscations.js:15:27:15:55 | (attrs. ... 'left') | provenance |  |
+| various-concat-obfuscations.js:15:28:15:32 | attrs | various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | provenance |  |
+| various-concat-obfuscations.js:15:28:15:54 | attrs.d ...  'left' | various-concat-obfuscations.js:15:10:15:83 | '<div a ... </div>' | provenance | Config |
 | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:32:18:36 | attrs | provenance |  |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) | provenance |  |
 | various-concat-obfuscations.js:18:10:18:59 | '<div a ... 'left') | various-concat-obfuscations.js:18:10:18:88 | '<div a ... ntent)) [ArrayElement] | provenance |  |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
index d2de005f42ab..bb4947f11c75 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
@@ -431,10 +431,8 @@ edges
 | polynomial-redos.js:114:2:114:8 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
 | polynomial-redos.js:116:2:116:8 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
 | polynomial-redos.js:116:2:116:8 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | provenance |  |
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
-| polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
 | polynomial-redos.js:121:7:121:14 | replaced | polynomial-redos.js:123:13:123:20 | replaced | provenance |  |
 | polynomial-redos.js:121:18:121:24 | tainted | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | provenance |  |
 | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | polynomial-redos.js:121:7:121:14 | replaced | provenance |  |
@@ -657,7 +655,6 @@ nodes
 | polynomial-redos.js:116:2:116:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
-| polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | semmle.label | (functi ... os]\\n\\t}) [tainted] |
 | polynomial-redos.js:121:7:121:14 | replaced | semmle.label | replaced |
 | polynomial-redos.js:121:18:121:24 | tainted | semmle.label | tainted |
 | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | semmle.label | tainted ... /g, '') |