diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap
index ba19092..f0bd382 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap
@@ -15,5 +15,4 @@ nodes:
         length: 18
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap.new
deleted file mode 100644
index 5981ae0..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap.new
+++ /dev/null
@@ -1,20 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 610
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<!-- HTML comment -->"
-      span:
-        start: 0
-        length: 21
-  - Comment:
-      content: Django comment
-      span:
-        start: 21
-        length: 18
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap
index 39f2f54..dc1ea7b 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap
@@ -71,5 +71,4 @@ nodes:
         length: 8
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap.new
deleted file mode 100644
index a38524c..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap.new
+++ /dev/null
@@ -1,76 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 537
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - x
-        - ">"
-        - "0"
-      children:
-        - Text:
-            content: Positive
-            span:
-              start: 14
-              length: 8
-        - Block:
-            block_type: Branch
-            name: elif
-            bits:
-              - x
-              - "<"
-              - "0"
-            children:
-              - Text:
-                  content: Negative
-                  span:
-                    start: 38
-                    length: 8
-            span:
-              start: 0
-              length: 8
-            tag_span:
-              start: 0
-              length: 8
-        - Block:
-            block_type: Branch
-            name: else
-            bits: []
-            children:
-              - Text:
-                  content: Zero
-                  span:
-                    start: 56
-                    length: 4
-            span:
-              start: 0
-              length: 8
-            tag_span:
-              start: 0
-              length: 8
-        - Block:
-            block_type: Closing
-            name: endif
-            bits: []
-            children: ~
-            span:
-              start: 60
-              length: 5
-            tag_span:
-              start: 0
-              length: 8
-      span:
-        start: 0
-        length: 65
-      tag_span:
-        start: 0
-        length: 8
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap
index 3141a63..c0b743a 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap
@@ -54,5 +54,4 @@ nodes:
         length: 17
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap.new
deleted file mode 100644
index 31f759d..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap.new
+++ /dev/null
@@ -1,59 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 529
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: for
-      bits:
-        - for
-        - item
-        - in
-        - items
-      children:
-        - Variable:
-            bits:
-              - item
-            filters: []
-            span:
-              start: 23
-              length: 4
-        - Block:
-            block_type: Branch
-            name: empty
-            bits: []
-            children:
-              - Text:
-                  content: No items
-                  span:
-                    start: 44
-                    length: 8
-            span:
-              start: 0
-              length: 17
-            tag_span:
-              start: 0
-              length: 17
-        - Block:
-            block_type: Closing
-            name: endfor
-            bits: []
-            children: ~
-            span:
-              start: 52
-              length: 6
-            tag_span:
-              start: 0
-              length: 17
-      span:
-        start: 0
-        length: 58
-      tag_span:
-        start: 0
-        length: 17
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap
index a890b84..a3fd5f7 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap
@@ -34,5 +34,4 @@ nodes:
         length: 24
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap.new
deleted file mode 100644
index 3702df5..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap.new
+++ /dev/null
@@ -1,39 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 521
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - user.is_authenticated
-      children:
-        - Text:
-            content: Welcome
-            span:
-              start: 30
-              length: 7
-        - Block:
-            block_type: Closing
-            name: endif
-            bits: []
-            children: ~
-            span:
-              start: 37
-              length: 5
-            tag_span:
-              start: 0
-              length: 24
-      span:
-        start: 0
-        length: 42
-      tag_span:
-        start: 0
-        length: 24
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap
index d8ce616..0a4dfbb 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap
@@ -18,5 +18,4 @@ nodes:
         length: 15
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap.new
deleted file mode 100644
index c948b78..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap.new
+++ /dev/null
@@ -1,23 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 505
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Variable:
-      bits:
-        - user
-        - name
-      filters:
-        - name: title
-          arguments: []
-          span:
-            start: 10
-            length: 5
-      span:
-        start: 0
-        length: 15
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap
index d9d3d39..23c7895 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap
@@ -28,5 +28,4 @@ nodes:
         length: 35
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap.new
deleted file mode 100644
index bfc91ad..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap.new
+++ /dev/null
@@ -1,33 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 513
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Variable:
-      bits:
-        - value
-      filters:
-        - name: default
-          arguments:
-            - "'nothing'"
-          span:
-            start: 6
-            length: 17
-        - name: title
-          arguments: []
-          span:
-            start: 24
-            length: 5
-        - name: upper
-          arguments: []
-          span:
-            start: 30
-            length: 5
-      span:
-        start: 0
-        length: 35
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap
index 409e30b..cdde84b 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap
@@ -252,17 +252,16 @@ nodes:
         length: 1
 line_offsets:
   - 0
