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 f1cacfcac..afb943fb5 100644
Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ
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": {