From 10fab9c09c2cb0e81a888436188d4a246707a4ac Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Wed, 3 May 2023 23:39:47 -0700
Subject: [PATCH 1/5] d2parser: Add test for leading whitespace bug

Updates #1279
---
 d2parser/parse_test.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go
index e8bcbfe02..92a956ce1 100644
--- a/d2parser/parse_test.go
+++ b/d2parser/parse_test.go
@@ -22,6 +22,7 @@ func TestParse(t *testing.T) {
 	testCases := []struct {
 		name string
 		text string
+		assert func(t testing.TB, ast *d2ast.Map, err error)
 
 		// exp is in testdata/d2parser/TestParse/${name}.json
 	}{
@@ -379,6 +380,14 @@ b-
 c-
 `,
 		},
+		{
+			name: "leading_whitespace_range",
+			text: `a -> b`,
+			assert: func(t testing.TB, ast *d2ast.Map, err error) {
+				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[0].Dst.Range.Start.String())
+				assert.Equal(t, "1:7", ast.Nodes[0].MapKey.Edges[0].Dst.Range.End.String())
+			},
+		},
 	}
 
 	for _, tc := range testCases {
@@ -389,6 +398,10 @@ c-
 			d2Path := fmt.Sprintf("d2/testdata/d2parser/%v.d2", t.Name())
 			ast, err := d2parser.Parse(d2Path, strings.NewReader(tc.text), nil)
 
+			if tc.assert != nil {
+				tc.assert(t, ast, err)
+			}
+
 			got := struct {
 				AST *d2ast.Map `json:"ast"`
 				Err error      `json:"err"`

From fa5eced013eee9bfceab83d15c6c61ef3ca7bc9e Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Thu, 4 May 2023 10:30:50 -0700
Subject: [PATCH 2/5] d2parser: Update whitespace range test

To include leading and trailing whitespace
---
 d2parser/parse_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go
index 92a956ce1..32784c1cc 100644
--- a/d2parser/parse_test.go
+++ b/d2parser/parse_test.go
@@ -381,11 +381,15 @@ c-
 `,
 		},
 		{
-			name: "leading_whitespace_range",
-			text: `a -> b`,
+			name: "whitespace_range",
+			text: `a -> b -> c`,
 			assert: func(t testing.TB, ast *d2ast.Map, err error) {
+				assert.Equal(t, "1:1", ast.Nodes[0].MapKey.Edges[0].Src.Range.Start.String())
+				assert.Equal(t, "1:2", ast.Nodes[0].MapKey.Edges[0].Src.Range.End.String())
 				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[0].Dst.Range.Start.String())
 				assert.Equal(t, "1:7", ast.Nodes[0].MapKey.Edges[0].Dst.Range.End.String())
+				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[1].Dst.Range.Start.String())
+				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[1].Dst.Range.End.String())
 			},
 		},
 	}

From e6b52a357fe37dd0f126baefd89f40983b860f52 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Thu, 4 May 2023 10:43:04 -0700
Subject: [PATCH 3/5] d2parser: Pass whitespace_range test

Closes #1279
---
 d2parser/parse.go                             |  6 +-
 d2parser/parse_test.go                        | 18 ++--
 .../TestParse/whitespace_range.exp.json       | 91 +++++++++++++++++++
 3 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 testdata/d2parser/TestParse/whitespace_range.exp.json

diff --git a/d2parser/parse.go b/d2parser/parse.go
index 1a205e959..162caf5af 100644
--- a/d2parser/parse.go
+++ b/d2parser/parse.go
@@ -919,11 +919,12 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) {
 			Start: p.pos,
 		},
 	}
-	defer k.Range.End.From(&p.pos)
 
 	defer func() {
 		if len(k.Path) == 0 {
 			k = nil
+		} else {
+			k.Range.End = k.Path[len(k.Path)-1].Unbox().GetRange().End
 		}
 	}()
 
@@ -948,6 +949,9 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) {
 			return k
 		}
 
+		if len(k.Path) == 0 {
+			k.Range.Start = s.GetRange().Start
+		}
 		k.Path = append(k.Path, &sb)
 
 		r, newlines, eof = p.peekNotSpace()
diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go
index 32784c1cc..b1c8dfb3d 100644
--- a/d2parser/parse_test.go
+++ b/d2parser/parse_test.go
@@ -20,8 +20,8 @@ func TestParse(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
-		name string
-		text string
+		name   string
+		text   string
 		assert func(t testing.TB, ast *d2ast.Map, err error)
 
 		// exp is in testdata/d2parser/TestParse/${name}.json
@@ -382,14 +382,14 @@ c-
 		},
 		{
 			name: "whitespace_range",
-			text: `a -> b -> c`,
+			text: ` a -> b -> c `,
 			assert: func(t testing.TB, ast *d2ast.Map, err error) {
-				assert.Equal(t, "1:1", ast.Nodes[0].MapKey.Edges[0].Src.Range.Start.String())
-				assert.Equal(t, "1:2", ast.Nodes[0].MapKey.Edges[0].Src.Range.End.String())
-				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[0].Dst.Range.Start.String())
-				assert.Equal(t, "1:7", ast.Nodes[0].MapKey.Edges[0].Dst.Range.End.String())
-				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[1].Dst.Range.Start.String())
-				assert.Equal(t, "1:6", ast.Nodes[0].MapKey.Edges[1].Dst.Range.End.String())
+				assert.Equal(t, "1:2", ast.Nodes[0].MapKey.Edges[0].Src.Range.Start.String())
+				assert.Equal(t, "1:3", ast.Nodes[0].MapKey.Edges[0].Src.Range.End.String())
+				assert.Equal(t, "1:7", ast.Nodes[0].MapKey.Edges[0].Dst.Range.Start.String())
+				assert.Equal(t, "1:8", ast.Nodes[0].MapKey.Edges[0].Dst.Range.End.String())
+				assert.Equal(t, "1:12", ast.Nodes[0].MapKey.Edges[1].Dst.Range.Start.String())
+				assert.Equal(t, "1:13", ast.Nodes[0].MapKey.Edges[1].Dst.Range.End.String())
 			},
 		},
 	}