-  - 0
-  - 39
-  - 81
-  - 116
-  - 159
+  - 34
+  - 70
+  - 99
+  - 130
+  - 149
   - 184
-  - 231
-  - 273
-  - 289
-  - 309
-  - 326
-  - 337
-  - 347
+  - 214
+  - 224
+  - 244
+  - 255
+  - 260
+  - 270
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap.new
deleted file mode 100644
index 3a85269..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap.new
+++ /dev/null
@@ -1,269 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 566
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "Welcome, "
-      span:
-        start: 0
-        length: 9
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - user.is_authenticated
-      children:
-        - Text:
-            content: "\n    "
-            span:
-              start: 39
-              length: 5
-        - Variable:
-            bits:
-              - user
-              - name
-            filters:
-              - name: title
-                arguments: []
-                span:
-                  start: 54
-                  length: 5
-              - name: default
-                arguments:
-                  - "'Guest'"
-                span:
-                  start: 60
-                  length: 15
-            span:
-              start: 44
-              length: 31
-        - Text:
-            content: "\n    "
-            span:
-              start: 81
-              length: 5
-        - Block:
-            block_type: Standard
-            name: for
-            bits:
-              - for
-              - group
-              - in
-              - user.groups
-            children:
-              - Text:
-                  content: "\n        "
-                  span:
-                    start: 116
-                    length: 9
-              - Block:
-                  block_type: Standard
-                  name: if
-                  bits:
-                    - if
-                    - forloop.first
-                  children:
-                    - Text:
-                        content: (
-                        span:
-                          start: 147
-                          length: 1
-                    - Block:
-                        block_type: Closing
-                        name: endif
-                        bits: []
-                        children: ~
-                        span:
-                          start: 148
-                          length: 5
-                        tag_span:
-                          start: 125
-                          length: 16
-                  span:
-                    start: 125
-                    length: 28
-                  tag_span:
-                    start: 125
-                    length: 16
-              - Text:
-                  content: "\n        "
-                  span:
-                    start: 159
-                    length: 9
-              - Variable:
-                  bits:
-                    - group
-                    - name
-                  filters: []
-                  span:
-                    start: 168
-                    length: 10
-              - Text:
-                  content: "\n        "
-                  span:
-                    start: 184
-                    length: 9
-              - Block:
-                  block_type: Standard
-                  name: if
-                  bits:
-                    - if
-                    - not
-                    - forloop.last
-                  children:
-                    - Text:
-                        content: ", "
-                        span:
-                          start: 218
-                          length: 2
-                    - Block:
-                        block_type: Closing
-                        name: endif
-                        bits: []
-                        children: ~
-                        span:
-                          start: 220
-                          length: 5
-                        tag_span:
-                          start: 193
-                          length: 19
-                  span:
-                    start: 193
-                    length: 32
-                  tag_span:
-                    start: 193
-                    length: 19
-              - Text:
-                  content: "\n        "
-                  span:
-                    start: 231
-                    length: 9
-              - Block:
-                  block_type: Standard
-                  name: if
-                  bits:
-                    - if
-                    - forloop.last
-                  children:
-                    - Text:
-                        content: )
-                        span:
-                          start: 261
-                          length: 1
-                    - Block:
-                        block_type: Closing
-                        name: endif
-                        bits: []
-                        children: ~
-                        span:
-                          start: 262
-                          length: 5
-                        tag_span:
-                          start: 240
-                          length: 15
-                  span:
-                    start: 240
-                    length: 27
-                  tag_span:
-                    start: 240
-                    length: 15
-              - Text:
-                  content: "\n    "
-                  span:
-                    start: 273
-                    length: 5
-              - Block:
-                  block_type: Branch
-                  name: empty
-                  bits: []
-                  children:
-                    - Text:
-                        content: "\n        (no groups)\n    "
-                        span:
-                          start: 289
-                          length: 25
-                  span:
-                    start: 86
-                    length: 24
-                  tag_span:
-                    start: 86
-                    length: 24
-              - Block:
-                  block_type: Closing
-                  name: endfor
-                  bits: []
-                  children: ~
-                  span:
-                    start: 314
-                    length: 6
-                  tag_span:
-                    start: 86
-                    length: 24
-            span:
-              start: 86
-              length: 234
-            tag_span:
-              start: 86
-              length: 24
-        - Text:
-            content: "\n"
-            span:
-              start: 326
-              length: 1
-        - Block:
-            block_type: Branch
-            name: else
-            bits: []
-            children:
-              - Text:
-                  content: "\n    Guest\n"
-                  span:
-                    start: 337
-                    length: 11
-            span:
-              start: 9
-              length: 24
-            tag_span:
-              start: 9
-              length: 24
-        - Block:
-            block_type: Closing
-            name: endif
-            bits: []
-            children: ~
-            span:
-              start: 348
-              length: 5
-            tag_span:
-              start: 9
-              length: 24
-      span:
-        start: 9
-        length: 344
-      tag_span:
-        start: 9
-        length: 24
-  - Text:
-      content: "!"
-      span:
-        start: 359
-        length: 1
-line_offsets:
-  - 0
-  - 34
-  - 70
-  - 99
-  - 130
-  - 149
-  - 184
-  - 214
-  - 224
-  - 244
-  - 255
-  - 260
-  - 270
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap
index a47f8c1..081a6ab 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap
@@ -63,5 +63,4 @@ nodes:
         length: 17
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap.new
deleted file mode 100644
index e138ac1..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap.new
+++ /dev/null
@@ -1,68 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 546
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: for
-      bits:
-        - for
-        - item
-        - in
-        - items
-      children:
-        - Block:
-            block_type: Standard
-            name: if
-            bits:
-              - if
-              - item.active
-            children:
-              - Variable:
-                  bits:
-                    - item
-                    - name
-                  filters: []
-                  span:
-                    start: 43
-                    length: 9
-              - Block:
-                  block_type: Closing
-                  name: endif
-                  bits: []
-                  children: ~
-                  span:
-                    start: 58
-                    length: 5
-                  tag_span:
-                    start: 23
-                    length: 14
-            span:
-              start: 23
-              length: 40
-            tag_span:
-              start: 23
-              length: 14
-        - Block:
-            block_type: Closing
-            name: endfor
-            bits: []
-            children: ~
-            span:
-              start: 69
-              length: 6
-            tag_span:
-              start: 0
-              length: 17
-      span:
-        start: 0
-        length: 75
-      tag_span:
-        start: 0
-        length: 17
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap
index a94adae..6567480 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap
@@ -109,17 +109,16 @@ nodes:
         length: 24
 line_offsets:
   - 0