diff --git a/testdata/d2parser/TestParse/whitespace_range.exp.json b/testdata/d2parser/TestParse/whitespace_range.exp.json
new file mode 100644
index 000000000..cf45c0693
--- /dev/null
+++ b/testdata/d2parser/TestParse/whitespace_range.exp.json
@@ -0,0 +1,91 @@
+{
+  "ast": {
+    "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:0:0-0:13:13",
+    "nodes": [
+      {
+        "map_key": {
+          "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:1:1-0:13:13",
+          "edges": [
+            {
+              "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:1:1-0:7:7",
+              "src": {
+                "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:1:1-0:2:2",
+                "path": [
+                  {
+                    "unquoted_string": {
+                      "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:1:1-0:2:2",
+                      "value": [
+                        {
+                          "string": "a",
+                          "raw_string": "a"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "src_arrow": "",
+              "dst": {
+                "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:6:6-0:7:7",
+                "path": [
+                  {
+                    "unquoted_string": {
+                      "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:6:6-0:7:7",
+                      "value": [
+                        {
+                          "string": "b",
+                          "raw_string": "b"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "dst_arrow": ">"
+            },
+            {
+              "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:6:6-0:12:12",
+              "src": {
+                "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:6:6-0:7:7",
+                "path": [
+                  {
+                    "unquoted_string": {
+                      "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:6:6-0:7:7",
+                      "value": [
+                        {
+                          "string": "b",
+                          "raw_string": "b"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "src_arrow": "",
+              "dst": {
+                "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:11:11-0:12:12",
+                "path": [
+                  {
+                    "unquoted_string": {
+                      "range": "d2/testdata/d2parser/TestParse/whitespace_range.d2,0:11:11-0:12:12",
+                      "value": [
+                        {
+                          "string": "c",
+                          "raw_string": "c"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "dst_arrow": ">"
+            }
+          ],
+          "primary": {},
+          "value": {}
+        }
+      }
+    ]
+  },
+  "err": null
+}

From e03e19b28bf6923124b1eb0119f67fa2ca0a7fab Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Fri, 5 May 2023 09:11:46 -0700
Subject: [PATCH 4/5] ta=1

---
 .../TestCLI_E2E/internal_linked_pdf.exp.pdf   | Bin 79993 -> 79993 bytes
 .../TestCompile/array-classes.exp.json        |   8 +-
 .../d2compiler/TestCompile/classes.exp.json   |   8 +-
 .../TestCompile/constraint_label.exp.json     |   4 +-
 testdata/d2compiler/TestCompile/edge.exp.json |   8 +-
 .../edge_arrowhead_fields.exp.json            |   8 +-
 .../edge_arrowhead_primary.exp.json           |   8 +-
 .../TestCompile/edge_chain.exp.json           |  20 +-
 .../TestCompile/edge_chain_map.exp.json       |  20 +-
 .../TestCompile/edge_column_index.exp.json    |   8 +-
 .../TestCompile/edge_exclusive_style.exp.json |   8 +-
 .../TestCompile/edge_flat_arrowhead.exp.json  |  16 +-
 .../edge_flat_label_arrowhead.exp.json        |   8 +-
 .../TestCompile/edge_index.exp.json           |  16 +-
 .../TestCompile/edge_index_map.exp.json       |  16 +-
 .../TestCompile/edge_index_nested.exp.json    |  16 +-
 .../edge_index_nested_cross_scope.exp.json    |  20 +-
 .../edge_key_group_flat_nested.exp.json       |  20 +-
 ..._key_group_flat_nested_underscore.exp.json |  12 +-
 ..._group_map_flat_nested_underscore.exp.json |  12 +-
 ...e_key_group_map_nested_underscore.exp.json |  12 +-
 .../TestCompile/edge_label_map.exp.json       |   8 +-
 .../d2compiler/TestCompile/edge_map.exp.json  |   8 +-
 .../TestCompile/edge_map_arrowhead.exp.json   |   8 +-
 .../TestCompile/edge_map_group_flat.exp.json  |  16 +-
 .../edge_map_group_semiflat.exp.json          |  16 +-
 .../TestCompile/edge_map_nested.exp.json      |   8 +-
 .../TestCompile/edge_map_nested_flat.exp.json |   8 +-
 .../TestCompile/edge_mixed_arrowhead.exp.json |  16 +-
 .../edge_non_shape_arrowhead.exp.json         |   8 +-
 .../edge_semiflat_arrowhead.exp.json          |  16 +-
 .../TestCompile/link-board-mixed.exp.json     |  16 +-
 .../TestCompile/self-referencing.exp.json     |   8 +-
 .../TestCompile/sequence-timestamp.exp.json   |   8 +-
 .../TestCompile/sequence_container.exp.json   |  32 +--
 .../TestCompile/sequence_container_2.exp.json |  16 +-
 .../TestCompile/sequence_scoping.exp.json     |  34 +--
 .../TestCompile/stroke-width.exp.json         |   4 +-
 .../table_connection_attr.exp.json            |   8 +-
 .../TestCompile/text-transform.exp.json       |   8 +-
 .../underscore_connection.exp.json            |  12 +-
 .../TestCompile/underscore_edge.exp.json      |   8 +-
 .../underscore_edge_chain.exp.json            |  20 +-
 .../underscore_edge_existing.exp.json         |  16 +-
 .../underscore_edge_index.exp.json            |  12 +-
 .../underscore_edge_nested.exp.json           |   8 +-
 .../TestCompile/wrong_column_index.exp.json   |   8 +-
 .../boards/scenarios_edge_index.exp.json      |  28 +--
 .../d2ir/TestCompile/edges/chain.exp.json     | 228 +++++++++---------
 .../d2ir/TestCompile/edges/nested.exp.json    |  48 ++--
 testdata/d2ir/TestCompile/edges/root.exp.json |  28 +--
 .../TestCompile/edges/underscore.exp.json     |  46 ++--
 .../fields/primary/nested.exp.json            |   8 +-
 .../TestCompile/fields/primary/root.exp.json  |   6 +-
 .../layers/errs/4/good_edge.exp.json          |  68 +++---
 .../d2ir/TestCompile/layers/root.exp.json     |  44 ++--
 .../d2ir/TestCompile/scenarios/edge.exp.json  | 108 ++++-----
 .../d2ir/TestCompile/scenarios/root.exp.json  | 108 ++++-----
 .../d2ir/TestCompile/steps/recursive.exp.json | 152 ++++++------
 testdata/d2ir/TestCompile/steps/root.exp.json | 120 ++++-----
 .../TestCreate/container_edge.exp.json        |   8 +-
 .../TestCreate/container_edge_label.exp.json  |   8 +-
 testdata/d2oracle/TestCreate/edge.exp.json    |   8 +-
 .../d2oracle/TestCreate/edge_nested.exp.json  |  12 +-
 .../d2oracle/TestCreate/edge_scope.exp.json   |   8 +-
 .../TestCreate/edge_scope_flat.exp.json       |   8 +-
 .../TestCreate/edge_scope_nested.exp.json     |   8 +-
 .../d2oracle/TestCreate/edge_unique.exp.json  |  44 ++--
 .../d2oracle/TestDelete/arrowhead.exp.json    |   8 +-
 .../TestDelete/arrowhead_label.exp.json       |   8 +-
 .../TestDelete/arrowhead_map.exp.json         |   8 +-
 .../TestDelete/arrowhead_shape.exp.json       |   8 +-
 testdata/d2oracle/TestDelete/chaos_1.exp.json |   8 +-
 .../d2oracle/TestDelete/children.exp.json     |   8 +-
 .../children_edge_conflicts.exp.json          |   8 +-
 .../children_edges_flat_conflicts.exp.json    |  20 +-
 .../children_multiple_conflicts.exp.json      |   8 +-
 .../TestDelete/children_scope.exp.json        |   8 +-
 .../delete_container_of_near.exp.json         |  86 +++----
 .../TestDelete/edge-only-style.exp.json       |   8 +-
 .../edge_both_identical_childs.exp.json       |  14 +-
 .../d2oracle/TestDelete/edge_common.exp.json  |   8 +-
 .../TestDelete/edge_common_2.exp.json         |   8 +-
 .../TestDelete/edge_conflict.exp.json         |  12 +-
 .../TestDelete/edge_decrement.exp.json        |  64 ++---
 .../d2oracle/TestDelete/edge_first.exp.json   |  20 +-
 .../TestDelete/edge_identical_child.exp.json  |  14 +-
 .../TestDelete/edge_key_style.exp.json        |   8 +-
 .../d2oracle/TestDelete/edge_last.exp.json    |  30 +--
 .../TestDelete/edge_map_style.exp.json        |   8 +-
 .../d2oracle/TestDelete/edge_middle.exp.json  |  28 +--
 .../TestDelete/flat_reserved.exp.json         |   8 +-
 .../TestDelete/hoist_edge_children.exp.json   |   8 +-
 .../TestDelete/nested_edge_key_style.exp.json |   8 +-
 .../d2oracle/TestDelete/node_in_edge.exp.json |  16 +-
 .../TestDelete/node_in_edge_last.exp.json     |  30 +--
 .../only_delete_edge_reserved.exp.json        |   8 +-
 .../only_delete_obj_reserved.exp.json         |   8 +-
 testdata/d2oracle/TestDelete/order_1.exp.json |   8 +-
 testdata/d2oracle/TestDelete/order_5.exp.json |  16 +-
 .../TestDelete/shape_sql_table.exp.json       |   8 +-
 .../TestDelete/underscore_remove.exp.json     |  16 +-
 .../TestMove/chain_connected_nested.exp.json  |  20 +-
 ..._connected_nested_no_extra_create.exp.json |  22 +-
 .../TestMove/connected_nested.exp.json        |   8 +-
 .../TestMove/edge_across_containers.exp.json  |  10 +-
 .../d2oracle/TestMove/edge_basic.exp.json     |   8 +-
 .../TestMove/edge_chain_basic.exp.json        |  20 +-
 .../TestMove/edge_chain_circular.exp.json     |  20 +-
 .../edge_chain_into_container.exp.json        |  22 +-
 .../edge_chain_out_container.exp.json         |  20 +-
 .../d2oracle/TestMove/edge_conflict.exp.json  |  12 +-
 .../TestMove/edge_into_container.exp.json     |  10 +-
 .../TestMove/edge_nested_basic.exp.json       |   8 +-
 .../TestMove/edge_out_of_container.exp.json   |   8 +-
 .../TestMove/full_edge_slice.exp.json         |  18 +-
 testdata/d2oracle/TestMove/gnarly_1.exp.json  |  38 +--
 ...ddle_container_generated_conflict.exp.json |  22 +-
 .../TestMove/move_out_of_edge.exp.json        |  14 +-
 .../TestMove/move_out_of_nested_edge.exp.json |  14 +-
 .../d2oracle/TestMove/nhooyr_two.exp.json     |   8 +-
 .../d2oracle/TestMove/parentheses.exp.json    |  10 +-
 .../TestMove/partial_edge_slice.exp.json      |   8 +-
 .../TestMove/underscore-connection.exp.json   |  12 +-
 .../underscore_edge_children.exp.json         |   8 +-
 .../underscore_edge_container_1.exp.json      |   8 +-
 .../underscore_edge_container_2.exp.json      |  10 +-
 .../underscore_edge_container_3.exp.json      |   8 +-
 .../underscore_edge_container_4.exp.json      |   8 +-
 .../underscore_edge_container_5.exp.json      |  10 +-
 .../TestMove/underscore_edge_split.exp.json   |   8 +-
 .../unique_name_with_references.exp.json      |  10 +-
 testdata/d2oracle/TestRename/arrows.exp.json  |   8 +-
 .../d2oracle/TestRename/arrows_chain.exp.json |  30 +--
 .../TestRename/arrows_complex.exp.json        |  14 +-
 .../TestRename/arrows_trim_common.exp.json    |  34 +--
 .../TestRename/arrows_trim_common_2.exp.json  |  42 ++--
 .../TestRename/complex_edge_1.exp.json        |  14 +-
 .../TestRename/complex_edge_2.exp.json        |  14 +-
 .../d2oracle/TestRename/container.exp.json    | 116 ++++-----
 testdata/d2oracle/TestRename/edges.exp.json   |  76 +++---
 testdata/d2oracle/TestSet/edge.exp.json       |   8 +-
 .../TestSet/edge_append_style.exp.json        |   8 +-
 testdata/d2oracle/TestSet/edge_chain.exp.json |  28 +--
 .../TestSet/edge_chain_append_style.exp.json  |  28 +--
 .../edge_chain_existing_style.exp.json        |  36 +--
 .../TestSet/edge_chain_nested_set.exp.json    |  28 +--
 .../edge_flat_merge_arrowhead.exp.json        |  28 +--
 .../d2oracle/TestSet/edge_index_case.exp.json |  16 +-
 .../TestSet/edge_index_merge_style.exp.json   |  28 +--
 .../TestSet/edge_index_nested.exp.json        |   8 +-
 .../TestSet/edge_key_and_key.exp.json         |  12 +-
 testdata/d2oracle/TestSet/edge_label.exp.json |   8 +-
 .../TestSet/edge_merge_arrowhead.exp.json     |   8 +-
 .../TestSet/edge_merge_style.exp.json         |   8 +-
 .../TestSet/edge_nested_label_set.exp.json    |   8 +-
 .../TestSet/edge_nested_style_set.exp.json    |   8 +-
 .../TestSet/edge_replace_arrowhead.exp.json   |   8 +-
 .../edge_replace_arrowhead_indexed.exp.json   |  16 +-
 .../TestSet/edge_set_arrowhead.exp.json       |   8 +-
 .../d2oracle/TestSet/label_primary.exp.json   |   8 +-
 .../d2oracle/TestSet/map_key_missing.exp.json |   8 +-
 .../d2oracle/TestSet/nested_alex.exp.json     |   8 +-
 .../TestSet/replace_arrowhead.exp.json        |   8 +-
 .../TestSet/replace_arrowhead_map.exp.json    |   8 +-
 .../TestSet/replace_edge_style.exp.json       |   8 +-
 .../TestSet/replace_edge_style_map.exp.json   |   8 +-
 testdata/d2parser/TestParse/()_keys.exp.json  |  18 +-
 testdata/d2parser/TestParse/edge.exp.json     |   4 +-
 .../TestParse/edge_group_value.exp.json       |   6 +-
 testdata/d2parser/TestParse/edge_key.exp.json |   2 +-
 .../TestParse/edge_line_continuation.exp.json |   4 +-
 .../edge_line_continuation_2.exp.json         |   4 +-
 testdata/d2parser/TestParse/errs.exp.json     |   6 +-
 .../d2parser/TestParse/key_with_edge.exp.json |   2 +-
 .../TestParse/less_than_edge#955.exp.json     |   2 +-
 .../TestParse/merged_shapes_#322.exp.json     |   6 +-
 .../TestParse/multiple_edges.exp.json         |  12 +-
 testdata/d2parser/TestParse/primary.exp.json  |   4 +-
 testdata/d2parser/TestParse/subst.exp.json    |   4 +-
 .../TestParse/table_and_class.exp.json        |  20 +-
 181 files changed, 1704 insertions(+), 1704 deletions(-)

diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index 8a90ed7e04d732b4e12f6219639f44f1e9fede66..f1cacfcac3a1d6d4364f31e45c288233a0fe208b 100644
GIT binary patch
delta 53
zcmezQf#v51mWC~i)uzg(29`i*pvk50o1fy6Sdyxs;bLWEU}S7y3WQ*}?ek0-Z!-Y^
D>$?y;

delta 53
zcmezQf#v51mWC~i)uzgZhQ_9bCgz%4`o8%oE{P?n3K}j}Mg~U42Brp3x$W~z8E-QI
E0P8^zIRF3v

diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json
index 5b8f0f4d7..4dfed8f49 100644
--- a/testdata/d2compiler/TestCompile/array-classes.exp.json
+++ b/testdata/d2compiler/TestCompile/array-classes.exp.json
@@ -506,7 +506,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:15:279",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:7:271",
+                  "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:6:270",
                   "path": [
                     {
                       "unquoted_string": {
@@ -523,7 +523,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:9:273-17:15:279",
+                  "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:10:274-17:15:279",
                   "path": [
                     {
                       "unquoted_string": {
@@ -694,7 +694,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:7:271",
+              "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:0:264-17:6:270",
               "path": [
                 {
                   "unquoted_string": {
@@ -768,7 +768,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:9:273-17:15:279",
+              "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,17:10:274-17:15:279",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json
index dc7045842..a96e1034f 100644
--- a/testdata/d2compiler/TestCompile/classes.exp.json
+++ b/testdata/d2compiler/TestCompile/classes.exp.json
@@ -550,7 +550,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:15:288",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:7:280",
+                  "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:6:279",
                   "path": [
                     {
                       "unquoted_string": {
@@ -567,7 +567,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:9:282-15:15:288",
+                  "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:10:283-15:15:288",
                   "path": [
                     {
                       "unquoted_string": {
@@ -723,7 +723,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:7:280",
+              "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:0:273-15:6:279",
               "path": [
                 {
                   "unquoted_string": {
@@ -797,7 +797,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:9:282-15:15:288",
+              "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:10:283-15:15:288",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json
index f85092e4c..9441a3351 100644
--- a/testdata/d2compiler/TestCompile/constraint_label.exp.json
+++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-3:1:38",
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -135,7 +135,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2compiler/TestCompile/constraint_label.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json
index f888ec849..dec4dc8ec 100644
--- a/testdata/d2compiler/TestCompile/edge.exp.json
+++ b/testdata/d2compiler/TestCompile/edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index b5b40590e..4ad934650 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -342,7 +342,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -389,7 +389,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
index 8d8ed8127..80b30f4a5 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -178,7 +178,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -225,7 +225,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index 539f25157..529cfb405 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:55:56",
             "edges": [
               {
-                "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:7:8",
+                "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:11:12",
+                "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:11:12",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:9:10-1:11:12",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:10:11-1:11:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -198,7 +198,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -245,7 +245,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -265,7 +265,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -312,7 +312,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:9:10-1:11:12",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:10:11-1:11:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index 79bb97959..d0140ae67 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-3:1:106",
             "edges": [
               {
-                "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:7:8",
+                "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:11:12",
+                "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:11:12",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:9:10-1:11:12",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:10:11-1:11:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -227,7 +227,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -274,7 +274,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -294,7 +294,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -341,7 +341,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:9:10-1:11:12",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,1:10:11-1:11:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index 1921eab2b..4d9b52f8f 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -268,7 +268,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:6:107",
                   "path": [
                     {
                       "unquoted_string": {
@@ -296,7 +296,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:21:122",
                   "path": [
                     {
                       "unquoted_string": {
@@ -419,7 +419,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:21:122",
               "path": [
                 {
                   "unquoted_string": {
@@ -557,7 +557,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:6:107",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
index 7a53845c0..bd1d26af7 100644
--- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -168,7 +168,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -215,7 +215,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_exclusive_style.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index 650bd2797..a5a83a569 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:7:14",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:3:10",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:2:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:5:12-1:7:14",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:6:13-1:7:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -230,7 +230,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -250,7 +250,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:3:10",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:1:8-1:2:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -297,7 +297,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -317,7 +317,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:5:12-1:7:14",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:6:13-1:7:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index ad7c1b473..702e516fe 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index ca945bea7..aeb34ecb9 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -68,7 +68,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:7:20",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:3:16",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:2:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -85,7 +85,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:5:18-2:7:20",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:6:19-2:7:20",
                   "path": [
                     {
                       "unquoted_string": {
@@ -193,7 +193,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -213,7 +213,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:3:16",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:1:14-2:2:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -260,7 +260,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -280,7 +280,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:5:18-2:7:20",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:6:19-2:7:20",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index 0cafc323b..9416b5b07 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:7:15",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:3:11",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:2:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:5:13-2:7:15",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:6:14-2:7:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -212,7 +212,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -232,7 +232,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:3:11",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:1:9-2:2:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -279,7 +279,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -299,7 +299,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:5:13-2:7:15",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,2:6:14-2:7:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index d0c580715..c279ce0a2 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:7:13",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:3:9",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:2:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:5:11-2:7:13",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:6:12-2:7:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -92,7 +92,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:8:27",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:4:23",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:3:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -109,7 +109,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:6:25-3:8:27",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:7:26-3:8:27",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -269,7 +269,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:3:9",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:1:7-2:2:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -289,7 +289,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:4:23",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:2:21-3:3:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -336,7 +336,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:5:11-2:7:13",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:6:12-2:7:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -356,7 +356,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:6:25-3:8:27",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:7:26-3:8:27",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index 312d38e8d..be517f33a 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:7:13",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:3:9",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:2:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:5:11-2:7:13",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:6:12-2:7:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -94,7 +94,7 @@
           "map_key": {
             "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:18:39",
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:2:23",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:1:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -113,7 +113,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:9:30",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:5:26",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:4:25",
                   "path": [
                     {
                       "unquoted_string": {
@@ -130,7 +130,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:7:28-4:9:30",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:8:29-4:9:30",
                   "path": [
                     {
                       "unquoted_string": {
@@ -258,7 +258,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:2:23",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:0:21-4:1:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -305,7 +305,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:3:9",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:1:7-2:2:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -325,7 +325,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:5:26",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:3:24-4:4:25",
               "path": [
                 {
                   "unquoted_string": {
@@ -372,7 +372,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:5:11-2:7:13",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:6:12-2:7:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -392,7 +392,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:7:28-4:9:30",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:8:29-4:9:30",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
index bcad40145..37936ebcd 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:8:14",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:4:10",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:3:9",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:6:12-2:8:14",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:7:13-2:8:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -84,7 +84,7 @@
           "map_key": {
             "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:32:49",
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:2:19",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:1:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -103,7 +103,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:9:26",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:5:22",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:4:21",
                   "path": [
                     {
                       "unquoted_string": {
@@ -120,7 +120,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:7:24-4:9:26",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:8:25-4:9:26",
                   "path": [
                     {
                       "unquoted_string": {
@@ -275,7 +275,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:2:19",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:0:17-4:1:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -322,7 +322,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:4:10",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:2:8-2:3:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -342,7 +342,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:5:22",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:3:20-4:4:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -389,7 +389,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:6:12-2:8:14",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,2:7:13-2:8:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -409,7 +409,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:7:24-4:9:26",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.d2,4:8:25-4:9:26",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
index d3c7ca6ed..ef5091d56 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -82,7 +82,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:12:25",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:6:19",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:2:15-3:5:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -110,7 +110,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:8:21-3:12:25",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,3:9:22-3:12:25",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -261,7 +261,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -308,7 +308,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
index 63647e828..a8a8a8b04 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -82,7 +82,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:12:25",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:6:19",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:2:15-3:5:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -110,7 +110,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:8:21-3:12:25",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,3:9:22-3:12:25",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -274,7 +274,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -321,7 +321,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
index 7da55f2d6..893b3ec82 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -82,7 +82,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:12:25",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:6:19",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:2:15-3:5:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -110,7 +110,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:8:21-3:12:25",
+                            "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,3:9:22-3:12:25",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -292,7 +292,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -339,7 +339,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
index 4be3fe8c2..07d7b8c0c 100644
--- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:14:14",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:7:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:9:9-0:14:14",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:10:10-0:14:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -179,7 +179,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:7:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:0:0-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -226,7 +226,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:9:9-0:14:14",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_label_map.d2,0:10:10-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index a5431b793..89c09dbfb 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -158,7 +158,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -205,7 +205,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index 88a53d3d2..592d3f381 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -207,7 +207,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -254,7 +254,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
index a3524f7da..1741fcde2 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:7:15",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:3:11",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:2:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:5:13-2:7:15",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:6:14-2:7:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -210,7 +210,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -230,7 +230,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:3:11",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:1:9-2:2:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -277,7 +277,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -297,7 +297,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:5:13-2:7:15",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_flat.d2,2:6:14-2:7:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
index 630447498..d33c5a281 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:7:14",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:3:10",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:2:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:5:12-1:7:14",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:6:13-1:7:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -228,7 +228,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -248,7 +248,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:3:10",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:1:8-1:2:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -295,7 +295,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -315,7 +315,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:5:12-1:7:14",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_group_semiflat.d2,1:6:13-1:7:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
index ef5f4f2e8..861726cd5 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -187,7 +187,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -234,7 +234,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
index 11f5a9a8e..b59517440 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -169,7 +169,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -216,7 +216,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_map_nested_flat.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index 100752bf7..8ae05a29c 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -108,7 +108,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:7:53",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:3:49",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:2:48",
                   "path": [
                     {
                       "unquoted_string": {
@@ -125,7 +125,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:5:51-3:7:53",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:6:52-3:7:53",
                   "path": [
                     {
                       "unquoted_string": {
@@ -318,7 +318,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -338,7 +338,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:3:49",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:1:47-3:2:48",
               "path": [
                 {
                   "unquoted_string": {
@@ -385,7 +385,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -405,7 +405,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:5:51-3:7:53",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,3:6:52-3:7:53",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index 9684e7d9b..762bf710a 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index e1998a59b..cb3102c6c 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:7:14",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:3:10",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:2:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:5:12-1:7:14",
+                  "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:6:13-1:7:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -248,7 +248,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -268,7 +268,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:3:10",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:1:8-1:2:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -315,7 +315,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -335,7 +335,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:5:12-1:7:14",
+              "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,1:6:13-1:7:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
index 5026294ec..3130fecd5 100644
--- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
@@ -136,7 +136,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89",
+                                      "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -153,7 +153,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101",
+                                      "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -557,7 +557,7 @@
                                       {
                                         "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101",
                                         "src": {
-                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89",
+                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -574,7 +574,7 @@
                                         },
                                         "src_arrow": "",
                                         "dst": {
-                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101",
+                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -797,7 +797,7 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89",
+                  "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88",
                   "path": [
                     {
                       "unquoted_string": {
@@ -844,7 +844,7 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101",
+                  "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101",
                   "path": [
                     {
                       "unquoted_string": {
@@ -1026,7 +1026,7 @@
                                       {
                                         "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101",
                                         "src": {
-                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:12:89",
+                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -1043,7 +1043,7 @@
                                         },
                                         "src_arrow": "",
                                         "dst": {
-                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:14:91-5:24:101",
+                                          "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101",
                                           "path": [
                                             {
                                               "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json
index 4529e7133..88f3bf8f3 100644
--- a/testdata/d2compiler/TestCompile/self-referencing.exp.json
+++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -139,7 +139,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile/self-referencing.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index b72c145c3..ec9e1b268 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -173,7 +173,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:10:130",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:6:126",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:5:125",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -190,7 +190,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:8:128-7:10:130",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:9:129-7:10:130",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -341,7 +341,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:6:126",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:4:124-7:5:125",
               "path": [
                 {
                   "unquoted_string": {
@@ -408,7 +408,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:8:128-7:10:130",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,7:9:129-7:10:130",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index e99e98406..7397f55e3 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -45,7 +45,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:14:38",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30",
+                  "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29",
                   "path": [
                     {
                       "unquoted_string": {
@@ -84,7 +84,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38",
+                  "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38",
                   "path": [
                     {
                       "unquoted_string": {
@@ -159,7 +159,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:15:60",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52",
+                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -198,7 +198,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60",
+                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -347,7 +347,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29",
               "path": [
                 {
                   "unquoted_string": {
@@ -389,7 +389,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -458,7 +458,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29",
               "path": [
                 {
                   "unquoted_string": {
@@ -500,7 +500,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -569,7 +569,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:6:30",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:0:24-1:5:29",
               "path": [
                 {
                   "unquoted_string": {
@@ -611,7 +611,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:7:52",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:1:46-3:6:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -680,7 +680,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38",
               "path": [
                 {
                   "unquoted_string": {
@@ -722,7 +722,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60",
               "path": [
                 {
                   "unquoted_string": {
@@ -791,7 +791,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38",
               "path": [
                 {
                   "unquoted_string": {
@@ -833,7 +833,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60",
               "path": [
                 {
                   "unquoted_string": {
@@ -902,7 +902,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:8:32-1:14:38",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,1:9:33-1:14:38",
               "path": [
                 {
                   "unquoted_string": {
@@ -944,7 +944,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:9:54-3:15:60",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,3:10:55-3:15:60",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index d243d21d7..5a23fa225 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -114,7 +114,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:15:51",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43",
+                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -153,7 +153,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51",
+                            "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -335,7 +335,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42",
               "path": [
                 {
                   "unquoted_string": {
@@ -446,7 +446,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42",
               "path": [
                 {
                   "unquoted_string": {
@@ -557,7 +557,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:7:43",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:1:37-3:6:42",
               "path": [
                 {
                   "unquoted_string": {
@@ -673,7 +673,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -742,7 +742,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -811,7 +811,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:9:45-3:15:51",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,3:10:46-3:15:51",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index a16a4da10..e539e5d0f 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -139,7 +139,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:10:57",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -156,7 +156,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -185,7 +185,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:16:74",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -213,7 +213,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -253,7 +253,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:19:94",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -292,7 +292,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94",
+                                      "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -534,7 +534,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:6:53",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:4:51-4:5:52",
               "path": [
                 {
                   "unquoted_string": {
@@ -554,7 +554,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66",
               "path": [
                 {
                   "unquoted_string": {
@@ -632,7 +632,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:8:55-4:10:57",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,4:9:56-4:10:57",
               "path": [
                 {
                   "unquoted_string": {
@@ -652,7 +652,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74",
               "path": [
                 {
                   "unquoted_string": {
@@ -683,7 +683,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86",
               "path": [
                 {
                   "unquoted_string": {
@@ -725,7 +725,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94",
               "path": [
                 {
                   "unquoted_string": {
@@ -830,7 +830,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:9:67",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:4:62-5:8:66",
               "path": [
                 {
                   "unquoted_string": {
@@ -888,7 +888,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:11:69-5:16:74",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,5:12:70-5:16:74",
               "path": [
                 {
                   "unquoted_string": {
@@ -919,7 +919,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86",
               "path": [
                 {
                   "unquoted_string": {
@@ -961,7 +961,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:14:89-6:19:94",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:15:90-6:19:94",
               "path": [
                 {
                   "unquoted_string": {
@@ -1019,7 +1019,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:12:87",
+              "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,6:4:79-6:11:86",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json
index 4f6868c69..4d6854ed7 100644
--- a/testdata/d2compiler/TestCompile/stroke-width.exp.json
+++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-2:1:31",
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -109,7 +109,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2compiler/TestCompile/stroke-width.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index 32b14aa78..ce190463d 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -182,7 +182,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:10:70",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:4:64",
+                  "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:3:63",
                   "path": [
                     {
                       "unquoted_string": {
@@ -210,7 +210,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:6:66-8:10:70",
+                  "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:7:67-8:10:70",
                   "path": [
                     {
                       "unquoted_string": {
@@ -382,7 +382,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:4:64",
+              "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:0:60-8:3:63",
               "path": [
                 {
                   "unquoted_string": {
@@ -492,7 +492,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:6:66-8:10:70",
+              "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,8:7:67-8:10:70",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json
index 7a15df912..19be4223d 100644
--- a/testdata/d2compiler/TestCompile/text-transform.exp.json
+++ b/testdata/d2compiler/TestCompile/text-transform.exp.json
@@ -45,7 +45,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:6:23",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:2:19",
+                  "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:1:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -62,7 +62,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:4:21-1:6:23",
+                  "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:5:22-1:6:23",
                   "path": [
                     {
                       "unquoted_string": {
@@ -344,7 +344,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:2:19",
+              "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:0:17-1:1:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -437,7 +437,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:4:21-1:6:23",
+              "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,1:5:22-1:6:23",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
index 0ede3dff7..5aa625846 100644
--- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:16:21",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -239,7 +239,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -281,7 +281,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -350,7 +350,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -419,7 +419,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:10:15-1:16:21",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_connection.d2,1:11:16-1:16:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
index e2e362d3e..09d2123ac 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:12:18",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:6:12",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:5:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:8:14-2:12:18",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:9:15-2:12:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -190,7 +190,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:8:14-2:12:18",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:9:15-2:12:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -248,7 +248,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:6:12",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge.d2,2:2:8-2:5:11",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
index b172abb7c..67ed11d4f 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
@@ -34,9 +34,9 @@
                       "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:19:25",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:13:19",
+                          "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:12:18",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:6:12",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:5:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -93,9 +93,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:19:25",
+                          "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:19:25",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -123,7 +123,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:15:21-2:19:25",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:16:22-2:19:25",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -281,7 +281,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -312,7 +312,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:8:14-2:13:19",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:9:15-2:12:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -370,7 +370,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:6:12",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:2:8-2:5:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -428,7 +428,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:15:21-2:19:25",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_chain.d2,2:16:22-2:19:25",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index 45d5e9c44..b74d8611b 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -92,7 +92,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:11:95",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:5:89",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:4:88",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -120,7 +120,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:7:91-3:11:95",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:8:92-3:11:95",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -268,7 +268,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -288,7 +288,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:5:89",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:1:85-3:4:88",
               "path": [
                 {
                   "unquoted_string": {
@@ -346,7 +346,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -366,7 +366,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:7:91-3:11:95",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:8:92-3:11:95",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index cfc16dc74..f164aee76 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -92,7 +92,7 @@
                         {
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:12:96",
                           "src": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:6:90",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:2:86-3:5:89",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -120,7 +120,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:8:92-3:12:96",
+                            "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:9:93-3:12:96",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -244,7 +244,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -291,7 +291,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
index 436f040f2..7c462ae53 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
@@ -60,7 +60,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:14:26",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:8:20",
+                                      "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:7:19",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -99,7 +99,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:10:22-3:14:26",
+                                      "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:11:23-3:14:26",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -277,7 +277,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:10:22-3:14:26",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:11:23-3:14:26",
               "path": [
                 {
                   "unquoted_string": {
@@ -335,7 +335,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:8:20",
+              "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_nested.d2,3:2:14-3:7:19",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index 1d80ecd54..af890238e 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -628,7 +628,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:53:406",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:36:389",
+                  "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:35:388",
                   "path": [
                     {
                       "unquoted_string": {
@@ -656,7 +656,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:38:391-17:53:406",
+                  "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:39:392-17:53:406",
                   "path": [
                     {
                       "unquoted_string": {
@@ -779,7 +779,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:38:391-17:53:406",
+              "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:39:392-17:53:406",
               "path": [
                 {
                   "unquoted_string": {
@@ -1029,7 +1029,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:36:389",
+              "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,17:0:353-17:35:388",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
index 1ae53eaf1..6e3e364fc 100644
--- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -106,7 +106,7 @@
                                   {
                                     "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39",
                                     "src": {
-                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35",
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -123,7 +123,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39",
+                                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -261,7 +261,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -308,7 +308,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -364,7 +364,7 @@
                   {
                     "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6",
                     "src": {
-                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2",
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1",
                       "path": [
                         {
                           "unquoted_string": {
@@ -381,7 +381,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6",
+                      "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6",
                       "path": [
                         {
                           "unquoted_string": {
@@ -458,7 +458,7 @@
                                       {
                                         "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39",
                                         "src": {
-                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35",
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -475,7 +475,7 @@
                                         },
                                         "src_arrow": "",
                                         "dst": {
-                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39",
+                                          "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -620,7 +620,7 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -640,7 +640,7 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:7:35",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34",
                   "path": [
                     {
                       "unquoted_string": {
@@ -687,7 +687,7 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -707,7 +707,7 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:9:37-4:11:39",
+                  "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39",
                   "path": [
                     {
                       "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json
index bc664a60b..ea4624895 100644
--- a/testdata/d2ir/TestCompile/edges/chain.exp.json
+++ b/testdata/d2ir/TestCompile/edges/chain.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+            "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -31,9 +31,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+              "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -71,9 +71,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -108,9 +108,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -127,7 +127,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -145,9 +145,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -164,7 +164,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -203,7 +203,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+            "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -220,9 +220,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+              "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -239,7 +239,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -260,9 +260,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -279,7 +279,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -297,9 +297,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -316,7 +316,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -334,9 +334,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -353,7 +353,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -387,7 +387,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+            "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -404,9 +404,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+              "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -423,7 +423,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -444,9 +444,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -463,7 +463,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -481,9 +481,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -500,7 +500,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -518,9 +518,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -537,7 +537,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -576,7 +576,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+            "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
             "path": [
               {
                 "unquoted_string": {
@@ -593,9 +593,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+              "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -612,7 +612,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -633,9 +633,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -652,7 +652,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -670,9 +670,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -689,7 +689,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -707,9 +707,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -726,7 +726,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -760,7 +760,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+            "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
             "path": [
               {
                 "unquoted_string": {
@@ -777,9 +777,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+              "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -796,7 +796,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                 "path": [
                   {
                     "unquoted_string": {
@@ -817,9 +817,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -836,7 +836,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -854,9 +854,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -873,7 +873,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -891,9 +891,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -910,7 +910,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -949,7 +949,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+            "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
             "path": [
               {
                 "unquoted_string": {
@@ -966,9 +966,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+              "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -985,7 +985,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1006,9 +1006,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1025,7 +1025,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1043,9 +1043,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1062,7 +1062,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1080,9 +1080,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1099,7 +1099,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1142,9 +1142,9 @@
         {
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+              "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1161,7 +1161,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1182,9 +1182,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1201,7 +1201,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1219,9 +1219,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1238,7 +1238,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1256,9 +1256,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1275,7 +1275,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1316,9 +1316,9 @@
         {
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+              "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1335,7 +1335,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1356,9 +1356,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1375,7 +1375,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1393,9 +1393,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1412,7 +1412,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1430,9 +1430,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1449,7 +1449,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1490,9 +1490,9 @@
         {
           "context": {
             "edge": {
-              "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+              "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
               "src": {
-                "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1509,7 +1509,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1530,9 +1530,9 @@
               "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16",
               "edges": [
                 {
-                  "range": "TestCompile/edges/chain.d2,0:0:0-0:7:7",
+                  "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1549,7 +1549,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1567,9 +1567,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:4:4-0:12:12",
+                  "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:4:4-0:7:7",
+                    "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1586,7 +1586,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1604,9 +1604,9 @@
                   "dst_arrow": ">"
                 },
                 {
-                  "range": "TestCompile/edges/chain.d2,0:9:9-0:16:16",
+                  "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16",
                   "src": {
-                    "range": "TestCompile/edges/chain.d2,0:9:9-0:12:12",
+                    "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1623,7 +1623,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/chain.d2,0:14:14-0:16:16",
+                    "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json
index 437b37474..06d098b77 100644
--- a/testdata/d2ir/TestCompile/edges/nested.exp.json
+++ b/testdata/d2ir/TestCompile/edges/nested.exp.json
@@ -18,7 +18,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                  "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -48,7 +48,7 @@
                   "edge": {
                     "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                     "src": {
-                      "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                      "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                       "path": [
                         {
                           "unquoted_string": {
@@ -76,7 +76,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                      "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                       "path": [
                         {
                           "unquoted_string": {
@@ -110,7 +110,7 @@
                       {
                         "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                         "src": {
-                          "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                          "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                           "path": [
                             {
                               "unquoted_string": {
@@ -138,7 +138,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                          "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                           "path": [
                             {
                               "unquoted_string": {
@@ -189,7 +189,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+            "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
             "path": [
               {
                 "unquoted_string": {
@@ -219,7 +219,7 @@
             "edge": {
               "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
               "src": {
-                "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                 "path": [
                   {
                     "unquoted_string": {
@@ -247,7 +247,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                 "path": [
                   {
                     "unquoted_string": {
@@ -281,7 +281,7 @@
                 {
                   "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                   "src": {
-                    "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                    "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                     "path": [
                       {
                         "unquoted_string": {
@@ -309,7 +309,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                    "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                     "path": [
                       {
                         "unquoted_string": {
@@ -363,7 +363,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                  "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -393,7 +393,7 @@
                   "edge": {
                     "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                     "src": {
-                      "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                      "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                       "path": [
                         {
                           "unquoted_string": {
@@ -421,7 +421,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                      "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                       "path": [
                         {
                           "unquoted_string": {
@@ -455,7 +455,7 @@
                       {
                         "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                         "src": {
-                          "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                          "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                           "path": [
                             {
                               "unquoted_string": {
@@ -483,7 +483,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                          "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                           "path": [
                             {
                               "unquoted_string": {
@@ -534,7 +534,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+            "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
             "path": [
               {
                 "unquoted_string": {
@@ -564,7 +564,7 @@
             "edge": {
               "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
               "src": {
-                "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                 "path": [
                   {
                     "unquoted_string": {
@@ -592,7 +592,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                 "path": [
                   {
                     "unquoted_string": {
@@ -626,7 +626,7 @@
                 {
                   "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                   "src": {
-                    "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                    "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                     "path": [
                       {
                         "unquoted_string": {
@@ -654,7 +654,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                    "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                     "path": [
                       {
                         "unquoted_string": {
@@ -712,7 +712,7 @@
             "edge": {
               "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
               "src": {
-                "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                 "path": [
                   {
                     "unquoted_string": {
@@ -740,7 +740,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                 "path": [
                   {
                     "unquoted_string": {
@@ -774,7 +774,7 @@
                 {
                   "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10",
                   "src": {
-                    "range": "TestCompile/edges/nested.d2,0:0:0-0:4:4",
+                    "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3",
                     "path": [
                       {
                         "unquoted_string": {
@@ -802,7 +802,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/nested.d2,0:6:6-0:10:10",
+                    "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json
index 853ee12d2..a94dd5651 100644
--- a/testdata/d2ir/TestCompile/edges/root.exp.json
+++ b/testdata/d2ir/TestCompile/edges/root.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+            "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+            "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -250,7 +250,7 @@
             "edge": {
               "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -267,7 +267,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -290,7 +290,7 @@
                 {
                   "range": "TestCompile/edges/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/edges/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/edges/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -307,7 +307,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/edges/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json
index 8305e55de..fc2b7b1bf 100644
--- a/testdata/d2ir/TestCompile/edges/underscore.exp.json
+++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json
@@ -18,7 +18,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                  "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -35,9 +35,9 @@
                 },
                 "context": {
                   "edge": {
-                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
                     "src": {
-                      "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                      "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                       "path": [
                         {
                           "unquoted_string": {
@@ -65,7 +65,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                      "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                       "path": [
                         {
                           "unquoted_string": {
@@ -86,9 +86,9 @@
                     "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
                     "edges": [
                       {
-                        "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+                        "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
                         "src": {
-                          "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                          "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                           "path": [
                             {
                               "unquoted_string": {
@@ -116,7 +116,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                          "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                           "path": [
                             {
                               "unquoted_string": {
@@ -201,9 +201,9 @@
                         "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
                         "edges": [
                           {
-                            "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+                            "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
                             "src": {
-                              "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                              "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -231,7 +231,7 @@
                             },
                             "src_arrow": "",
                             "dst": {
-                              "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                              "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -275,7 +275,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+            "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
             "path": [
               {
                 "unquoted_string": {
@@ -303,9 +303,9 @@
           },
           "context": {
             "edge": {
-              "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+              "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
               "src": {
-                "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                 "path": [
                   {
                     "unquoted_string": {
@@ -333,7 +333,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                 "path": [
                   {
                     "unquoted_string": {
@@ -354,9 +354,9 @@
               "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
               "edges": [
                 {
-                  "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+                  "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
                   "src": {
-                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                     "path": [
                       {
                         "unquoted_string": {
@@ -384,7 +384,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                    "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                     "path": [
                       {
                         "unquoted_string": {
@@ -428,9 +428,9 @@
         {
           "context": {
             "edge": {
-              "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+              "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
               "src": {
-                "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                 "path": [
                   {
                     "unquoted_string": {
@@ -458,7 +458,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                 "path": [
                   {
                     "unquoted_string": {
@@ -479,9 +479,9 @@
               "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
               "edges": [
                 {
-                  "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14",
+                  "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13",
                   "src": {
-                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:9:9",
+                    "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8",
                     "path": [
                       {
                         "unquoted_string": {
@@ -509,7 +509,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/edges/underscore.d2,0:11:11-0:14:14",
+                    "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json
index 3c8d3fbde..273034225 100644
--- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json
+++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json
@@ -33,7 +33,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
+                        "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15",
                         "path": [
                           {
                             "unquoted_string": {
@@ -53,7 +53,7 @@
                         "key": {
                           "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
                           "key": {
-                            "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
+                            "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -166,7 +166,7 @@
                             "map_key": {
                               "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
                               "key": {
-                                "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
+                                "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -284,7 +284,7 @@
                       "map_key": {
                         "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
                         "key": {
-                          "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:16:16",
+                          "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15",
                           "path": [
                             {
                               "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json
index 59d3f11bb..91b910a6e 100644
--- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json
+++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json
@@ -29,7 +29,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14",
+                  "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -49,7 +49,7 @@
                   "key": {
                     "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14",
                     "key": {
-                      "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14",
+                      "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13",
                       "path": [
                         {
                           "unquoted_string": {
@@ -140,7 +140,7 @@
                       "map_key": {
                         "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14",
                         "key": {
-                          "range": "TestCompile/fields/primary/root.d2,0:9:9-0:14:14",
+                          "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13",
                           "path": [
                             {
                               "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json
index 2a2fbc66b..7a7f1e434 100644
--- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json
+++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json
@@ -22,7 +22,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                        "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                         "path": [
                           {
                             "unquoted_string": {
@@ -63,7 +63,7 @@
                         "edge": {
                           "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                           "src": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -102,7 +102,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -147,7 +147,7 @@
                             {
                               "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                               "src": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -186,7 +186,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -242,7 +242,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                        "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                         "path": [
                           {
                             "unquoted_string": {
@@ -283,7 +283,7 @@
                         "edge": {
                           "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                           "src": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -322,7 +322,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -367,7 +367,7 @@
                             {
                               "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                               "src": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -406,7 +406,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -473,7 +473,7 @@
                         "edge": {
                           "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                           "src": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -512,7 +512,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                            "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -557,7 +557,7 @@
                             {
                               "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                               "src": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -596,7 +596,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                                "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -657,7 +657,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                  "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -698,7 +698,7 @@
                   "edge": {
                     "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                     "src": {
-                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                       "path": [
                         {
                           "unquoted_string": {
@@ -737,7 +737,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                       "path": [
                         {
                           "unquoted_string": {
@@ -782,7 +782,7 @@
                       {
                         "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                         "src": {
-                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                           "path": [
                             {
                               "unquoted_string": {
@@ -821,7 +821,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                           "path": [
                             {
                               "unquoted_string": {
@@ -877,7 +877,7 @@
                   ]
                 },
                 "key_path": {
-                  "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                  "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                   "path": [
                     {
                       "unquoted_string": {
@@ -918,7 +918,7 @@
                   "edge": {
                     "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                     "src": {
-                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                       "path": [
                         {
                           "unquoted_string": {
@@ -957,7 +957,7 @@
                     },
                     "src_arrow": "",
                     "dst": {
-                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                      "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                       "path": [
                         {
                           "unquoted_string": {
@@ -1002,7 +1002,7 @@
                       {
                         "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                         "src": {
-                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                           "path": [
                             {
                               "unquoted_string": {
@@ -1041,7 +1041,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                          "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                           "path": [
                             {
                               "unquoted_string": {
@@ -1103,7 +1103,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+            "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
             "path": [
               {
                 "unquoted_string": {
@@ -1144,7 +1144,7 @@
             "edge": {
               "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
               "src": {
-                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1183,7 +1183,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1228,7 +1228,7 @@
                 {
                   "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                   "src": {
-                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1267,7 +1267,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1323,7 +1323,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+            "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
             "path": [
               {
                 "unquoted_string": {
@@ -1364,7 +1364,7 @@
             "edge": {
               "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
               "src": {
-                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1403,7 +1403,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1448,7 +1448,7 @@
                 {
                   "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24",
                   "src": {
-                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:11:11",
+                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1487,7 +1487,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:13:13-0:24:24",
+                    "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json
index f1ecc780d..7cf8bf4b1 100644
--- a/testdata/d2ir/TestCompile/layers/root.exp.json
+++ b/testdata/d2ir/TestCompile/layers/root.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+            "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+            "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -260,7 +260,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                                    "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -302,7 +302,7 @@
                                     "key": {
                                       "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
                                       "key": {
-                                        "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                                        "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -361,7 +361,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                              "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -403,7 +403,7 @@
                               "key": {
                                 "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
                                 "key": {
-                                  "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                                  "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -462,7 +462,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                        "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                         "path": [
                           {
                             "unquoted_string": {
@@ -504,7 +504,7 @@
                         "key": {
                           "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
                           "key": {
-                            "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                            "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -607,7 +607,7 @@
                             "map_key": {
                               "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
                               "key": {
-                                "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                                "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -739,7 +739,7 @@
                                 "map_key": {
                                   "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
                                   "key": {
-                                    "range": "TestCompile/layers/root.d2,2:10:27-2:16:33",
+                                    "range": "TestCompile/layers/root.d2,2:10:27-2:15:32",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -813,7 +813,7 @@
             "edge": {
               "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -830,7 +830,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -853,7 +853,7 @@
                 {
                   "range": "TestCompile/layers/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/layers/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/layers/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -870,7 +870,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/layers/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/layers/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json
index e73a9415b..45d6ef21a 100644
--- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json
+++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+            "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -252,7 +252,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -271,7 +271,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -288,7 +288,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -311,7 +311,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -328,7 +328,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -362,7 +362,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                         "path": [
                           {
                             "unquoted_string": {
@@ -381,7 +381,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -398,7 +398,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                            "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -421,7 +421,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -438,7 +438,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -515,7 +515,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -534,7 +534,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -551,7 +551,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -574,7 +574,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -591,7 +591,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -625,7 +625,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                        "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                         "path": [
                           {
                             "unquoted_string": {
@@ -644,7 +644,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -661,7 +661,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                            "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -684,7 +684,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -701,7 +701,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -835,7 +835,7 @@
                                     "edge": {
                                       "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                       "src": {
-                                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -852,7 +852,7 @@
                                       },
                                       "src_arrow": "",
                                       "dst": {
-                                        "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                        "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -875,7 +875,7 @@
                                         {
                                           "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                           "src": {
-                                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -892,7 +892,7 @@
                                           },
                                           "src_arrow": "",
                                           "dst": {
-                                            "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                            "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -1000,7 +1000,7 @@
                               "edge": {
                                 "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                 "src": {
-                                  "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                  "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -1017,7 +1017,7 @@
                                 },
                                 "src_arrow": "",
                                 "dst": {
-                                  "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                  "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -1040,7 +1040,7 @@
                                   {
                                     "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                     "src": {
-                                      "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                      "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -1057,7 +1057,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                      "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -1129,7 +1129,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1146,7 +1146,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1169,7 +1169,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1186,7 +1186,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1214,7 +1214,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                           "src": {
-                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                            "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1231,7 +1231,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                            "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1254,7 +1254,7 @@
                             {
                               "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                               "src": {
-                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1271,7 +1271,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1395,7 +1395,7 @@
                                 {
                                   "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                   "src": {
-                                    "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                    "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1412,7 +1412,7 @@
                                   },
                                   "src_arrow": "",
                                   "dst": {
-                                    "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                    "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1566,7 +1566,7 @@
                                     {
                                       "range": "TestCompile/scenarios/edge.d2,3:5:32-3:11:38",
                                       "src": {
-                                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:7:34",
+                                        "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1583,7 +1583,7 @@
                                       },
                                       "src_arrow": "",
                                       "dst": {
-                                        "range": "TestCompile/scenarios/edge.d2,3:9:36-3:11:38",
+                                        "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1676,7 +1676,7 @@
             "edge": {
               "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1693,7 +1693,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1716,7 +1716,7 @@
                 {
                   "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1733,7 +1733,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/edge.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json
index a07597eab..9b077fb06 100644
--- a/testdata/d2ir/TestCompile/scenarios/root.exp.json
+++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -252,7 +252,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -271,7 +271,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -288,7 +288,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -311,7 +311,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -328,7 +328,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -367,7 +367,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -386,7 +386,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -403,7 +403,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -426,7 +426,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -443,7 +443,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -490,7 +490,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                                    "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -532,7 +532,7 @@
                                     "key": {
                                       "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
                                       "key": {
-                                        "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                                        "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -591,7 +591,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                              "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -633,7 +633,7 @@
                               "key": {
                                 "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
                                 "key": {
-                                  "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                                  "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -692,7 +692,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                        "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                         "path": [
                           {
                             "unquoted_string": {
@@ -734,7 +734,7 @@
                         "key": {
                           "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
                           "key": {
-                            "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                            "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -798,7 +798,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -815,7 +815,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -838,7 +838,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -855,7 +855,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -938,7 +938,7 @@
                             "map_key": {
                               "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
                               "key": {
-                                "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                                "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1005,7 +1005,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1024,7 +1024,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1041,7 +1041,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1064,7 +1064,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1081,7 +1081,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1120,7 +1120,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1139,7 +1139,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1156,7 +1156,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1179,7 +1179,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1196,7 +1196,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1235,7 +1235,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
+                        "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1255,7 +1255,7 @@
                         "key": {
                           "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
                           "key": {
-                            "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
+                            "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1297,7 +1297,7 @@
                         "edge": {
                           "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1314,7 +1314,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1337,7 +1337,7 @@
                             {
                               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1354,7 +1354,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1437,7 +1437,7 @@
                             "map_key": {
                               "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
                               "key": {
-                                "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
+                                "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1547,7 +1547,7 @@
                                 "map_key": {
                                   "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
                                   "key": {
-                                    "range": "TestCompile/scenarios/root.d2,2:10:30-2:16:36",
+                                    "range": "TestCompile/scenarios/root.d2,2:10:30-2:15:35",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1621,7 +1621,7 @@
                                 "map_key": {
                                   "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
                                   "key": {
-                                    "range": "TestCompile/scenarios/root.d2,3:12:50-3:19:57",
+                                    "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1673,7 +1673,7 @@
             "edge": {
               "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1690,7 +1690,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -1713,7 +1713,7 @@
                 {
                   "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -1730,7 +1730,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/scenarios/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json
index 775a78b24..01c07121f 100644
--- a/testdata/d2ir/TestCompile/steps/recursive.exp.json
+++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -252,7 +252,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -271,7 +271,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -288,7 +288,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -311,7 +311,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -328,7 +328,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -367,7 +367,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -386,7 +386,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -403,7 +403,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -426,7 +426,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -443,7 +443,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -490,7 +490,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -532,7 +532,7 @@
                                     "key": {
                                       "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                       "key": {
-                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -591,7 +591,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -633,7 +633,7 @@
                               "key": {
                                 "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                 "key": {
-                                  "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                  "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -692,7 +692,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                         "path": [
                           {
                             "unquoted_string": {
@@ -734,7 +734,7 @@
                         "key": {
                           "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                           "key": {
-                            "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                            "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -798,7 +798,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -815,7 +815,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -838,7 +838,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -855,7 +855,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -938,7 +938,7 @@
                             "map_key": {
                               "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                               "key": {
-                                "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1005,7 +1005,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1024,7 +1024,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1041,7 +1041,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1064,7 +1064,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1081,7 +1081,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1120,7 +1120,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1139,7 +1139,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1156,7 +1156,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1179,7 +1179,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1196,7 +1196,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1243,7 +1243,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1285,7 +1285,7 @@
                                     "key": {
                                       "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                       "key": {
-                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1344,7 +1344,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -1386,7 +1386,7 @@
                               "key": {
                                 "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                 "key": {
-                                  "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                  "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -1445,7 +1445,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1487,7 +1487,7 @@
                         "key": {
                           "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                           "key": {
-                            "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                            "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1609,7 +1609,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1628,7 +1628,7 @@
                                     "edge": {
                                       "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                       "src": {
-                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1645,7 +1645,7 @@
                                       },
                                       "src_arrow": "",
                                       "dst": {
-                                        "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                        "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1668,7 +1668,7 @@
                                         {
                                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                           "src": {
-                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -1685,7 +1685,7 @@
                                           },
                                           "src_arrow": "",
                                           "dst": {
-                                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -1724,7 +1724,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                    "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1743,7 +1743,7 @@
                                     "edge": {
                                       "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                       "src": {
-                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1760,7 +1760,7 @@
                                       },
                                       "src_arrow": "",
                                       "dst": {
-                                        "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                        "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1783,7 +1783,7 @@
                                         {
                                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                           "src": {
-                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -1800,7 +1800,7 @@
                                           },
                                           "src_arrow": "",
                                           "dst": {
-                                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -1847,7 +1847,7 @@
                                                 ]
                                               },
                                               "key_path": {
-                                                "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                                "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                                 "path": [
                                                   {
                                                     "unquoted_string": {
@@ -1889,7 +1889,7 @@
                                                 "key": {
                                                   "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                                   "key": {
-                                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                                     "path": [
                                                       {
                                                         "unquoted_string": {
@@ -1948,7 +1948,7 @@
                                           ]
                                         },
                                         "key_path": {
-                                          "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                          "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                           "path": [
                                             {
                                               "unquoted_string": {
@@ -1990,7 +1990,7 @@
                                           "key": {
                                             "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                             "key": {
-                                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                              "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                               "path": [
                                                 {
                                                   "unquoted_string": {
@@ -2049,7 +2049,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -2091,7 +2091,7 @@
                                     "key": {
                                       "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                       "key": {
-                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                        "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -2267,7 +2267,7 @@
                                     "edge": {
                                       "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                       "src": {
-                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                        "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -2284,7 +2284,7 @@
                                       },
                                       "src_arrow": "",
                                       "dst": {
-                                        "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                        "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -2307,7 +2307,7 @@
                                         {
                                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                                           "src": {
-                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -2324,7 +2324,7 @@
                                           },
                                           "src_arrow": "",
                                           "dst": {
-                                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                             "path": [
                                               {
                                                 "unquoted_string": {
@@ -2569,7 +2569,7 @@
                         "edge": {
                           "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -2586,7 +2586,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -2609,7 +2609,7 @@
                             {
                               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -2626,7 +2626,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -2900,7 +2900,7 @@
                                 "map_key": {
                                   "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
                                   "key": {
-                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/recursive.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -3107,7 +3107,7 @@
             "edge": {
               "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -3124,7 +3124,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -3147,7 +3147,7 @@
                 {
                   "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -3164,7 +3164,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/recursive.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json
index 697555a40..a4357ba31 100644
--- a/testdata/d2ir/TestCompile/steps/root.exp.json
+++ b/testdata/d2ir/TestCompile/steps/root.exp.json
@@ -14,7 +14,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
             "path": [
               {
                 "unquoted_string": {
@@ -33,7 +33,7 @@
             "edge": {
               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -50,7 +50,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -73,7 +73,7 @@
                 {
                   "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -90,7 +90,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -129,7 +129,7 @@
             ]
           },
           "key_path": {
-            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
             "path": [
               {
                 "unquoted_string": {
@@ -148,7 +148,7 @@
             "edge": {
               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -165,7 +165,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -188,7 +188,7 @@
                 {
                   "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -205,7 +205,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
@@ -252,7 +252,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -271,7 +271,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -288,7 +288,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -311,7 +311,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -328,7 +328,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -367,7 +367,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -386,7 +386,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -403,7 +403,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -426,7 +426,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -443,7 +443,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -490,7 +490,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -532,7 +532,7 @@
                                     "key": {
                                       "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                                       "key": {
-                                        "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                        "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -591,7 +591,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                              "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -633,7 +633,7 @@
                               "key": {
                                 "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                                 "key": {
-                                  "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                  "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -692,7 +692,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                        "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                         "path": [
                           {
                             "unquoted_string": {
@@ -734,7 +734,7 @@
                         "key": {
                           "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                           "key": {
-                            "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                            "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -798,7 +798,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -815,7 +815,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -838,7 +838,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -855,7 +855,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -938,7 +938,7 @@
                             "map_key": {
                               "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                               "key": {
-                                "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1005,7 +1005,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                        "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1024,7 +1024,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1041,7 +1041,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1064,7 +1064,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1081,7 +1081,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1120,7 +1120,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                        "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1139,7 +1139,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1156,7 +1156,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1179,7 +1179,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1196,7 +1196,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1243,7 +1243,7 @@
                                     ]
                                   },
                                   "key_path": {
-                                    "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1285,7 +1285,7 @@
                                     "key": {
                                       "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                                       "key": {
-                                        "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                        "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                         "path": [
                                           {
                                             "unquoted_string": {
@@ -1344,7 +1344,7 @@
                               ]
                             },
                             "key_path": {
-                              "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                              "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                               "path": [
                                 {
                                   "unquoted_string": {
@@ -1386,7 +1386,7 @@
                               "key": {
                                 "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                                 "key": {
-                                  "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                  "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                   "path": [
                                     {
                                       "unquoted_string": {
@@ -1445,7 +1445,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                        "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1487,7 +1487,7 @@
                         "key": {
                           "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                           "key": {
-                            "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                            "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1545,7 +1545,7 @@
                         ]
                       },
                       "key_path": {
-                        "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
+                        "range": "TestCompile/steps/root.d2,3:12:46-3:18:52",
                         "path": [
                           {
                             "unquoted_string": {
@@ -1565,7 +1565,7 @@
                         "key": {
                           "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
                           "key": {
-                            "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
+                            "range": "TestCompile/steps/root.d2,3:12:46-3:18:52",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1607,7 +1607,7 @@
                         "edge": {
                           "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                           "src": {
-                            "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                            "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1624,7 +1624,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                            "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -1647,7 +1647,7 @@
                             {
                               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                               "src": {
-                                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1664,7 +1664,7 @@
                               },
                               "src_arrow": "",
                               "dst": {
-                                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1747,7 +1747,7 @@
                             "map_key": {
                               "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
                               "key": {
-                                "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
+                                "range": "TestCompile/steps/root.d2,3:12:46-3:18:52",
                                 "path": [
                                   {
                                     "unquoted_string": {
@@ -1857,7 +1857,7 @@
                                 "map_key": {
                                   "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
                                   "key": {
-                                    "range": "TestCompile/steps/root.d2,2:10:26-2:16:32",
+                                    "range": "TestCompile/steps/root.d2,2:10:26-2:15:31",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1931,7 +1931,7 @@
                                 "map_key": {
                                   "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
                                   "key": {
-                                    "range": "TestCompile/steps/root.d2,3:12:46-3:19:53",
+                                    "range": "TestCompile/steps/root.d2,3:12:46-3:18:52",
                                     "path": [
                                       {
                                         "unquoted_string": {
@@ -1983,7 +1983,7 @@
             "edge": {
               "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
               "src": {
-                "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                 "path": [
                   {
                     "unquoted_string": {
@@ -2000,7 +2000,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                 "path": [
                   {
                     "unquoted_string": {
@@ -2023,7 +2023,7 @@
                 {
                   "range": "TestCompile/steps/root.d2,0:0:0-0:6:6",
                   "src": {
-                    "range": "TestCompile/steps/root.d2,0:0:0-0:2:2",
+                    "range": "TestCompile/steps/root.d2,0:0:0-0:1:1",
                     "path": [
                       {
                         "unquoted_string": {
@@ -2040,7 +2040,7 @@
                   },
                   "src_arrow": "",
                   "dst": {
-                    "range": "TestCompile/steps/root.d2,0:4:4-0:6:6",
+                    "range": "TestCompile/steps/root.d2,0:5:5-0:6:6",
                     "path": [
                       {
                         "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json
index a27ba3057..67de3a5ee 100644
--- a/testdata/d2oracle/TestCreate/container_edge.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestCreate/container_edge.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
index 0a36050a2..dd86c4758 100644
--- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
@@ -46,7 +46,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:8:18",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:4:14",
+                            "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:3:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -63,7 +63,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:6:16-1:8:18",
+                            "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:7:17-1:8:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -205,7 +205,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:4:14",
+              "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:2:12-1:3:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -252,7 +252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:6:16-1:8:18",
+              "range": "d2/testdata/d2oracle/TestCreate/container_edge_label.d2,1:7:17-1:8:18",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json
index 15e79deed..bd65e7873 100644
--- a/testdata/d2oracle/TestCreate/edge.exp.json
+++ b/testdata/d2oracle/TestCreate/edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestCreate/edge.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json
index f67e5d529..811197336 100644
--- a/testdata/d2oracle/TestCreate/edge_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:18:18",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:10:10",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:9:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -28,7 +28,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:17:17",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -45,7 +45,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:15:15-0:17:17",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:16:16-0:17:17",
                   "path": [
                     {
                       "unquoted_string": {
@@ -135,7 +135,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:10:10",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:0:0-0:9:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -182,7 +182,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:13:13",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:11:11-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -229,7 +229,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:15:15-0:17:17",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_nested.d2,0:16:16-0:17:17",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json
index d6026c51c..1ae389403 100644
--- a/testdata/d2oracle/TestCreate/edge_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:8:21",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:4:17",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:3:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:6:19-1:8:21",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:7:20-1:8:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:4:17",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:2:15-1:3:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:6:19-1:8:21",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope.d2,1:7:20-1:8:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
index c35a7b9bb..ace2f2ebe 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:8:21",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:4:17",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:3:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:6:19-1:8:21",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:7:20-1:8:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:4:17",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:2:15-1:3:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:6:19-1:8:21",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_flat.d2,1:7:20-1:8:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
index 580de558b..966bef34f 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
@@ -47,7 +47,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:8:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:4:11",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:3:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:6:13-1:8:15",
+                            "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:7:14-1:8:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -275,7 +275,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:4:11",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:2:9-1:3:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -322,7 +322,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:6:13-1:8:15",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_scope_nested.d2,1:7:14-1:8:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json
index d24660ebe..87e16b21a 100644
--- a/testdata/d2oracle/TestCreate/edge_unique.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -55,7 +55,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:14:21",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:6:13",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:5:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -74,7 +74,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:13:20",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:9:16",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:8:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -91,7 +91,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:11:18-1:13:20",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:12:19-1:13:20",
                   "path": [
                     {
                       "unquoted_string": {
@@ -117,7 +117,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:14:36",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:6:28",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:5:27",
               "path": [
                 {
                   "unquoted_string": {
@@ -136,7 +136,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:13:35",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:9:31",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:8:30",
                   "path": [
                     {
                       "unquoted_string": {
@@ -153,7 +153,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:11:33-2:13:35",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:12:34-2:13:35",
                   "path": [
                     {
                       "unquoted_string": {
@@ -179,7 +179,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:14:51",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:6:43",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:5:42",
               "path": [
                 {
                   "unquoted_string": {
@@ -198,7 +198,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:13:50",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:9:46",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:8:45",
                   "path": [
                     {
                       "unquoted_string": {
@@ -215,7 +215,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:11:48-3:13:50",
+                  "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:12:49-3:13:50",
                   "path": [
                     {
                       "unquoted_string": {
@@ -401,7 +401,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -448,7 +448,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -495,7 +495,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:6:13",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:0:7-1:5:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -515,7 +515,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:6:28",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:0:22-2:5:27",
               "path": [
                 {
                   "unquoted_string": {
@@ -535,7 +535,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:6:43",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:0:37-3:5:42",
               "path": [
                 {
                   "unquoted_string": {
@@ -582,7 +582,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:9:16",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:7:14-1:8:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -602,7 +602,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:9:31",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:7:29-2:8:30",
               "path": [
                 {
                   "unquoted_string": {
@@ -622,7 +622,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:9:46",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:7:44-3:8:45",
               "path": [
                 {
                   "unquoted_string": {
@@ -669,7 +669,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:11:18-1:13:20",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,1:12:19-1:13:20",
               "path": [
                 {
                   "unquoted_string": {
@@ -689,7 +689,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:11:33-2:13:35",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,2:12:34-2:13:35",
               "path": [
                 {
                   "unquoted_string": {
@@ -709,7 +709,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:11:48-3:13:50",
+              "range": "d2/testdata/d2oracle/TestCreate/edge_unique.d2,3:12:49-3:13:50",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json
index e9c991074..55ca77da0 100644
--- a/testdata/d2oracle/TestDelete/arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index ee16c6be0..cae034940 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
index 148b37cf2..22c22b4e1 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_map.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
index 748dc7359..6b3c4f832 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/arrowhead_shape.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index 281f52204..37e9a36c1 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -74,7 +74,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:9:31",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:3:25",
+                  "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:2:24",
                   "path": [
                     {
                       "unquoted_string": {
@@ -91,7 +91,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:6:28-1:9:31",
+                  "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:7:29-1:9:31",
                   "path": [
                     {
                       "unquoted_string": {
@@ -350,7 +350,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:3:25",
+              "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:0:22-1:2:24",
               "path": [
                 {
                   "unquoted_string": {
@@ -370,7 +370,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:6:28-1:9:31",
+              "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:7:29-1:9:31",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index 59151d5ca..1c006a1ac 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:6:16",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:2:12",
+                  "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:1:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:4:14-1:6:16",
+                  "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:5:15-1:6:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:2:12",
+              "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:0:10-1:1:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:4:14-1:6:16",
+              "range": "d2/testdata/d2oracle/TestDelete/children.d2,1:5:15-1:6:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index 577ecc875..c761202f4 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:8:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:6:6-0:8:8",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -175,7 +175,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:6:6-0:8:8",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index c04e1106e..13ca0d7c8 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:15:15",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:9:9",
+                "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:8:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:15:15",
+                "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:15:15",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:11:11-0:15:15",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:12:12-0:15:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -300,7 +300,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -367,7 +367,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -387,7 +387,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -434,7 +434,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:11:11-0:15:15",
+              "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,0:12:12-0:15:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index f1dda9f2b..e71f7802c 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:10:10",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:6:6-0:10:10",
+                  "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:7:7-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -244,7 +244,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -331,7 +331,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:6:6-0:10:10",
+              "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,0:7:7-0:10:10",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index 7557b9508..630970e3d 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -70,7 +70,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:8:27",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:4:23",
+                            "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:3:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -87,7 +87,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:6:25-2:8:27",
+                            "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:7:26-2:8:27",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -345,7 +345,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:4:23",
+              "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:2:21-2:3:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -392,7 +392,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:6:25-2:8:27",
+              "range": "d2/testdata/d2oracle/TestDelete/children_scope.d2,2:7:26-2:8:27",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index f070f1b82..fcf34e63f 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -45,7 +45,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:25:41",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:12:28",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:11:27",
                   "path": [
                     {
                       "unquoted_string": {
@@ -62,7 +62,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:14:30-1:25:41",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:15:31-1:25:41",
                   "path": [
                     {
                       "unquoted_string": {
@@ -91,7 +91,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:35:78",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:6:49",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:5:48",
                   "path": [
                     {
                       "unquoted_string": {
@@ -108,7 +108,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:8:51-3:35:78",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:9:52-3:35:78",
                   "path": [
                     {
                       "unquoted_string": {
@@ -135,9 +135,9 @@
             "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:33:113",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:24:104",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:23:103",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:10:90",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:9:89",
                   "path": [
                     {
                       "unquoted_string": {
@@ -154,7 +154,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103",
                   "path": [
                     {
                       "unquoted_string": {
@@ -172,9 +172,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:33:113",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:33:113",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103",
                   "path": [
                     {
                       "unquoted_string": {
@@ -191,7 +191,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:26:106-5:33:113",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:27:107-5:33:113",
                   "path": [
                     {
                       "unquoted_string": {
@@ -218,9 +218,9 @@
             "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:59:174",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:23:138",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:22:137",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:7:122",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:6:121",
                   "path": [
                     {
                       "unquoted_string": {
@@ -237,7 +237,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137",
                   "path": [
                     {
                       "unquoted_string": {
@@ -255,9 +255,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:47:162",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:46:161",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137",
                   "path": [
                     {
                       "unquoted_string": {
@@ -274,7 +274,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161",
                   "path": [
                     {
                       "unquoted_string": {
@@ -292,9 +292,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:59:174",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:59:174",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161",
                   "path": [
                     {
                       "unquoted_string": {
@@ -311,7 +311,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:49:164-7:59:174",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:50:165-7:59:174",
                   "path": [
                     {
                       "unquoted_string": {
@@ -338,9 +338,9 @@
             "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:41:216",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:29:204",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:28:203",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:7:182",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:6:181",
                   "path": [
                     {
                       "unquoted_string": {
@@ -357,7 +357,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203",
                   "path": [
                     {
                       "unquoted_string": {
@@ -375,9 +375,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:41:216",
+                "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:41:216",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203",
                   "path": [
                     {
                       "unquoted_string": {
@@ -394,7 +394,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:31:206-8:41:216",
+                  "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:32:207-8:41:216",
                   "path": [
                     {
                       "unquoted_string": {
@@ -784,7 +784,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:12:28",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:0:16-1:11:27",
               "path": [
                 {
                   "unquoted_string": {
@@ -831,7 +831,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:14:30-1:25:41",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,1:15:31-1:25:41",
               "path": [
                 {
                   "unquoted_string": {
@@ -878,7 +878,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:6:49",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:0:43-3:5:48",
               "path": [
                 {
                   "unquoted_string": {
@@ -925,7 +925,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:8:51-3:35:78",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,3:9:52-3:35:78",
               "path": [
                 {
                   "unquoted_string": {
@@ -972,7 +972,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:10:90",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:0:80-5:9:89",
               "path": [
                 {
                   "unquoted_string": {
@@ -992,7 +992,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:49:164-7:59:174",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:50:165-7:59:174",
               "path": [
                 {
                   "unquoted_string": {
@@ -1039,7 +1039,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103",
               "path": [
                 {
                   "unquoted_string": {
@@ -1059,7 +1059,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:12:92-5:24:104",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:13:93-5:23:103",
               "path": [
                 {
                   "unquoted_string": {
@@ -1106,7 +1106,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:26:106-5:33:113",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,5:27:107-5:33:113",
               "path": [
                 {
                   "unquoted_string": {
@@ -1126,7 +1126,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:7:122",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:0:115-7:6:121",
               "path": [
                 {
                   "unquoted_string": {
@@ -1146,7 +1146,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:7:182",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:0:175-8:6:181",
               "path": [
                 {
                   "unquoted_string": {
@@ -1193,7 +1193,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137",
               "path": [
                 {
                   "unquoted_string": {
@@ -1213,7 +1213,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:9:124-7:23:138",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:10:125-7:22:137",
               "path": [
                 {
                   "unquoted_string": {
@@ -1306,7 +1306,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161",
               "path": [
                 {
                   "unquoted_string": {
@@ -1326,7 +1326,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:25:140-7:47:162",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,7:26:141-7:46:161",
               "path": [
                 {
                   "unquoted_string": {
@@ -1373,7 +1373,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203",
               "path": [
                 {
                   "unquoted_string": {
@@ -1393,7 +1393,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:9:184-8:29:204",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:10:185-8:28:203",
               "path": [
                 {
                   "unquoted_string": {
@@ -1440,7 +1440,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:31:206-8:41:216",
+              "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,8:32:207-8:41:216",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
index d933367e3..3ed8aed31 100644
--- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge-only-style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
index 6742da8ec..a93ec9cbe 100644
--- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -51,7 +51,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -152,7 +152,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -194,7 +194,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -252,7 +252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -321,7 +321,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -390,7 +390,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:8:8-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_both_identical_childs.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json
index ac36a9a41..09f4f71c8 100644
--- a/testdata/d2oracle/TestDelete/edge_common.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_common.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
index 0577b3292..b59e40e5b 100644
--- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_common_2.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
index 8a1b3829f..7a57da3ae 100644
--- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:14:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -164,7 +164,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -195,7 +195,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -253,7 +253,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -311,7 +311,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_conflict.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index 1eaab9e89..0244a8b63 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:6:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:2:9",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:1:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:4:11-1:6:13",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:5:12-1:6:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -104,7 +104,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:6:21",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:2:17",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:1:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -121,7 +121,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:4:19-3:6:21",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:5:20-3:6:21",
                   "path": [
                     {
                       "unquoted_string": {
@@ -150,7 +150,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:6:28",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:2:24",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:1:23",
                   "path": [
                     {
                       "unquoted_string": {
@@ -167,7 +167,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:4:26-4:6:28",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:5:27-4:6:28",
                   "path": [
                     {
                       "unquoted_string": {
@@ -196,7 +196,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:7:36",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:3:32",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:2:31",
                   "path": [
                     {
                       "unquoted_string": {
@@ -213,7 +213,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:5:34-5:7:36",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:6:35-5:7:36",
                   "path": [
                     {
                       "unquoted_string": {
@@ -257,7 +257,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:7:54",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:3:50",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:2:49",
                   "path": [
                     {
                       "unquoted_string": {
@@ -274,7 +274,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:5:52-6:7:54",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:6:53-6:7:54",
                   "path": [
                     {
                       "unquoted_string": {
@@ -318,7 +318,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:7:72",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:3:68",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:2:67",
                   "path": [
                     {
                       "unquoted_string": {
@@ -335,7 +335,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:5:70-8:7:72",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:6:71-8:7:72",
                   "path": [
                     {
                       "unquoted_string": {
@@ -379,7 +379,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:7:91",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:3:87",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:2:86",
                   "path": [
                     {
                       "unquoted_string": {
@@ -396,7 +396,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:5:89-9:7:91",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:6:90-9:7:91",
                   "path": [
                     {
                       "unquoted_string": {
@@ -609,7 +609,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -629,7 +629,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:2:9",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:0:7-1:1:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -649,7 +649,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:2:17",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:0:15-3:1:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -669,7 +669,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:2:24",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:0:22-4:1:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -689,7 +689,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:3:32",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:1:30-5:2:31",
               "path": [
                 {
                   "unquoted_string": {
@@ -709,7 +709,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:3:50",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:1:48-6:2:49",
               "path": [
                 {
                   "unquoted_string": {
@@ -729,7 +729,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:3:68",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:1:66-8:2:67",
               "path": [
                 {
                   "unquoted_string": {
@@ -749,7 +749,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:3:87",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:1:85-9:2:86",
               "path": [
                 {
                   "unquoted_string": {
@@ -796,7 +796,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -816,7 +816,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:4:11-1:6:13",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,1:5:12-1:6:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -836,7 +836,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:4:19-3:6:21",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,3:5:20-3:6:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -856,7 +856,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:4:26-4:6:28",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,4:5:27-4:6:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -876,7 +876,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:5:34-5:7:36",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:6:35-5:7:36",
               "path": [
                 {
                   "unquoted_string": {
@@ -896,7 +896,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:5:52-6:7:54",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:6:53-6:7:54",
               "path": [
                 {
                   "unquoted_string": {
@@ -916,7 +916,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:5:70-8:7:72",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:6:71-8:7:72",
               "path": [
                 {
                   "unquoted_string": {
@@ -936,7 +936,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:5:89-9:7:91",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:6:90-9:7:91",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json
index 2d55e252c..72ea2342f 100644
--- a/testdata/d2oracle/TestDelete/edge_first.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_first.exp.json
@@ -79,9 +79,9 @@
                       "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:22:22",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:18:18",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:17:17",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:13:13",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:12:12",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -98,7 +98,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -116,9 +116,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:22:22",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:22:22",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -135,7 +135,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:20:20-0:22:22",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:21:21-0:22:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -516,7 +516,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:13:13",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:11:11-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -563,7 +563,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17",
               "path": [
                 {
                   "unquoted_string": {
@@ -583,7 +583,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:15:15-0:18:18",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:16:16-0:17:17",
               "path": [
                 {
                   "unquoted_string": {
@@ -630,7 +630,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:20:20-0:22:22",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_first.d2,0:21:21-0:22:22",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
index 64b346930..05ab2e21b 100644
--- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -51,7 +51,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -152,7 +152,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -221,7 +221,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -290,7 +290,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -359,7 +359,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -417,7 +417,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:8:8-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_identical_child.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
index b0339c5b1..3d0d0f277 100644
--- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_key_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json
index 116cd398e..38149e7d9 100644
--- a/testdata/d2oracle/TestDelete/edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_last.exp.json
@@ -56,9 +56,9 @@
                       "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:24:24",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:15:15",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:14:14",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:10:10",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:9:9",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -93,9 +93,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:20:20",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:19:19",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -112,7 +112,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -130,9 +130,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:24:24",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:24:24",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -149,7 +149,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:22:22-0:24:24",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:23:23-0:24:24",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -538,7 +538,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:10:10",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:8:8-0:9:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -585,7 +585,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -605,7 +605,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:12:12-0:15:15",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:13:13-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -652,7 +652,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -672,7 +672,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:17:17-0:20:20",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:18:18-0:19:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -719,7 +719,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:22:22-0:24:24",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_last.d2,0:23:23-0:24:24",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
index b34908eab..777eb0db8 100644
--- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_map_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json
index 5b25a1b51..5684d997c 100644
--- a/testdata/d2oracle/TestDelete/edge_middle.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json
@@ -56,9 +56,9 @@
                       "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:19:19",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:15:15",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:14:14",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:10:10",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:9:9",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -93,9 +93,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:19:19",
+                          "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:19:19",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -112,7 +112,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:17:17-0:19:19",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:18:18-0:19:19",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -141,7 +141,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:27:27",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:23:23",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:22:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -158,7 +158,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:25:25-0:27:27",
+                            "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:26:26-0:27:27",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -524,7 +524,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:10:10",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:8:8-0:9:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -571,7 +571,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -591,7 +591,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:12:12-0:15:15",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:13:13-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -638,7 +638,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:17:17-0:19:19",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:18:18-0:19:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -685,7 +685,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:23:23",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:21:21-0:22:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -732,7 +732,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:25:25-0:27:27",
+              "range": "d2/testdata/d2oracle/TestDelete/edge_middle.d2,0:26:26-0:27:27",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
index 08ee89d3d..294f462a7 100644
--- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/flat_reserved.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
index 20fbe284e..790c640a3 100644
--- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:6:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:2:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:1:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:4:6-1:6:8",
+                  "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:2:4",
+              "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:0:2-1:1:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:4:6-1:6:8",
+              "range": "d2/testdata/d2oracle/TestDelete/hoist_edge_children.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
index d19aea41f..d9e60c63c 100644
--- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestDelete/nested_edge_key_style.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index 691e5ab52..96becc9d0 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:6:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:2:9",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:1:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:4:11-1:6:13",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:5:12-1:6:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -249,7 +249,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -296,7 +296,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -343,7 +343,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:2:9",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:0:7-1:1:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -390,7 +390,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:4:11-1:6:13",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge.d2,1:5:12-1:6:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index 8dc6bd161..92bb37fcc 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:16:16",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:12:12",
+                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -84,9 +84,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:16:16",
+                "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:16:16",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -103,7 +103,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:14:14-0:16:16",
+                  "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:15:15-0:16:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -320,7 +320,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -367,7 +367,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -387,7 +387,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -434,7 +434,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -454,7 +454,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:9:9-0:12:12",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -501,7 +501,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:14:14-0:16:16",
+              "range": "d2/testdata/d2oracle/TestDelete/node_in_edge_last.d2,0:15:15-0:16:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index fdbb6c2d5..42e4680c7 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -108,7 +108,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:6:37",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:2:33",
+                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:1:32",
                   "path": [
                     {
                       "unquoted_string": {
@@ -125,7 +125,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:4:35-2:6:37",
+                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:5:36-2:6:37",
                   "path": [
                     {
                       "unquoted_string": {
@@ -235,7 +235,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:2:33",
+              "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:0:31-2:1:32",
               "path": [
                 {
                   "unquoted_string": {
@@ -306,7 +306,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:4:35-2:6:37",
+              "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,2:5:36-2:6:37",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 34ac25510..47aec3c7c 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:6:10",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:2:6",
+                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:1:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:4:8-2:6:10",
+                  "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:5:9-2:6:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -239,7 +239,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:2:6",
+              "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:0:4-2:1:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -306,7 +306,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:4:8-2:6:10",
+              "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:5:9-2:6:10",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json
index 11726eded..88dbcf13d 100644
--- a/testdata/d2oracle/TestDelete/order_1.exp.json
+++ b/testdata/d2oracle/TestDelete/order_1.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:6:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:2:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:1:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:4:6-1:6:8",
+                  "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:2:4",
+              "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:0:2-1:1:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:4:6-1:6:8",
+              "range": "d2/testdata/d2oracle/TestDelete/order_1.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json
index 144fd9070..c9e2dbffd 100644
--- a/testdata/d2oracle/TestDelete/order_5.exp.json
+++ b/testdata/d2oracle/TestDelete/order_5.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -82,7 +82,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:8:22",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:4:18",
+                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:3:17",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -99,7 +99,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:6:20-2:8:22",
+                            "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:7:21-2:8:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -273,7 +273,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -320,7 +320,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -367,7 +367,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:4:18",
+              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:2:16-2:3:17",
               "path": [
                 {
                   "unquoted_string": {
@@ -414,7 +414,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:6:20-2:8:22",
+              "range": "d2/testdata/d2oracle/TestDelete/order_5.d2,2:7:21-2:8:22",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index 7b51e91f9..6d1681ec5 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -204,7 +204,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:27:122",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:19:114",
+                            "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:18:113",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -221,7 +221,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:21:116-7:27:122",
+                            "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:22:117-7:27:122",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -414,7 +414,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:21:116-7:27:122",
+              "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:22:117-7:27:122",
               "path": [
                 {
                   "unquoted_string": {
@@ -493,7 +493,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:19:114",
+              "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,7:2:97-7:18:113",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
index d05524d74..942865d1e 100644
--- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:6:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:2:4",
+                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:1:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:4:6-1:6:8",
+                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -81,7 +81,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:6:15",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:2:11",
+                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:1:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -98,7 +98,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:4:13-2:6:15",
+                  "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:5:14-2:6:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -267,7 +267,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:2:4",
+              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:0:2-1:1:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -314,7 +314,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:4:6-1:6:8",
+              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -361,7 +361,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:2:11",
+              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:0:9-2:1:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -408,7 +408,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:4:13-2:6:15",
+              "range": "d2/testdata/d2oracle/TestDelete/underscore_remove.d2,2:5:14-2:6:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
index 031cbc070..b9f6efb5c 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -211,7 +211,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -231,7 +231,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -278,7 +278,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -298,7 +298,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
index 5810e288e..7cc0e336c 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:13:13",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:9:9",
+                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:8:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,9 +58,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:13:13",
+                "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:13:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -77,7 +77,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:11:11-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:12:12-0:13:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -199,7 +199,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -257,7 +257,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -315,7 +315,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -335,7 +335,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -382,7 +382,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:11:11-0:13:13",
+              "range": "d2/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.d2,0:12:12-0:13:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json
index de374c82f..586175cd4 100644
--- a/testdata/d2oracle/TestMove/connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/connected_nested.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -142,7 +142,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/connected_nested.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
index bc9126e8a..beb4e5634 100644
--- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json
+++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:12:17",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:10:15-1:12:17",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:11:16-1:12:17",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -240,7 +240,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -329,7 +329,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -398,7 +398,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:10:15-1:12:17",
+              "range": "d2/testdata/d2oracle/TestMove/edge_across_containers.d2,1:11:16-1:12:17",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json
index c8b153273..03f9339cf 100644
--- a/testdata/d2oracle/TestMove/edge_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_basic.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/edge_basic.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
index ce721c308..dcc512ba0 100644
--- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -188,7 +188,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -235,7 +235,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -255,7 +255,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -302,7 +302,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_basic.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
index 653ab7d08..df87ea83e 100644
--- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
@@ -34,9 +34,9 @@
                       "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:17:22",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:11:16",
+                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:6:11",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:5:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -82,9 +82,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:17:22",
+                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:17:22",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -101,7 +101,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:13:18-1:17:22",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:14:19-1:17:22",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -286,7 +286,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -317,7 +317,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:13:18-1:17:22",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:14:19-1:17:22",
               "path": [
                 {
                   "unquoted_string": {
@@ -375,7 +375,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -395,7 +395,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:8:13-1:11:16",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_circular.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
index d49f6a447..2cae2052f 100644
--- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:13:13",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:9:9",
+                "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:8:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,9 +58,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:13:13",
+                "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:13:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -77,7 +77,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:11:11-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:12:12-0:13:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -222,7 +222,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -300,7 +300,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -358,7 +358,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -378,7 +378,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:6:6-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -425,7 +425,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:11:11-0:13:13",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_into_container.d2,0:12:12-0:13:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
index 575675351..1b5d9b69f 100644
--- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
@@ -34,9 +34,9 @@
                       "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:15:20",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:11:16",
+                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -82,9 +82,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:15:20",
+                          "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:15:20",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -112,7 +112,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:13:18-1:15:20",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:14:19-1:15:20",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -286,7 +286,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -333,7 +333,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -364,7 +364,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:6:11-1:11:16",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:7:12-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -422,7 +422,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:13:18-1:15:20",
+              "range": "d2/testdata/d2oracle/TestMove/edge_chain_out_container.d2,1:14:19-1:15:20",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json
index a908608d3..cc2aab88b 100644
--- a/testdata/d2oracle/TestMove/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:14:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -193,7 +193,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -224,7 +224,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -282,7 +282,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -340,7 +340,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestMove/edge_conflict.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json
index 8c1cfb37a..943587e97 100644
--- a/testdata/d2oracle/TestMove/edge_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json
@@ -64,7 +64,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:8:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -92,7 +92,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:6:17-3:8:19",
+                  "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:7:18-3:8:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -202,7 +202,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15",
+              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -307,7 +307,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:4:15",
+              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:0:11-3:3:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -365,7 +365,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:6:17-3:8:19",
+              "range": "d2/testdata/d2oracle/TestMove/edge_into_container.d2,3:7:18-3:8:19",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
index 24a4ba70e..fbe8d3aeb 100644
--- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/edge_nested_basic.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
index fbf01a18f..76f20e41e 100644
--- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:6:11",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:5:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:8:13-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -206,7 +206,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -264,7 +264,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:8:13-1:10:15",
+              "range": "d2/testdata/d2oracle/TestMove/edge_out_of_container.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
index 9ae346bc4..dca6fdaa0 100644
--- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
@@ -59,7 +59,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:10:19",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:6:15",
+                            "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:5:14",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -87,7 +87,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:8:17-2:10:19",
+                            "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:9:18-2:10:19",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -121,7 +121,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:8:30",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:2:24",
+                  "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:1:23",
                   "path": [
                     {
                       "unquoted_string": {
@@ -138,7 +138,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30",
+                  "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30",
                   "path": [
                     {
                       "unquoted_string": {
@@ -314,7 +314,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30",
+              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30",
               "path": [
                 {
                   "unquoted_string": {
@@ -419,7 +419,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:6:15",
+              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:2:11-2:5:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -450,7 +450,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:2:24",
+              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:0:22-4:1:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -517,7 +517,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:8:17-2:10:19",
+              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,2:9:18-2:10:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -537,7 +537,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:4:26-4:8:30",
+              "range": "d2/testdata/d2oracle/TestMove/full_edge_slice.d2,4:5:27-4:8:30",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index 7f572e447..f0eeecdc3 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:14:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -51,7 +51,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -220,7 +220,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:10:53",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46",
                   "path": [
                     {
                       "unquoted_string": {
@@ -248,7 +248,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53",
                   "path": [
                     {
                       "unquoted_string": {
@@ -288,7 +288,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:8:63",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58",
                   "path": [
                     {
                       "unquoted_string": {
@@ -316,7 +316,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:6:61-8:8:63",
+                  "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:7:62-8:8:63",
                   "path": [
                     {
                       "unquoted_string": {
@@ -470,7 +470,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -539,7 +539,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -608,7 +608,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -677,7 +677,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -739,7 +739,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:6:61-8:8:63",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:7:62-8:8:63",
               "path": [
                 {
                   "unquoted_string": {
@@ -786,7 +786,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -855,7 +855,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:8:8-0:14:14",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,0:9:9-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -991,7 +991,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46",
               "path": [
                 {
                   "unquoted_string": {
@@ -1022,7 +1022,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58",
               "path": [
                 {
                   "unquoted_string": {
@@ -1100,7 +1100,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53",
               "path": [
                 {
                   "unquoted_string": {
@@ -1158,7 +1158,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:4:47",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:0:43-6:3:46",
               "path": [
                 {
                   "unquoted_string": {
@@ -1216,7 +1216,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:6:49-6:10:53",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,6:7:50-6:10:53",
               "path": [
                 {
                   "unquoted_string": {
@@ -1274,7 +1274,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:4:59",
+              "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,8:0:55-8:3:58",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
index a309e0c34..518469ce4 100644
--- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:20:20",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20",
+                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20",
                   "path": [
                     {
                       "unquoted_string": {
@@ -80,7 +80,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:16:38",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:7:29",
+                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:6:28",
                   "path": [
                     {
                       "unquoted_string": {
@@ -97,7 +97,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38",
+                  "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38",
                   "path": [
                     {
                       "unquoted_string": {
@@ -374,7 +374,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -405,7 +405,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20",
               "path": [
                 {
                   "unquoted_string": {
@@ -436,7 +436,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38",
               "path": [
                 {
                   "unquoted_string": {
@@ -514,7 +514,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:9:9",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:0:0-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -592,7 +592,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:11:11-0:20:20",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,0:12:12-0:20:20",
               "path": [
                 {
                   "unquoted_string": {
@@ -670,7 +670,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:7:29",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:0:22-2:6:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -737,7 +737,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:9:31-2:16:38",
+              "range": "d2/testdata/d2oracle/TestMove/middle_container_generated_conflict.d2,2:10:32-2:16:38",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
index a8f68bf18..c0bc0b3a8 100644
--- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -175,7 +175,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -233,7 +233,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -291,7 +291,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -360,7 +360,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -429,7 +429,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
index 45411b8f5..42428a39a 100644
--- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -215,7 +215,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -273,7 +273,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -331,7 +331,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -431,7 +431,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -531,7 +531,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:6:6-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/move_out_of_nested_edge.d2,0:7:7-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
index 3faa27f08..4cb5a41cc 100644
--- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:11:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:6:11-1:11:16",
+                            "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:7:12-1:11:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -270,7 +270,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -317,7 +317,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:6:11-1:11:16",
+              "range": "d2/testdata/d2oracle/TestMove/nhooyr_two.d2,1:7:12-1:11:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index d59d54b5f..f24b66fa8 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -158,7 +158,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -205,7 +205,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -283,7 +283,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:4:4-0:12:12",
+              "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,0:5:5-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
index aee09a349..581b66537 100644
--- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:6:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:2:4",
+                  "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:1:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:4:6-1:6:8",
+                  "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -212,7 +212,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:2:4",
+              "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:0:2-1:1:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -279,7 +279,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:4:6-1:6:8",
+              "range": "d2/testdata/d2oracle/TestMove/partial_edge_slice.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json
index 45a2ba38c..2fb89411a 100644
--- a/testdata/d2oracle/TestMove/underscore-connection.exp.json
+++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:16:21",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -314,7 +314,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -356,7 +356,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21",
+              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -445,7 +445,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -534,7 +534,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:10:15-1:16:21",
+              "range": "d2/testdata/d2oracle/TestMove/underscore-connection.d2,1:11:16-1:16:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
index 720b01ae2..eaa941d03 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:6:11",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:5:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:8:13-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -229,7 +229,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -307,7 +307,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:8:13-1:10:15",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_children.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
index 7c6bb7452..2deaee517 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_1.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
index 6c97bcbec..502a6ae7f 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:8:13-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -206,7 +206,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -237,7 +237,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:8:13-1:10:15",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -284,7 +284,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_2.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
index daa84062c..c9d972e26 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:6:11",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:5:10",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -64,7 +64,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:8:13-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:9:14-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -206,7 +206,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:6:11",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:2:7-1:5:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -264,7 +264,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:8:13-1:10:15",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_3.d2,1:9:14-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
index 66b9b06c8..c90c19765 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:8:13",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:6:11-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:7:12-1:8:13",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -195,7 +195,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -242,7 +242,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:6:11-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_4.d2,1:7:12-1:8:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
index 7b1a4901d..14a1fee58 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:14:19",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -75,7 +75,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:10:15-1:14:19",
+                            "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:11:16-1:14:19",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -228,7 +228,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -270,7 +270,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:10:15-1:14:19",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:11:16-1:14:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -328,7 +328,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:8:13",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_container_5.d2,1:2:7-1:7:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
index 777d6ba3e..99b9b1abe 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
@@ -60,7 +60,7 @@
                                   {
                                     "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:13:25",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:8:20",
+                                      "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:7:19",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -88,7 +88,7 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:10:22-2:13:25",
+                                      "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:11:23-2:13:25",
                                       "path": [
                                         {
                                           "unquoted_string": {
@@ -305,7 +305,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:8:20",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:4:16-2:7:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -363,7 +363,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:10:22-2:13:25",
+              "range": "d2/testdata/d2oracle/TestMove/underscore_edge_split.d2,2:11:23-2:13:25",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
index 504797987..37085ae05 100644
--- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
@@ -87,7 +87,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:10:27",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:2:19",
+                  "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:1:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -104,7 +104,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27",
+                  "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27",
                   "path": [
                     {
                       "unquoted_string": {
@@ -248,7 +248,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27",
+              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27",
               "path": [
                 {
                   "unquoted_string": {
@@ -373,7 +373,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:4:21-4:10:27",
+              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:5:22-4:10:27",
               "path": [
                 {
                   "unquoted_string": {
@@ -431,7 +431,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:2:19",
+              "range": "d2/testdata/d2oracle/TestMove/unique_name_with_references.d2,4:0:17-4:1:18",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json
index 65601ceb2..067a3c7c0 100644
--- a/testdata/d2oracle/TestRename/arrows.exp.json
+++ b/testdata/d2oracle/TestRename/arrows.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/arrows.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json
index ebbc0754c..379f15249 100644
--- a/testdata/d2oracle/TestRename/arrows_chain.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:17:17",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:8:8",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:7:7",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:13:13",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -84,9 +84,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:17:17",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:17:17",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -103,7 +103,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:15:15-0:17:17",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:16:16-0:17:17",
                   "path": [
                     {
                       "unquoted_string": {
@@ -257,7 +257,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -304,7 +304,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -324,7 +324,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:5:5-0:8:8",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:6:6-0:7:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -371,7 +371,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -391,7 +391,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:10:10-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:11:11-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -438,7 +438,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:15:15-0:17:17",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_chain.d2,0:16:16-0:17:17",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json
index 92260d221..6cca60a8d 100644
--- a/testdata/d2oracle/TestRename/arrows_complex.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:28:28",
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -39,7 +39,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -56,7 +56,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:10:10-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:11:11-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -173,7 +173,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -231,7 +231,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -289,7 +289,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:7:7",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -336,7 +336,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:10:10-0:12:12",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_complex.d2,0:11:11-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
index bda0cfb12..29de1a2e5 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:21:21",
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -26,9 +26,9 @@
             },
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:11:11",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:10:10",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:5:5",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:4:4",
                   "path": [
                     {
                       "unquoted_string": {
@@ -45,7 +45,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -63,9 +63,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:16:16",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:15:15",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -82,7 +82,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -100,9 +100,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:20:20",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:20:20",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:18:18-0:20:20",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:19:19-0:20:20",
                   "path": [
                     {
                       "unquoted_string": {
@@ -273,7 +273,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -320,7 +320,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:5:5",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:3:3-0:4:4",
               "path": [
                 {
                   "unquoted_string": {
@@ -367,7 +367,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -387,7 +387,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:8:8-0:11:11",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:9:9-0:10:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -434,7 +434,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -454,7 +454,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:13:13-0:16:16",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:14:14-0:15:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -501,7 +501,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:18:18-0:20:20",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common.d2,0:19:19-0:20:20",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index d5603eef6..66322ba2c 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:26:26",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:12:12",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "<",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -69,9 +69,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:19:19",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:18:18",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -99,7 +99,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -128,9 +128,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:26:26",
+                "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:26:26",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -158,7 +158,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26",
+                  "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26",
                   "path": [
                     {
                       "unquoted_string": {
@@ -323,7 +323,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -354,7 +354,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -385,7 +385,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -416,7 +416,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -447,7 +447,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -478,7 +478,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26",
               "path": [
                 {
                   "unquoted_string": {
@@ -536,7 +536,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -594,7 +594,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -625,7 +625,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:7:7-0:12:12",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:8:8-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -683,7 +683,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -714,7 +714,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:14:14-0:19:19",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:15:15-0:18:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -772,7 +772,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:21:21-0:26:26",
+              "range": "d2/testdata/d2oracle/TestRename/arrows_trim_common_2.d2,0:22:22-0:26:26",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
index 1fb5764c4..d86bd9aa6 100644
--- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:29:29",
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -39,7 +39,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:13:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:9:9",
+                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:8:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -56,7 +56,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:11:11-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:12:12-0:13:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -173,7 +173,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -231,7 +231,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -289,7 +289,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:9:9",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:7:7-0:8:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -336,7 +336,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:11:11-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_1.d2,0:12:12-0:13:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
index d060f7c14..214be7198 100644
--- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
@@ -9,7 +9,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:30:30",
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -39,7 +39,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:14:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:10:10",
+                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:9:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -56,7 +56,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:12:12-0:14:14",
+                  "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:13:13-0:14:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -173,7 +173,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -231,7 +231,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -289,7 +289,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:10:10",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:5:5-0:9:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -336,7 +336,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:12:12-0:14:14",
+              "range": "d2/testdata/d2oracle/TestRename/complex_edge_2.d2,0:13:13-0:14:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index 830fb8025..9b29a3155 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:70:70",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:24:24",
+                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:23:23",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -51,7 +51,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
                   "path": [
                     {
                       "unquoted_string": {
@@ -80,9 +80,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:44:44",
+                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:43:43",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
                   "path": [
                     {
                       "unquoted_string": {
@@ -110,7 +110,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
                   "path": [
                     {
                       "unquoted_string": {
@@ -150,9 +150,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:51:51",
+                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:50:50",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
                   "path": [
                     {
                       "unquoted_string": {
@@ -191,7 +191,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
                   "path": [
                     {
                       "unquoted_string": {
@@ -220,9 +220,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:70:70",
+                "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:70:70",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
                   "path": [
                     {
                       "unquoted_string": {
@@ -250,7 +250,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70",
                   "path": [
                     {
                       "unquoted_string": {
@@ -334,9 +334,9 @@
                       "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:13:102",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:9:98",
+                          "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:8:97",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:4:93",
+                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:3:92",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -353,7 +353,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98",
+                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -371,9 +371,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:13:102",
+                          "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:13:102",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98",
+                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -390,7 +390,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:11:100-2:13:102",
+                            "range": "d2/testdata/d2oracle/TestRename/container.d2,2:12:101-2:13:102",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -538,7 +538,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:24:175",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168",
                   "path": [
                     {
                       "unquoted_string": {
@@ -577,7 +577,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175",
                   "path": [
                     {
                       "unquoted_string": {
@@ -629,7 +629,7 @@
           "map_key": {
             "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:37:234",
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:5:202",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:4:201",
               "path": [
                 {
                   "unquoted_string": {
@@ -648,7 +648,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:19:216",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209",
                   "path": [
                     {
                       "unquoted_string": {
@@ -687,7 +687,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216",
+                  "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216",
                   "path": [
                     {
                       "unquoted_string": {
@@ -993,7 +993,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -1035,7 +1035,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1077,7 +1077,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1119,7 +1119,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70",
               "path": [
                 {
                   "unquoted_string": {
@@ -1212,7 +1212,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168",
               "path": [
                 {
                   "unquoted_string": {
@@ -1281,7 +1281,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -1323,7 +1323,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1365,7 +1365,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1407,7 +1407,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70",
               "path": [
                 {
                   "unquoted_string": {
@@ -1500,7 +1500,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168",
               "path": [
                 {
                   "unquoted_string": {
@@ -1569,7 +1569,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:17:17",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:0:0-0:16:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -1611,7 +1611,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1653,7 +1653,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:26:26-0:44:44",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:27:27-0:43:43",
               "path": [
                 {
                   "unquoted_string": {
@@ -1695,7 +1695,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:53:53-0:70:70",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:54:54-0:70:70",
               "path": [
                 {
                   "unquoted_string": {
@@ -1737,7 +1737,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:11:100-2:13:102",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:12:101-2:13:102",
               "path": [
                 {
                   "unquoted_string": {
@@ -1777,7 +1777,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:18:169",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:1:152-10:17:168",
               "path": [
                 {
                   "unquoted_string": {
@@ -1846,7 +1846,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -1877,7 +1877,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -1908,7 +1908,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175",
               "path": [
                 {
                   "unquoted_string": {
@@ -1966,7 +1966,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -1997,7 +1997,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:19:19-0:24:24",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:20:20-0:23:23",
               "path": [
                 {
                   "unquoted_string": {
@@ -2028,7 +2028,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:20:171-10:24:175",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,10:21:172-10:24:175",
               "path": [
                 {
                   "unquoted_string": {
@@ -2086,7 +2086,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
               "path": [
                 {
                   "unquoted_string": {
@@ -2117,7 +2117,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
               "path": [
                 {
                   "unquoted_string": {
@@ -2175,7 +2175,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
               "path": [
                 {
                   "unquoted_string": {
@@ -2206,7 +2206,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:46:46-0:51:51",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,0:47:47-0:50:50",
               "path": [
                 {
                   "unquoted_string": {
@@ -2264,7 +2264,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:4:93",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:2:91-2:3:92",
               "path": [
                 {
                   "unquoted_string": {
@@ -2311,7 +2311,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97",
               "path": [
                 {
                   "unquoted_string": {
@@ -2331,7 +2331,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:6:95-2:9:98",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,2:7:96-2:8:97",
               "path": [
                 {
                   "unquoted_string": {
@@ -2425,7 +2425,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:5:202",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:0:197-11:4:201",
               "path": [
                 {
                   "unquoted_string": {
@@ -2472,7 +2472,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209",
               "path": [
                 {
                   "unquoted_string": {
@@ -2541,7 +2541,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209",
               "path": [
                 {
                   "unquoted_string": {
@@ -2610,7 +2610,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:13:210",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:6:203-11:12:209",
               "path": [
                 {
                   "unquoted_string": {
@@ -2679,7 +2679,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216",
               "path": [
                 {
                   "unquoted_string": {
@@ -2737,7 +2737,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:15:212-11:19:216",
+              "range": "d2/testdata/d2oracle/TestRename/container.d2,11:16:213-11:19:216",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index 678a43a46..40be42dcf 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:37:37",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:13:13",
+                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:12:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -69,9 +69,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:22:22",
+                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:21:21",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -99,7 +99,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
                   "path": [
                     {
                       "unquoted_string": {
@@ -128,9 +128,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:29:29",
+                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:28:28",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
                   "path": [
                     {
                       "unquoted_string": {
@@ -158,7 +158,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
                   "path": [
                     {
                       "unquoted_string": {
@@ -187,9 +187,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:37:37",
+                "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:37:37",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
                   "path": [
                     {
                       "unquoted_string": {
@@ -217,7 +217,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37",
+                  "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37",
                   "path": [
                     {
                       "unquoted_string": {
@@ -279,9 +279,9 @@
                       "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:15:58",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:9:52",
+                          "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:8:51",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:4:47",
+                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:3:46",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -298,7 +298,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52",
+                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -316,9 +316,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:15:58",
+                          "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:15:58",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52",
+                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -335,7 +335,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:11:54-2:15:58",
+                            "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:12:55-2:15:58",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -623,7 +623,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -654,7 +654,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -685,7 +685,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -716,7 +716,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37",
               "path": [
                 {
                   "unquoted_string": {
@@ -794,7 +794,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:6:6",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:0:0-0:5:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -825,7 +825,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -856,7 +856,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:15:15-0:22:22",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:16:16-0:21:21",
               "path": [
                 {
                   "unquoted_string": {
@@ -887,7 +887,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:31:31-0:37:37",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:32:32-0:37:37",
               "path": [
                 {
                   "unquoted_string": {
@@ -918,7 +918,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:11:54-2:15:58",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:12:55-2:15:58",
               "path": [
                 {
                   "unquoted_string": {
@@ -985,7 +985,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -1016,7 +1016,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -1074,7 +1074,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -1105,7 +1105,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:8:8-0:13:13",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:9:9-0:12:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -1163,7 +1163,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -1194,7 +1194,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -1252,7 +1252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -1283,7 +1283,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:24:24-0:29:29",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,0:25:25-0:28:28",
               "path": [
                 {
                   "unquoted_string": {
@@ -1341,7 +1341,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:4:47",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:2:45-2:3:46",
               "path": [
                 {
                   "unquoted_string": {
@@ -1388,7 +1388,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51",
               "path": [
                 {
                   "unquoted_string": {
@@ -1408,7 +1408,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:6:49-2:9:52",
+              "range": "d2/testdata/d2oracle/TestRename/edges.d2,2:7:50-2:8:51",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index 2c76cca83..8df095e63 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -129,7 +129,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -176,7 +176,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json
index c8f216c65..9c0be60cd 100644
--- a/testdata/d2oracle/TestSet/edge_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -168,7 +168,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -215,7 +215,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_append_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index 51b4137c9..106987b19 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -34,9 +34,9 @@
                       "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:19:27",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:9:17",
+                          "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:8:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:4:12",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:3:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -71,9 +71,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:13:21",
+                          "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:13:21",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -90,7 +90,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:11:19-1:13:21",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:12:20-1:13:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -129,7 +129,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:9:37",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:5:33",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:4:32",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -146,7 +146,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:7:35-2:9:37",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:8:36-2:9:37",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -338,7 +338,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:4:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:2:10-1:3:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -358,7 +358,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:5:33",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:3:31-2:4:32",
               "path": [
                 {
                   "unquoted_string": {
@@ -405,7 +405,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -425,7 +425,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:6:14-1:9:17",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -445,7 +445,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:7:35-2:9:37",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:8:36-2:9:37",
               "path": [
                 {
                   "unquoted_string": {
@@ -492,7 +492,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:11:19-1:13:21",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:12:20-1:13:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
index 301659aa6..c4288de67 100644
--- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:7:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:3:15",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:2:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:5:17-1:7:19",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:6:18-1:7:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -278,7 +278,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -298,7 +298,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:3:15",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:1:13-1:2:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -345,7 +345,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -365,7 +365,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -385,7 +385,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:5:17-1:7:19",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,1:6:18-1:7:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -432,7 +432,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_append_style.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
index 7e2d1bd9e..a4ddf5104 100644
--- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:7:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:3:15",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:2:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:5:17-1:7:19",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:6:18-1:7:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -179,7 +179,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:7:50",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:3:46",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:2:45",
                   "path": [
                     {
                       "unquoted_string": {
@@ -196,7 +196,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:5:48-2:7:50",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:6:49-2:7:50",
                   "path": [
                     {
                       "unquoted_string": {
@@ -368,7 +368,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -415,7 +415,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -435,7 +435,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -455,7 +455,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:3:15",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:1:13-1:2:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -475,7 +475,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:3:46",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:1:44-2:2:45",
               "path": [
                 {
                   "unquoted_string": {
@@ -522,7 +522,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -542,7 +542,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:5:17-1:7:19",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,1:6:18-1:7:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -562,7 +562,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:5:48-2:7:50",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_existing_style.d2,2:6:49-2:7:50",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index 672a3f564..77f29a89f 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -34,9 +34,9 @@
                       "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:19:27",
                       "edges": [
                         {
-                          "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:9:17",
+                          "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:8:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:4:12",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:3:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -71,9 +71,9 @@
                           "dst_arrow": ">"
                         },
                         {
-                          "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:13:21",
+                          "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:13:21",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -90,7 +90,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:11:19-1:13:21",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:12:20-1:13:21",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -129,7 +129,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:9:37",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:5:33",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:4:32",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -146,7 +146,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:7:35-2:9:37",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:8:36-2:9:37",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -365,7 +365,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:4:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:2:10-1:3:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -385,7 +385,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:5:33",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:3:31-2:4:32",
               "path": [
                 {
                   "unquoted_string": {
@@ -432,7 +432,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -452,7 +452,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:6:14-1:9:17",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
@@ -472,7 +472,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:7:35-2:9:37",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,2:8:36-2:9:37",
               "path": [
                 {
                   "unquoted_string": {
@@ -519,7 +519,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:11:19-1:13:21",
+              "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:12:20-1:13:21",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index ded67e709..982c8f52f 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:7:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:3:15",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:2:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:5:17-1:7:19",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:6:18-1:7:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -299,7 +299,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -319,7 +319,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:3:15",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:1:13-1:2:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -366,7 +366,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -386,7 +386,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -406,7 +406,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:5:17-1:7:19",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:6:18-1:7:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -453,7 +453,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index f0ae94d5d..0ac79eff4 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:20:30",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:9:19",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:8:18",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:11:21-1:20:30",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:12:22-1:20:30",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -121,7 +121,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:8:51",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:4:47",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:3:46",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -138,7 +138,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:6:49-4:8:51",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:7:50-4:8:51",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -312,7 +312,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:9:19",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:2:12-1:8:18",
               "path": [
                 {
                   "unquoted_string": {
@@ -359,7 +359,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:11:21-1:20:30",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:12:22-1:20:30",
               "path": [
                 {
                   "unquoted_string": {
@@ -453,7 +453,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:4:47",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:2:45-4:3:46",
               "path": [
                 {
                   "unquoted_string": {
@@ -500,7 +500,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:6:49-4:8:51",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,4:7:50-4:8:51",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
index c1c983fad..1cb85fb45 100644
--- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:11:11",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:11:11",
+                "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:9:9-0:11:11",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:7:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:3:15",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:2:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:5:17-1:7:19",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:6:18-1:7:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -279,7 +279,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -299,7 +299,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:3:15",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:1:13-1:2:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -346,7 +346,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -366,7 +366,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -386,7 +386,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:5:17-1:7:19",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,1:6:18-1:7:19",
               "path": [
                 {
                   "unquoted_string": {
@@ -433,7 +433,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:9:9-0:11:11",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_merge_style.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index be7387a8d..f1aa1ad6c 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:8:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:4:12",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:3:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:6:14-1:8:16",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -205,7 +205,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:4:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:2:10-1:3:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -252,7 +252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:6:14-1:8:16",
+              "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
index ab67c717c..dcc248bb9 100644
--- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
+++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
@@ -35,7 +35,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:10:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5",
                   "path": [
                     {
                       "unquoted_string": {
@@ -63,7 +63,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -233,7 +233,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -264,7 +264,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -322,7 +322,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:4:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:0:2-1:3:5",
               "path": [
                 {
                   "unquoted_string": {
@@ -380,7 +380,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:6:8-1:10:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_key_and_key.d2,1:7:9-1:10:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json
index a55c91c0a..e7649247a 100644
--- a/testdata/d2oracle/TestSet/edge_label.exp.json
+++ b/testdata/d2oracle/TestSet/edge_label.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -178,7 +178,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -225,7 +225,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_label.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index 124ccee33..0fbdc6921 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -283,7 +283,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
index cc5c9b6eb..d74f7c436 100644
--- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -218,7 +218,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -265,7 +265,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_merge_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index 73a1c5b79..19305fea6 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:8:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:4:12",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:3:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:6:14-1:8:16",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -205,7 +205,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:4:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:2:10-1:3:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -252,7 +252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:6:14-1:8:16",
+              "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
index 4781ea1c7..848b41a6b 100644
--- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:8:16",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:4:12",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:3:11",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:6:14-1:8:16",
+                            "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:7:15-1:8:16",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -255,7 +255,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:4:12",
+              "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:2:10-1:3:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -302,7 +302,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:6:14-1:8:16",
+              "range": "d2/testdata/d2oracle/TestSet/edge_nested_style_set.d2,1:7:15-1:8:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index ed0a6baff..07bc4b429 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index da49006e5..b08a28eb2 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:7:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:3:10",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:2:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:5:12-1:7:14",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:6:13-1:7:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -230,7 +230,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -250,7 +250,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:3:10",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:1:8-1:2:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -297,7 +297,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -317,7 +317,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:5:12-1:7:14",
+              "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:6:13-1:7:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index e3c6f6c31..628da4b0d 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json
index 5d048c690..a43045369 100644
--- a/testdata/d2oracle/TestSet/label_primary.exp.json
+++ b/testdata/d2oracle/TestSet/label_primary.exp.json
@@ -42,7 +42,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:8:60",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:4:56",
+                            "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:3:55",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -59,7 +59,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:6:58-1:8:60",
+                            "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:7:59-1:8:60",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -201,7 +201,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:4:56",
+              "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:2:54-1:3:55",
               "path": [
                 {
                   "unquoted_string": {
@@ -248,7 +248,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:6:58-1:8:60",
+              "range": "d2/testdata/d2oracle/TestSet/label_primary.d2,1:7:59-1:8:60",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index 03123bb2c..99d831ce6 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -152,7 +152,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -219,7 +219,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index da163d796..a022a2076 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -69,7 +69,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:14:34",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:7:27",
+                            "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:6:26",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -86,7 +86,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:9:29-2:14:34",
+                            "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:10:30-2:14:34",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -271,7 +271,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:7:27",
+              "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:2:22-2:6:26",
               "path": [
                 {
                   "unquoted_string": {
@@ -318,7 +318,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:9:29-2:14:34",
+              "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:10:30-2:14:34",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index 248870e77..eba63f5ee 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -236,7 +236,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index 3de2bb5bc..466375933 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -207,7 +207,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -254,7 +254,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
index f5ce4d7f6..a4de62e89 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -212,7 +212,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -259,7 +259,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
index 4499d37b8..aefa1e8f2 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -187,7 +187,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -234,7 +234,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestSet/replace_edge_style_map.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/()_keys.exp.json b/testdata/d2parser/TestParse/()_keys.exp.json
index 5326c814c..4853db83a 100644
--- a/testdata/d2parser/TestParse/()_keys.exp.json
+++ b/testdata/d2parser/TestParse/()_keys.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:17:18",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:8:9",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:0:1-1:7:8",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:10:11-1:17:18",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,1:11:12-1:17:18",
                 "path": [
                   {
                     "unquoted_string": {
@@ -52,7 +52,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:44:63",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:5:24",
+            "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:0:19-2:4:23",
             "path": [
               {
                 "unquoted_string": {
@@ -69,9 +69,9 @@
           },
           "edges": [
             {
-              "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:13:32",
+              "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:12:31",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:8:27",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:6:25-2:7:26",
                 "path": [
                   {
                     "unquoted_string": {
@@ -88,7 +88,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:13:32",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:12:31",
                 "path": [
                   {
                     "unquoted_string": {
@@ -106,9 +106,9 @@
               "dst_arrow": ">"
             },
             {
-              "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:17:36",
+              "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:17:36",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:10:29-2:13:32",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:11:30-2:12:31",
                 "path": [
                   {
                     "unquoted_string": {
@@ -125,7 +125,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:15:34-2:17:36",
+                "range": "d2/testdata/d2parser/TestParse/()_keys.d2,2:16:35-2:17:36",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/edge.exp.json b/testdata/d2parser/TestParse/edge.exp.json
index a2fabcc7a..6fe93bd79 100644
--- a/testdata/d2parser/TestParse/edge.exp.json
+++ b/testdata/d2parser/TestParse/edge.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:6:7",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:2:3",
+                "range": "d2/testdata/d2parser/TestParse/edge.d2,1:0:1-1:1:2",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/edge.d2,1:4:5-1:6:7",
+                "range": "d2/testdata/d2parser/TestParse/edge.d2,1:5:6-1:6:7",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/edge_group_value.exp.json b/testdata/d2parser/TestParse/edge_group_value.exp.json
index 6192c2f73..c9d4df1c4 100644
--- a/testdata/d2parser/TestParse/edge_group_value.exp.json
+++ b/testdata/d2parser/TestParse/edge_group_value.exp.json
@@ -6,7 +6,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:20:21",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:2:3",
+            "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:0:1-1:1:2",
             "path": [
               {
                 "unquoted_string": {
@@ -25,7 +25,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:9:10",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:5:6",
+                "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:3:4-1:4:5",
                 "path": [
                   {
                     "unquoted_string": {
@@ -42,7 +42,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:7:8-1:9:10",
+                "range": "d2/testdata/d2parser/TestParse/edge_group_value.d2,1:8:9-1:9:10",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/edge_key.exp.json b/testdata/d2parser/TestParse/edge_key.exp.json
index 21f56445e..54507bf64 100644
--- a/testdata/d2parser/TestParse/edge_key.exp.json
+++ b/testdata/d2parser/TestParse/edge_key.exp.json
@@ -6,7 +6,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:25:26",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:2:3",
+            "range": "d2/testdata/d2parser/TestParse/edge_key.d2,1:0:1-1:1:2",
             "path": [
               {
                 "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/edge_line_continuation.exp.json b/testdata/d2parser/TestParse/edge_line_continuation.exp.json
index f6444a5dc..f6aadbe75 100644
--- a/testdata/d2parser/TestParse/edge_line_continuation.exp.json
+++ b/testdata/d2parser/TestParse/edge_line_continuation.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-2:41:71",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-1:25:26",
+                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,1:0:1-1:24:25",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,2:4:34-2:41:71",
+                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation.d2,2:5:35-2:41:71",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json b/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json
index 1e5f4b296..45aa5857d 100644
--- a/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json
+++ b/testdata/d2parser/TestParse/edge_line_continuation_2.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-2:38:68",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-1:25:26",
+                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,1:0:1-1:24:25",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,2:1:31-2:38:68",
+                "range": "d2/testdata/d2parser/TestParse/edge_line_continuation_2.d2,2:2:32-2:38:68",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/errs.exp.json b/testdata/d2parser/TestParse/errs.exp.json
index 5136c50a2..fd23802c4 100644
--- a/testdata/d2parser/TestParse/errs.exp.json
+++ b/testdata/d2parser/TestParse/errs.exp.json
@@ -272,7 +272,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:12:179",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:5:172",
+            "range": "d2/testdata/d2parser/TestParse/errs.d2,23:0:167-23:4:171",
             "path": [
               {
                 "unquoted_string": {
@@ -327,7 +327,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:6:186",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:2:182",
+                "range": "d2/testdata/d2parser/TestParse/errs.d2,24:0:180-24:1:181",
                 "path": [
                   {
                     "unquoted_string": {
@@ -344,7 +344,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/errs.d2,24:4:184-24:6:186",
+                "range": "d2/testdata/d2parser/TestParse/errs.d2,24:5:185-24:6:186",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/key_with_edge.exp.json b/testdata/d2parser/TestParse/key_with_edge.exp.json
index 43687d963..bae57af5d 100644
--- a/testdata/d2parser/TestParse/key_with_edge.exp.json
+++ b/testdata/d2parser/TestParse/key_with_edge.exp.json
@@ -6,7 +6,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:8:9",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:2:3",
+            "range": "d2/testdata/d2parser/TestParse/key_with_edge.d2,1:0:1-1:1:2",
             "path": [
               {
                 "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/less_than_edge#955.exp.json b/testdata/d2parser/TestParse/less_than_edge#955.exp.json
index 210a80f52..607206c78 100644
--- a/testdata/d2parser/TestParse/less_than_edge#955.exp.json
+++ b/testdata/d2parser/TestParse/less_than_edge#955.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:6:7",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:2:3",
+                "range": "d2/testdata/d2parser/TestParse/less_than_edge#955.d2,1:0:1-1:1:2",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/merged_shapes_#322.exp.json b/testdata/d2parser/TestParse/merged_shapes_#322.exp.json
index bab9e488b..5d3c0c527 100644
--- a/testdata/d2parser/TestParse/merged_shapes_#322.exp.json
+++ b/testdata/d2parser/TestParse/merged_shapes_#322.exp.json
@@ -6,7 +6,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:2:3",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:2:3",
+            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,1:0:1-1:1:2",
             "path": [
               {
                 "unquoted_string": {
@@ -29,7 +29,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:2:6",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:2:6",
+            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,2:0:4-2:1:5",
             "path": [
               {
                 "unquoted_string": {
@@ -52,7 +52,7 @@
         "map_key": {
           "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:2:9",
           "key": {
-            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:2:9",
+            "range": "d2/testdata/d2parser/TestParse/merged_shapes_#322.d2,3:0:7-3:1:8",
             "path": [
               {
                 "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/multiple_edges.exp.json b/testdata/d2parser/TestParse/multiple_edges.exp.json
index 4fa6cf36c..57ef51f6d 100644
--- a/testdata/d2parser/TestParse/multiple_edges.exp.json
+++ b/testdata/d2parser/TestParse/multiple_edges.exp.json
@@ -7,9 +7,9 @@
           "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:11:12",
           "edges": [
             {
-              "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:7:8",
+              "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:6:7",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:2:3",
+                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:0:1-1:1:2",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:7:8",
+                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:6:7",
                 "path": [
                   {
                     "unquoted_string": {
@@ -44,9 +44,9 @@
               "dst_arrow": ">"
             },
             {
-              "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:11:12",
+              "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:11:12",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:4:5-1:7:8",
+                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:5:6-1:6:7",
                 "path": [
                   {
                     "unquoted_string": {
@@ -63,7 +63,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:9:10-1:11:12",
+                "range": "d2/testdata/d2parser/TestParse/multiple_edges.d2,1:10:11-1:11:12",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/primary.exp.json b/testdata/d2parser/TestParse/primary.exp.json
index c247a96ce..da623705c 100644
--- a/testdata/d2parser/TestParse/primary.exp.json
+++ b/testdata/d2parser/TestParse/primary.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:6:7",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:2:3",
+                "range": "d2/testdata/d2parser/TestParse/primary.d2,1:0:1-1:1:2",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/primary.d2,1:4:5-1:6:7",
+                "range": "d2/testdata/d2parser/TestParse/primary.d2,1:5:6-1:6:7",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/subst.exp.json b/testdata/d2parser/TestParse/subst.exp.json
index 6dd9d488c..4c486d24d 100644
--- a/testdata/d2parser/TestParse/subst.exp.json
+++ b/testdata/d2parser/TestParse/subst.exp.json
@@ -9,7 +9,7 @@
             {
               "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:6:7",
               "src": {
-                "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:2:3",
+                "range": "d2/testdata/d2parser/TestParse/subst.d2,1:0:1-1:1:2",
                 "path": [
                   {
                     "unquoted_string": {
@@ -26,7 +26,7 @@
               },
               "src_arrow": "",
               "dst": {
-                "range": "d2/testdata/d2parser/TestParse/subst.d2,1:4:5-1:6:7",
+                "range": "d2/testdata/d2parser/TestParse/subst.d2,1:5:6-1:6:7",
                 "path": [
                   {
                     "unquoted_string": {
diff --git a/testdata/d2parser/TestParse/table_and_class.exp.json b/testdata/d2parser/TestParse/table_and_class.exp.json
index 14df29b66..b44e38f25 100644
--- a/testdata/d2parser/TestParse/table_and_class.exp.json
+++ b/testdata/d2parser/TestParse/table_and_class.exp.json
@@ -459,7 +459,7 @@
                       {
                         "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:30:355",
                         "src": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:16:341",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:2:327-14:15:340",
                           "path": [
                             {
                               "unquoted_string": {
@@ -487,7 +487,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:18:343-14:30:355",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,14:19:344-14:30:355",
                           "path": [
                             {
                               "unquoted_string": {
@@ -533,7 +533,7 @@
                       {
                         "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:40:419",
                         "src": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:14:393",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:2:381-17:13:392",
                           "path": [
                             {
                               "unquoted_string": {
@@ -561,7 +561,7 @@
                         },
                         "src_arrow": "",
                         "dst": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:16:395-17:40:419",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,17:17:396-17:40:419",
                           "path": [
                             {
                               "unquoted_string": {
@@ -607,7 +607,7 @@
                       {
                         "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:30:470",
                         "src": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:14:454",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:2:442-20:13:453",
                           "path": [
                             {
                               "unquoted_string": {
@@ -635,7 +635,7 @@
                         },
                         "src_arrow": "<",
                         "dst": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:16:456-20:30:470",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,20:17:457-20:30:470",
                           "path": [
                             {
                               "unquoted_string": {
@@ -675,7 +675,7 @@
                       {
                         "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:31:502",
                         "src": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:14:485",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:2:473-21:13:484",
                           "path": [
                             {
                               "unquoted_string": {
@@ -703,7 +703,7 @@
                         },
                         "src_arrow": "<",
                         "dst": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:17:488-21:31:502",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,21:18:489-21:31:502",
                           "path": [
                             {
                               "unquoted_string": {
@@ -1193,7 +1193,7 @@
                       {
                         "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:21:1005",
                         "src": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:7:991",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:2:986-43:6:990",
                           "path": [
                             {
                               "unquoted_string": {
@@ -1210,7 +1210,7 @@
                         },
                         "src_arrow": "<",
                         "dst": {
-                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:9:993-43:21:1005",
+                          "range": "d2/testdata/d2parser/TestParse/table_and_class.d2,43:10:994-43:21:1005",
                           "path": [
                             {
                               "unquoted_string": {

From eb30d8af90b23f1bb8c7a00f9dd7bc4f0ed00401 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Fri, 5 May 2023 09:21:28 -0700
Subject: [PATCH 5/5] rebase and TA=1

---
 .../TestCLI_E2E/internal_linked_pdf.exp.pdf   | Bin 79993 -> 79721 bytes
 .../d2oracle/TestReconnectEdge/basic.exp.json |   8 ++---
 .../d2oracle/TestReconnectEdge/both.exp.json  |   8 ++---
 .../TestReconnectEdge/contained.exp.json      |  12 +++----
 .../TestReconnectEdge/in_chain_3.exp.json     |  28 ++++++++--------
 .../TestReconnectEdge/in_chain_4.exp.json     |  28 ++++++++--------
 .../TestReconnectEdge/indexed_ref.exp.json    |  16 +++++-----
 .../d2oracle/TestReconnectEdge/loop.exp.json  |   8 ++---
 .../TestReconnectEdge/middle_chain.exp.json   |  16 +++++-----
 .../middle_chain_both.exp.json                |  24 +++++++-------
 .../middle_chain_first.exp.json               |  30 +++++++++---------
 .../middle_chain_last.exp.json                |  30 +++++++++---------
 .../middle_chain_src.exp.json                 |  16 +++++-----
 .../preserve_old_obj.exp.json                 |  16 +++++-----
 .../TestReconnectEdge/reverse.exp.json        |   8 ++---
 .../TestReconnectEdge/scope_inner.exp.json    |  10 +++---
 .../TestReconnectEdge/scope_outer.exp.json    |   8 ++---
 .../TestReconnectEdge/second_index.exp.json   |  16 +++++-----
 .../d2oracle/TestReconnectEdge/src.exp.json   |   8 ++---
 19 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index f1cacfcac3a1d6d4364f31e45c288233a0fe208b..afb943fb568adb205a38a312b011c3869819fe26 100644
GIT binary patch
delta 39824
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

delta 40090
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
BExP~!

diff --git a/testdata/d2oracle/TestReconnectEdge/basic.exp.json b/testdata/d2oracle/TestReconnectEdge/basic.exp.json
index 5ecabc316..de1448f24 100644
--- a/testdata/d2oracle/TestReconnectEdge/basic.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/basic.exp.json
@@ -81,7 +81,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:0:6-3:6:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:0:6-3:2:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:0:6-3:1:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -98,7 +98,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:4:10-3:6:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:5:11-3:6:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -208,7 +208,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:0:6-3:2:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:0:6-3:1:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -322,7 +322,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:4:10-3:6:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/basic.d2,3:5:11-3:6:12",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/both.exp.json b/testdata/d2oracle/TestReconnectEdge/both.exp.json
index f2a26f07d..a0576bd06 100644
--- a/testdata/d2oracle/TestReconnectEdge/both.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/both.exp.json
@@ -81,7 +81,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:0:6-3:6:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:0:6-3:2:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:0:6-3:1:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -98,7 +98,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:4:10-3:6:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:5:11-3:6:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -208,7 +208,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:4:10-3:6:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:5:11-3:6:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -275,7 +275,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:0:6-3:2:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/both.d2,3:0:6-3:1:7",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/contained.exp.json b/testdata/d2oracle/TestReconnectEdge/contained.exp.json
index 3a05ce263..e8dc7cb8c 100644
--- a/testdata/d2oracle/TestReconnectEdge/contained.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/contained.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:10:10",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:4:4",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:3:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -40,7 +40,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:6:6-0:10:10",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:7:7-0:10:10",
                   "path": [
                     {
                       "unquoted_string": {
@@ -209,7 +209,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -240,7 +240,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:6:6-0:10:10",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:7:7-0:10:10",
               "path": [
                 {
                   "unquoted_string": {
@@ -360,7 +360,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:4:4",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:0:0-0:3:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -418,7 +418,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:6:6-0:10:10",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/contained.d2,0:7:7-0:10:10",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json
index 84a4f42f3..4ce97de19 100644
--- a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:11:12",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:7:8",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:4:5-1:11:12",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:5:6-1:11:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:9:10-1:11:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:10:11-1:11:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:0:13-2:6:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:0:13-2:2:15",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:0:13-2:1:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:4:17-2:6:19",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:5:18-2:6:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -266,7 +266,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -313,7 +313,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -333,7 +333,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -353,7 +353,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:0:13-2:2:15",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:0:13-2:1:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -400,7 +400,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:9:10-1:11:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,1:10:11-1:11:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -420,7 +420,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:4:17-2:6:19",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_3.d2,2:5:18-2:6:19",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json
index c9881b7df..95dca10fa 100644
--- a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:11:12",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:7:8",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:4:5-1:11:12",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:5:6-1:11:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:4:5-1:7:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:9:10-1:11:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:10:11-1:11:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -95,7 +95,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:0:13-2:6:19",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:0:13-2:2:15",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:0:13-2:1:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -112,7 +112,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:4:17-2:6:19",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:5:18-2:6:19",
                   "path": [
                     {
                       "unquoted_string": {
@@ -289,7 +289,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -309,7 +309,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:9:10-1:11:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:10:11-1:11:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -356,7 +356,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -376,7 +376,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:4:5-1:7:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -396,7 +396,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:0:13-2:2:15",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:0:13-2:1:14",
               "path": [
                 {
                   "unquoted_string": {
@@ -443,7 +443,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:4:17-2:6:19",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/in_chain_4.d2,2:5:18-2:6:19",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
index 56f86712b..c0a19b4e2 100644
--- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -104,7 +104,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:1:12-3:7:18",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:1:12-3:3:14",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:1:12-3:2:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -121,7 +121,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:5:16-3:7:18",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:6:17-3:7:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -260,7 +260,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -280,7 +280,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:1:12-3:3:14",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:1:12-3:2:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -327,7 +327,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -367,7 +367,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:5:16-3:7:18",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:6:17-3:7:18",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/loop.exp.json b/testdata/d2oracle/TestReconnectEdge/loop.exp.json
index 16231c290..ade8dc21c 100644
--- a/testdata/d2oracle/TestReconnectEdge/loop.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/loop.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -142,7 +142,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -189,7 +189,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/loop.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json
index a926f2f27..cdf52c2c7 100644
--- a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:0:1-1:6:7",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:0:1-1:2:3",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:0:1-1:1:2",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:4:5-1:6:7",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:5:6-1:6:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:0:8-2:6:14",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:0:8-2:2:10",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:0:8-2:1:9",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:4:12-2:6:14",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:5:13-2:6:14",
                   "path": [
                     {
                       "unquoted_string": {
@@ -220,7 +220,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:0:1-1:2:3",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:0:1-1:1:2",
               "path": [
                 {
                   "unquoted_string": {
@@ -267,7 +267,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:4:5-1:6:7",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,1:5:6-1:6:7",
               "path": [
                 {
                   "unquoted_string": {
@@ -314,7 +314,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:0:8-2:2:10",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:0:8-2:1:9",
               "path": [
                 {
                   "unquoted_string": {
@@ -361,7 +361,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:4:12-2:6:14",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain.d2,2:5:13-2:6:14",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json
index e85957343..d7ae830db 100644
--- a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:0:7-1:6:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:0:7-1:2:9",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:0:7-1:1:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:4:11-1:6:13",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:5:12-1:6:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -104,7 +104,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:0:14-2:6:20",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:0:14-2:2:16",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:0:14-2:1:15",
                   "path": [
                     {
                       "unquoted_string": {
@@ -121,7 +121,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:4:18-2:6:20",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:5:19-2:6:20",
                   "path": [
                     {
                       "unquoted_string": {
@@ -298,7 +298,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -345,7 +345,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -392,7 +392,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:0:7-1:2:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:0:7-1:1:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -439,7 +439,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:4:11-1:6:13",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,1:5:12-1:6:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -486,7 +486,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:0:14-2:2:16",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:0:14-2:1:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -506,7 +506,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:4:18-2:6:20",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_both.d2,2:5:19-2:6:20",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json
index d271c4d14..98730392c 100644
--- a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json
@@ -33,9 +33,9 @@
             "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:16:18",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:7:9",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:6:8",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:2:4",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:1:3",
                   "path": [
                     {
                       "unquoted_string": {
@@ -52,7 +52,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:4:6-1:7:9",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -70,9 +70,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:4:6-1:12:14",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:5:7-1:11:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:4:6-1:7:9",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:5:7-1:6:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -89,7 +89,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:9:11-1:12:14",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:10:12-1:11:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -107,9 +107,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:9:11-1:16:18",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:10:12-1:16:18",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:9:11-1:12:14",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:10:12-1:11:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -126,7 +126,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:14:16-1:16:18",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:15:17-1:16:18",
                   "path": [
                     {
                       "unquoted_string": {
@@ -350,7 +350,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:2:4",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:0:2-1:1:3",
               "path": [
                 {
                   "unquoted_string": {
@@ -417,7 +417,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:4:6-1:7:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -437,7 +437,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:4:6-1:7:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:5:7-1:6:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -484,7 +484,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:9:11-1:12:14",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:10:12-1:11:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -504,7 +504,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:9:11-1:12:14",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:10:12-1:11:13",
               "path": [
                 {
                   "unquoted_string": {
@@ -551,7 +551,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:14:16-1:16:18",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_first.d2,1:15:17-1:16:18",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json
index 0b1d4216b..4eeebb991 100644
--- a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json
@@ -10,9 +10,9 @@
             "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:16:16",
             "edges": [
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:7:7",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -47,9 +47,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:4:4-0:12:12",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:5:5-0:11:11",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:4:4-0:7:7",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -66,7 +66,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:9:9-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -84,9 +84,9 @@
                 "dst_arrow": ">"
               },
               {
-                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:9:9-0:16:16",
+                "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:10:10-0:16:16",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:9:9-0:12:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:10:10-0:11:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -103,7 +103,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:14:14-0:16:16",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:15:15-0:16:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -303,7 +303,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -350,7 +350,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -370,7 +370,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:4:4-0:7:7",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -417,7 +417,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:9:9-0:12:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -437,7 +437,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:9:9-0:12:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:10:10-0:11:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -484,7 +484,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:14:14-0:16:16",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_last.d2,0:15:15-0:16:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json
index 9f9afb350..f34d227e4 100644
--- a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -58,7 +58,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:0:7-1:6:13",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:0:7-1:2:9",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:0:7-1:1:8",
                   "path": [
                     {
                       "unquoted_string": {
@@ -75,7 +75,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:4:11-1:6:13",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:5:12-1:6:13",
                   "path": [
                     {
                       "unquoted_string": {
@@ -220,7 +220,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -267,7 +267,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -314,7 +314,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:0:7-1:2:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:0:7-1:1:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -381,7 +381,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:4:11-1:6:13",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/middle_chain_src.d2,1:5:12-1:6:13",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
index d4f958d72..f8bff7817 100644
--- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -81,7 +81,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:1:10-2:7:16",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:1:10-2:3:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:1:10-2:2:11",
                   "path": [
                     {
                       "unquoted_string": {
@@ -98,7 +98,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:5:14-2:7:16",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:6:15-2:7:16",
                   "path": [
                     {
                       "unquoted_string": {
@@ -260,7 +260,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -280,7 +280,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:1:10-2:3:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:1:10-2:2:11",
               "path": [
                 {
                   "unquoted_string": {
@@ -327,7 +327,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -347,7 +347,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:5:14-2:7:16",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:6:15-2:7:16",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json
index 705a45c2b..75faa2ad7 100644
--- a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -119,7 +119,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -166,7 +166,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/reverse.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json
index 64aa981c7..ecc1c84f4 100644
--- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:6:11-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:7:12-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -281,7 +281,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -328,7 +328,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:6:11-1:10:15",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:7:12-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
@@ -406,7 +406,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:6:11-1:10:15",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_inner.d2,1:7:12-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json
index 49329e84b..a80bd4e6a 100644
--- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json
@@ -36,7 +36,7 @@
                         {
                           "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:2:7-1:10:15",
                           "src": {
-                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:2:7-1:4:9",
+                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:2:7-1:3:8",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -53,7 +53,7 @@
                           },
                           "src_arrow": "",
                           "dst": {
-                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:6:11-1:10:15",
+                            "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:7:12-1:10:15",
                             "path": [
                               {
                                 "unquoted_string": {
@@ -252,7 +252,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:2:7-1:4:9",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:2:7-1:3:8",
               "path": [
                 {
                   "unquoted_string": {
@@ -299,7 +299,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:6:11-1:10:15",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/scope_outer.d2,1:7:12-1:10:15",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
index 86d13adfe..0e31d4886 100644
--- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
@@ -12,7 +12,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:0:0-0:6:6",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:0:0-0:2:2",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:0:0-0:1:1",
                   "path": [
                     {
                       "unquoted_string": {
@@ -29,7 +29,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:4:4-0:6:6",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:5:5-0:6:6",
                   "path": [
                     {
                       "unquoted_string": {
@@ -108,7 +108,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:0:33-3:6:39",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:0:33-3:2:35",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:0:33-3:1:34",
                   "path": [
                     {
                       "unquoted_string": {
@@ -125,7 +125,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:4:37-3:6:39",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:5:38-3:6:39",
                   "path": [
                     {
                       "unquoted_string": {
@@ -328,7 +328,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:0:0-0:2:2",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:0:0-0:1:1",
               "path": [
                 {
                   "unquoted_string": {
@@ -348,7 +348,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:0:33-3:2:35",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:0:33-3:1:34",
               "path": [
                 {
                   "unquoted_string": {
@@ -395,7 +395,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:4:4-0:6:6",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,0:5:5-0:6:6",
               "path": [
                 {
                   "unquoted_string": {
@@ -442,7 +442,7 @@
         "references": [
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:4:37-3:6:39",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,3:5:38-3:6:39",
               "path": [
                 {
                   "unquoted_string": {
diff --git a/testdata/d2oracle/TestReconnectEdge/src.exp.json b/testdata/d2oracle/TestReconnectEdge/src.exp.json
index a7651be9a..c7177e566 100644
--- a/testdata/d2oracle/TestReconnectEdge/src.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/src.exp.json
@@ -81,7 +81,7 @@
               {
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:0:6-3:6:12",
                 "src": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:0:6-3:2:8",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:0:6-3:1:7",
                   "path": [
                     {
                       "unquoted_string": {
@@ -98,7 +98,7 @@
                 },
                 "src_arrow": "",
                 "dst": {
-                  "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:4:10-3:6:12",
+                  "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:5:11-3:6:12",
                   "path": [
                     {
                       "unquoted_string": {
@@ -255,7 +255,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:4:10-3:6:12",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:5:11-3:6:12",
               "path": [
                 {
                   "unquoted_string": {
@@ -322,7 +322,7 @@
           },
           {
             "key": {
-              "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:0:6-3:2:8",
+              "range": "d2/testdata/d2oracle/TestReconnectEdge/src.d2,3:0:6-3:1:7",
               "path": [
                 {
                   "unquoted_string": {