-  - 0
-  - 23
-  - 43
-  - 78
-  - 130
-  - 169
-  - 183
-  - 243
-  - 275
-  - 311
+  - 24
+  - 44
+  - 73
+  - 123
+  - 156
+  - 170
+  - 228
+  - 254
+  - 284
+  - 299
   - 332
-  - 365
 errors:
   - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap.new
deleted file mode 100644
index 3b02bab..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_error_recovery.snap.new
+++ /dev/null
@@ -1,126 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 679
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<div class=\"container\">\n    <h1>Header</h1>\n    "
-      span:
-        start: 0
-        length: 48
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - user.is_authenticated
-      children:
-        - Text:
-            content: "\n        "
-            span:
-              start: 78
-              length: 9
-        - Comment:
-            content: This if is unclosed which does matter
-            span:
-              start: 87
-              length: 41
-        - Text:
-            content: "\n        <p>Welcome "
-            span:
-              start: 130
-              length: 20
-        - Variable:
-            bits:
-              - user
-              - name
-            filters: []
-            span:
-              start: 150
-              length: 9
-        - Text:
-            content: "</p>\n        <div>\n            "
-            span:
-              start: 165
-              length: 31
-        - Comment:
-            content: "This div is unclosed which doesn't matter"
-            span:
-              start: 196
-              length: 45
-        - Text:
-            content: "\n        "
-            span:
-              start: 243
-              length: 9
-        - Block:
-            block_type: Standard
-            name: for
-            bits:
-              - for
-              - item
-              - in
-              - items
-            children:
-              - Text:
-                  content: "\n            <span>"
-                  span:
-                    start: 275
-                    length: 19
-              - Variable:
-                  bits:
-                    - item
-                  filters: []
-                  span:
-                    start: 294
-                    length: 4
-              - Text:
-                  content: "</span>\n        "
-                  span:
-                    start: 304
-                    length: 16
-              - Block:
-                  block_type: Closing
-                  name: endfor
-                  bits: []
-                  children: ~
-                  span:
-                    start: 320
-                    length: 6
-                  tag_span:
-                    start: 252
-                    length: 17
-            span:
-              start: 252
-              length: 74
-            tag_span:
-              start: 252
-              length: 17
-        - Text:
-            content: "\n    <footer>Page Footer</footer>\n</div>"
-            span:
-              start: 332
-              length: 40
-      span:
-        start: 48
-        length: 24
-      tag_span:
-        start: 48
-        length: 24
-line_offsets:
-  - 0
-  - 24
-  - 44
-  - 73
-  - 123
-  - 156
-  - 170
-  - 228
-  - 254
-  - 284
-  - 299
-  - 332
-errors:
-  - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap
index 9935206..d9352d2 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap
@@ -28,6 +28,5 @@ nodes:
         length: 17
 line_offsets:
   - 0
-  - 0
 errors:
   - UnclosedTag: for
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap.new
deleted file mode 100644
index 6c77bf1..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_for.snap.new
+++ /dev/null
@@ -1,34 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 640
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: for
-      bits:
-        - for
-        - item
-        - in
-        - items
-      children:
-        - Variable:
-            bits:
-              - item
-              - name
-            filters: []
-            span:
-              start: 23
-              length: 9
-      span:
-        start: 0
-        length: 17
-      tag_span:
-        start: 0
-        length: 17
-line_offsets:
-  - 0
-errors:
-  - UnclosedTag: for
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap
index 92ef3e9..1fb1dfd 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap
@@ -23,6 +23,5 @@ nodes:
         length: 24
 line_offsets:
   - 0
-  - 0
 errors:
   - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap.new
deleted file mode 100644
index c24396e..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_django_if.snap.new
+++ /dev/null
@@ -1,29 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 630
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - user.is_authenticated
-      children:
-        - Text:
-            content: Welcome
-            span:
-              start: 30
-              length: 7
-      span:
-        start: 0
-        length: 24
-      tag_span:
-        start: 0
-        length: 24
-line_offsets:
-  - 0
-errors:
-  - UnclosedTag: if
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap
index ab2ce91..6b42432 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap
@@ -10,5 +10,4 @@ nodes:
         length: 5
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap.new
deleted file mode 100644
index 3624c81..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_html_tag.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 621
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<div>"
-      span:
-        start: 0
-        length: 5
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap
index 457c0f6..1e35fbd 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap
@@ -10,5 +10,4 @@ nodes:
         length: 28
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap.new
deleted file mode 100644
index 5cb1299..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_script.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 650
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<script>console.log('test');"
-      span:
-        start: 0
-        length: 28
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap
index 2182fa0..66380f8 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap
@@ -10,5 +10,4 @@ nodes:
         length: 27
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap.new
deleted file mode 100644
index c509635..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__errors__parse_unclosed_style.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 659
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<style>body { color: blue; "
-      span:
-        start: 0
-        length: 27
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap
index da837d1..940bc55 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap
@@ -128,34 +128,33 @@ nodes:
         length: 35
 line_offsets:
   - 0
-  - 0
-  - 15
-  - 22
-  - 33
-  - 65
-  - 96
-  - 133
-  - 150
-  - 190
-  - 214
-  - 240
-  - 269
-  - 297
-  - 312
-  - 330
-  - 342
-  - 353
-  - 385
-  - 450
-  - 493
-  - 531
-  - 604
-  - 643
-  - 682
-  - 709
-  - 747
-  - 775
-  - 799
-  - 814
-  - 826
+  - 16
+  - 23
+  - 34
+  - 66
+  - 97
+  - 134
+  - 151
+  - 191
+  - 215
+  - 241
+  - 270
+  - 298
+  - 313
+  - 331
+  - 343
+  - 354
+  - 386
+  - 451
+  - 488
+  - 524
+  - 591
+  - 624
+  - 663
+  - 684
+  - 722
+  - 744
+  - 762
+  - 777
+  - 789
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap.new
deleted file mode 100644
index 519939c..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap.new
+++ /dev/null
@@ -1,162 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 722
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<!DOCTYPE html>\n<html>\n    <head>\n        <style type=\"text/css\">\n            /* Style header */\n            .header { color: blue; }\n        </style>\n        <script type=\"text/javascript\">\n            // Init app\n            const app = {\n                /* Config */\n                debug: true\n            };\n        </script>\n    </head>\n    <body>\n        <!-- Header section -->\n        <div class=\"header\" id=\"main\" data-value=\"123\" disabled>\n            "
-      span:
-        start: 0
-        length: 463
-  - Block:
-      block_type: Standard
-      name: if
-      bits:
-        - if
-        - user.is_authenticated
-      children:
-        - Text:
-            content: "\n                "
-            span:
-              start: 493
-              length: 17
-        - Comment:
-            content: Welcome message
-            span:
-              start: 510
-              length: 19
-        - Text:
-            content: "\n                <h1>Welcome, "
-            span:
-              start: 531
-              length: 30
-        - Variable:
-            bits:
-              - user
-              - name
-            filters:
-              - name: title
-                arguments: []
-                span:
-                  start: 571
-                  length: 5
-              - name: default
-                arguments:
-                  - "'Guest'"
-                span:
-                  start: 577
-                  length: 15
-            span:
-              start: 561
-              length: 31
-        - Text:
-            content: "!</h1>\n                "
-            span:
-              start: 598
-              length: 23
-        - Block:
-            block_type: Standard
-            name: if
-            bits:
-              - if
-              - user.is_staff
-            children:
-              - Text:
-                  content: "\n                    <span>Admin</span>\n                "
-                  span:
-                    start: 643
-                    length: 56
-              - Block:
-                  block_type: Branch
-                  name: else
-                  bits: []
-                  children:
-                    - Text:
-                        content: "\n                    <span>User</span>\n                "
-                        span:
-                          start: 709
-                          length: 55
-                  span:
-                    start: 621
-                    length: 16
-                  tag_span:
-                    start: 621
-                    length: 16
-              - Block:
-                  block_type: Closing
-                  name: endif
-                  bits: []
-                  children: ~
-                  span:
-                    start: 764
-                    length: 5
-                  tag_span:
-                    start: 621
-                    length: 16
-            span:
-              start: 621
-              length: 148
-            tag_span:
-              start: 621
-              length: 16
-        - Text:
-            content: "\n            "
-            span:
-              start: 775
-              length: 13
-        - Block:
-            block_type: Closing
-            name: endif
-            bits: []
-            children: ~
-            span:
-              start: 788
-              length: 5
-            tag_span:
-              start: 463
-              length: 24
-      span:
-        start: 463
-        length: 330
-      tag_span:
-        start: 463
-        length: 24
-  - Text:
-      content: "\n        </div>\n    </body>\n</html>"
-      span:
-        start: 799
-        length: 35
-line_offsets:
-  - 0
-  - 16
-  - 23
-  - 34
-  - 66
-  - 97
-  - 134
-  - 151
-  - 191
-  - 215
-  - 241
-  - 270
-  - 298
-  - 313
-  - 331
-  - 343
-  - 354
-  - 386
-  - 451
-  - 488
-  - 524
-  - 591
-  - 624
-  - 663
-  - 684
-  - 722
-  - 744
-  - 762
-  - 777
-  - 789
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap
index 4f12506..75261ea 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap
@@ -10,5 +10,4 @@ nodes:
         length: 15
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap.new
deleted file mode 100644
index 564be94..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_doctype.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 478
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<!DOCTYPE html>"
-      span:
-        start: 0
-        length: 15
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap
index edad717..57b00d3 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap
@@ -10,5 +10,4 @@ nodes:
         length: 34
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap.new
deleted file mode 100644
index 7372c2b..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_tag.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 486
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<div class=\"container\">Hello</div>"
-      span:
-        start: 0
-        length: 34
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap
index 59b9455..76523ff 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap
@@ -10,5 +10,4 @@ nodes:
         length: 21
 line_offsets:
   - 0
-  - 0
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap.new
deleted file mode 100644
index b9479e2..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__html__parse_html_void.snap.new
+++ /dev/null
@@ -1,15 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 494
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<input type=\"text\" />"
-      span:
-        start: 0
-        length: 21
-line_offsets:
-  - 0
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap
index 5c5a85a..3927d68 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap
@@ -10,11 +10,10 @@ nodes:
         length: 142
 line_offsets:
   - 0
-  - 0
-  - 31
-  - 58
-  - 75
-  - 93
-  - 112
-  - 132
+  - 32
+  - 59
+  - 76
+  - 94
+  - 113
+  - 133
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap.new
deleted file mode 100644
index 2b5c382..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__script__parse_script.snap.new
+++ /dev/null
@@ -1,21 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 583
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<script type=\"text/javascript\">\n    // Single line comment\n    const x = 1;\n    /* Multi-line\n        comment */\n    console.log(x);\n</script>"
-      span:
-        start: 0
-        length: 142
-line_offsets:
-  - 0
-  - 32
-  - 59
-  - 76
-  - 94
-  - 113
-  - 133
-errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap
index 77f6c43..fc8b64f 100644
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap
+++ b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap
@@ -10,10 +10,9 @@ nodes:
         length: 97
 line_offsets:
   - 0
-  - 0
-  - 23
-  - 47
-  - 61
-  - 82
-  - 88
+  - 24
+  - 48
+  - 62
+  - 83
+  - 89
 errors: []
diff --git a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap.new b/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap.new
deleted file mode 100644
index 4d66fcf..0000000
--- a/crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__style__parse_style.snap.new
+++ /dev/null
@@ -1,20 +0,0 @@
----
-source: crates/djls-template-ast/src/parser.rs
-assertion_line: 599
-expression: ast
-snapshot_kind: text
----
-nodes:
-  - Text:
-      content: "<style type=\"text/css\">\n    /* Header styles */\n    .header {\n        color: blue;\n    }\n</style>"
-      span:
-        start: 0
-        length: 97
-line_offsets:
-  - 0
-  - 24
-  - 48
-  - 62
-  - 83
-  - 89
-errors: []