diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/QueryCapture.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/QueryCapture.ts
index 0c4eba64b9..0de5d611a4 100644
--- a/packages/cursorless-engine/src/languages/TreeSitterQuery/QueryCapture.ts
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/QueryCapture.ts
@@ -1,28 +1,5 @@
 import type { Range, TextDocument } from "@cursorless/common";
-import type { Point, TreeCursor } from "web-tree-sitter";
-
-/**
- * Simple representation of the tree sitter syntax node. Used by
- * {@link MutableQueryCapture} to avoid using range/text and other mutable
- * parameters directly from the node.
- */
-export interface SimpleSyntaxNode {
-  readonly id: number;
-  readonly type: string;
-  readonly isNamed: boolean;
-  readonly parent: SimpleSyntaxNode | null;
-  readonly children: Array<SimpleChildSyntaxNode>;
-  walk(): TreeCursor;
-}
-
-/**
- * Add start and end position to the simple syntax node. Used by the `child-range!` predicate.
- */
-interface SimpleChildSyntaxNode extends SimpleSyntaxNode {
-  readonly startPosition: Point;
-  readonly endPosition: Point;
-  readonly text: string;
-}
+import type { Node } from "web-tree-sitter";
 
 /**
  * A capture of a query pattern against a syntax tree.  Often corresponds to a
@@ -69,8 +46,9 @@ export interface QueryMatch {
 export interface MutableQueryCapture extends QueryCapture {
   /**
    * The tree-sitter node that was captured.
+   * This may be undefined if the range has been modified by a query predicate.
    */
-  readonly node: SimpleSyntaxNode;
+  node: Node | undefined;
 
   readonly document: TextDocument;
   range: Range;
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/getChildNodesForFieldName.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/getChildNodesForFieldName.ts
index e887e254a0..681f7e163c 100644
--- a/packages/cursorless-engine/src/languages/TreeSitterQuery/getChildNodesForFieldName.ts
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/getChildNodesForFieldName.ts
@@ -1,9 +1,9 @@
-import type { SimpleSyntaxNode } from "./QueryCapture";
+import type { Node } from "web-tree-sitter";
 
 export function getChildNodesForFieldName(
-  node: SimpleSyntaxNode,
+  node: Node,
   fieldName: string,
-): SimpleSyntaxNode[] {
+): Node[] {
   const nodes = [];
   const treeCursor = node.walk();
   let hasNext = treeCursor.gotoFirstChild();
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/getNode.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/getNode.ts
new file mode 100644
index 0000000000..0c7d6c22af
--- /dev/null
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/getNode.ts
@@ -0,0 +1,11 @@
+import type { Node } from "web-tree-sitter";
+import type { MutableQueryCapture } from "./QueryCapture";
+
+export function getNode(capture: MutableQueryCapture): Node {
+  if (capture.node == null) {
+    throw Error(
+      `Capture ${capture.name} has no node. The range of the capture has already been updated and no longer matches a specific node.`,
+    );
+  }
+  return capture.node;
+}
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/isEven.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/isEven.ts
index 12e9dacea7..1dff9d5ca8 100644
--- a/packages/cursorless-engine/src/languages/TreeSitterQuery/isEven.ts
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/isEven.ts
@@ -1,4 +1,4 @@
-import type { SimpleSyntaxNode } from "./QueryCapture";
+import type { Node } from "web-tree-sitter";
 
 /**
  * Checks if a node is at an even index within its parent's field.
@@ -7,7 +7,7 @@ import type { SimpleSyntaxNode } from "./QueryCapture";
  * @param fieldName - The name of the field in the parent node.
  * @returns True if the node is at an even index, false otherwise.
  */
-export function isEven(node: SimpleSyntaxNode, fieldName: string): boolean {
+export function isEven(node: Node, fieldName: string): boolean {
   if (node.parent == null) {
     throw Error("Node has no parent");
   }
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts
index dc8594d6ef..a1678b4378 100644
--- a/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts
@@ -1,11 +1,13 @@
 import { Position, Range, adjustPosition } from "@cursorless/common";
 import type { Point } from "web-tree-sitter";
 import { z } from "zod";
+import { getNode } from "./getNode";
 import { isEven } from "./isEven";
 import { makeRangeFromPositions } from "./makeRangeFromPositions";
 import { q } from "./operatorArgumentSchemaTypes";
 import type { MutableQueryCapture } from "./QueryCapture";
 import { QueryPredicateOperator } from "./QueryPredicateOperator";
+import { setRange } from "./setRange";
 
 /**
  * A predicate operator that returns true if the node is at an even index within
@@ -15,8 +17,8 @@ import { QueryPredicateOperator } from "./QueryPredicateOperator";
 class Even extends QueryPredicateOperator<Even> {
   name = "even?" as const;
   schema = z.tuple([q.node, q.string]);
-  run({ node }: MutableQueryCapture, fieldName: string) {
-    return isEven(node, fieldName);
+  run(capture: MutableQueryCapture, fieldName: string) {
+    return isEven(getNode(capture), fieldName);
   }
 }
 
@@ -28,8 +30,8 @@ class Even extends QueryPredicateOperator<Even> {
 class Odd extends QueryPredicateOperator<Odd> {
   name = "odd?" as const;
   schema = z.tuple([q.node, q.string]);
-  run({ node }: MutableQueryCapture, fieldName: string) {
-    return !isEven(node, fieldName);
+  run(capture: MutableQueryCapture, fieldName: string) {
+    return !isEven(getNode(capture), fieldName);
   }
 }
 
@@ -42,8 +44,8 @@ class Odd extends QueryPredicateOperator<Odd> {
 class Text extends QueryPredicateOperator<Text> {
   name = "text?" as const;
   schema = z.tuple([q.node, q.string]).rest(q.string);
-  run({ document, range }: MutableQueryCapture, ...texts: string[]) {
-    return texts.includes(document.getText(range));
+  run(capture: MutableQueryCapture, ...texts: string[]) {
+    return texts.includes(getNode(capture).text);
   }
 }
 
@@ -56,8 +58,8 @@ class Text extends QueryPredicateOperator<Text> {
 class Type extends QueryPredicateOperator<Type> {
   name = "type?" as const;
   schema = z.tuple([q.node, q.string]).rest(q.string);
-  run({ node }: MutableQueryCapture, ...types: string[]) {
-    return types.includes(node.type);
+  run(capture: MutableQueryCapture, ...types: string[]) {
+    return types.includes(getNode(capture).type);
   }
 }
 
@@ -70,8 +72,8 @@ class Type extends QueryPredicateOperator<Type> {
 class NotType extends QueryPredicateOperator<NotType> {
   name = "not-type?" as const;
   schema = z.tuple([q.node, q.string]).rest(q.string);
-  run({ node }: MutableQueryCapture, ...types: string[]) {
-    return !types.includes(node.type);
+  run(capture: MutableQueryCapture, ...types: string[]) {
+    return !types.includes(getNode(capture).type);
   }
 }
 
@@ -84,7 +86,8 @@ class NotType extends QueryPredicateOperator<NotType> {
 class NotParentType extends QueryPredicateOperator<NotParentType> {
   name = "not-parent-type?" as const;
   schema = z.tuple([q.node, q.string]).rest(q.string);
-  run({ node }: MutableQueryCapture, ...types: string[]) {
+  run(capture: MutableQueryCapture, ...types: string[]) {
+    const node = getNode(capture);
     return node.parent == null || !types.includes(node.parent.type);
   }
 }
@@ -97,7 +100,8 @@ class NotParentType extends QueryPredicateOperator<NotParentType> {
 class IsNthChild extends QueryPredicateOperator<IsNthChild> {
   name = "is-nth-child?" as const;
   schema = z.tuple([q.node, q.integer]);
-  run({ node }: MutableQueryCapture, n: number) {
+  run(capture: MutableQueryCapture, n: number) {
+    const node = getNode(capture);
     return node.parent?.children.findIndex((n) => n.id === node.id) === n;
   }
 }
@@ -112,8 +116,10 @@ class HasMultipleChildrenOfType extends QueryPredicateOperator<HasMultipleChildr
   name = "has-multiple-children-of-type?" as const;
   schema = z.tuple([q.node, q.string]);
 
-  run({ node }: MutableQueryCapture, type: string) {
-    const count = node.children.filter((n) => n.type === type).length;
+  run(capture: MutableQueryCapture, type: string) {
+    const count = getNode(capture).children.filter(
+      (n) => n.type === type,
+    ).length;
     return count > 1;
   }
 }
@@ -128,15 +134,13 @@ class ChildRange extends QueryPredicateOperator<ChildRange> {
   ]);
 
   run(
-    nodeInfo: MutableQueryCapture,
+    capture: MutableQueryCapture,
     startIndex: number,
     endIndex?: number,
     excludeStart?: boolean,
     excludeEnd?: boolean,
   ) {
-    const {
-      node: { children },
-    } = nodeInfo;
+    const children = getNode(capture).children;
 
     startIndex = startIndex < 0 ? children.length + startIndex : startIndex;
     endIndex = endIndex == null ? -1 : endIndex;
@@ -145,9 +149,12 @@ class ChildRange extends QueryPredicateOperator<ChildRange> {
     const start = children[startIndex];
     const end = children[endIndex];
 
-    nodeInfo.range = makeRangeFromPositions(
-      excludeStart ? start.endPosition : start.startPosition,
-      excludeEnd ? end.startPosition : end.endPosition,
+    setRange(
+      capture,
+      makeRangeFromPositions(
+        excludeStart ? start.endPosition : start.startPosition,
+        excludeEnd ? end.startPosition : end.endPosition,
+      ),
     );
 
     return true;
@@ -161,10 +168,13 @@ class CharacterRange extends QueryPredicateOperator<CharacterRange> {
     z.tuple([q.node, q.integer, q.integer]),
   ]);
 
-  run(nodeInfo: MutableQueryCapture, startOffset: number, endOffset?: number) {
-    nodeInfo.range = new Range(
-      nodeInfo.range.start.translate(undefined, startOffset),
-      nodeInfo.range.end.translate(undefined, endOffset ?? 0),
+  run(capture: MutableQueryCapture, startOffset: number, endOffset?: number) {
+    setRange(
+      capture,
+      new Range(
+        capture.range.start.translate(undefined, startOffset),
+        capture.range.end.translate(undefined, endOffset ?? 0),
+      ),
     );
 
     return true;
@@ -189,9 +199,9 @@ class ShrinkToMatch extends QueryPredicateOperator<ShrinkToMatch> {
   name = "shrink-to-match!" as const;
   schema = z.tuple([q.node, q.string]);
 
-  run(nodeInfo: MutableQueryCapture, pattern: string) {
-    const { document, range } = nodeInfo;
-    const text = document.getText(range);
+  run(capture: MutableQueryCapture, pattern: string) {
+    const { document, range } = capture;
+    const text = getNode(capture).text;
     const match = text.match(new RegExp(pattern, "ds"));
 
     if (match?.index == null) {
@@ -203,9 +213,12 @@ class ShrinkToMatch extends QueryPredicateOperator<ShrinkToMatch> {
 
     const baseOffset = document.offsetAt(range.start);
 
-    nodeInfo.range = new Range(
-      document.positionAt(baseOffset + startOffset),
-      document.positionAt(baseOffset + endOffset),
+    setRange(
+      capture,
+      new Range(
+        document.positionAt(baseOffset + startOffset),
+        document.positionAt(baseOffset + endOffset),
+      ),
     );
 
     return true;
@@ -225,8 +238,8 @@ class GrowToNamedSiblings extends QueryPredicateOperator<GrowToNamedSiblings> {
   name = "grow-to-named-siblings!" as const;
   schema = z.union([z.tuple([q.node]), z.tuple([q.node, q.string])]);
 
-  run(nodeInfo: MutableQueryCapture, notText?: string) {
-    const { node, range } = nodeInfo;
+  run(capture: MutableQueryCapture, notText?: string) {
+    const node = getNode(capture);
 
     if (node.parent == null) {
       throw Error("Node has no parent");
@@ -254,9 +267,12 @@ class GrowToNamedSiblings extends QueryPredicateOperator<GrowToNamedSiblings> {
     }
 
     if (endPosition != null) {
-      nodeInfo.range = new Range(
-        range.start,
-        new Position(endPosition.row, endPosition.column),
+      setRange(
+        capture,
+        new Range(
+          capture.range.start,
+          new Position(endPosition.row, endPosition.column),
+        ),
       );
     }
 
@@ -272,16 +288,21 @@ class TrimEnd extends QueryPredicateOperator<TrimEnd> {
   name = "trim-end!" as const;
   schema = z.tuple([q.node]);
 
-  run(nodeInfo: MutableQueryCapture) {
-    const { document, range } = nodeInfo;
-    const text = document.getText(range);
+  run(capture: MutableQueryCapture) {
+    const { document, range } = capture;
+    const text = getNode(capture).text;
     const whitespaceLength = text.length - text.trimEnd().length;
+
     if (whitespaceLength > 0) {
-      nodeInfo.range = new Range(
-        range.start,
-        adjustPosition(document, range.end, -whitespaceLength),
+      setRange(
+        capture,
+        new Range(
+          range.start,
+          adjustPosition(document, range.end, -whitespaceLength),
+        ),
       );
     }
+
     return true;
   }
 }
@@ -293,9 +314,9 @@ class DocumentRange extends QueryPredicateOperator<DocumentRange> {
   name = "document-range!" as const;
   schema = z.tuple([q.node]).rest(q.node);
 
-  run(...nodeInfos: MutableQueryCapture[]) {
-    for (const nodeInfo of nodeInfos) {
-      nodeInfo.range = nodeInfo.document.range;
+  run(...captures: MutableQueryCapture[]) {
+    for (const capture of captures) {
+      setRange(capture, capture.document.range);
     }
 
     return true;
@@ -321,28 +342,15 @@ class AllowMultiple extends QueryPredicateOperator<AllowMultiple> {
     return true;
   }
 
-  run(...nodeInfos: MutableQueryCapture[]) {
-    for (const nodeInfo of nodeInfos) {
-      nodeInfo.allowMultiple = true;
+  run(...captures: MutableQueryCapture[]) {
+    for (const capture of captures) {
+      capture.allowMultiple = true;
     }
 
     return true;
   }
 }
 
-/**
- * A predicate operator that logs a node, for debugging.
- */
-class Log extends QueryPredicateOperator<Log> {
-  name = "log!" as const;
-  schema = z.tuple([q.node]);
-
-  run(nodeInfo: MutableQueryCapture) {
-    console.log(`#log!: ${nodeInfo.name}@${nodeInfo.range}`);
-    return true;
-  }
-}
-
 /**
  * A predicate operator that sets the insertion delimiter of the match. For
  * example, `(#insertion-delimiter! @foo ", ")` will set the insertion delimiter
@@ -352,18 +360,18 @@ class InsertionDelimiter extends QueryPredicateOperator<InsertionDelimiter> {
   name = "insertion-delimiter!" as const;
   schema = z.tuple([q.node, q.string]);
 
-  run(nodeInfo: MutableQueryCapture, insertionDelimiter: string) {
-    nodeInfo.insertionDelimiter = insertionDelimiter;
+  run(capture: MutableQueryCapture, insertionDelimiter: string) {
+    capture.insertionDelimiter = insertionDelimiter;
 
     return true;
   }
 }
 
 /**
- * A predicate operator that sets the insertion delimiter of {@link nodeInfo} to
+ * A predicate operator that sets the insertion delimiter of {@link capture} to
  * either {@link insertionDelimiterConsequence} or
  * {@link insertionDelimiterAlternative} depending on whether
- * {@link conditionNodeInfo} is single or multiline, respectively. For example,
+ * {@link conditionCapture} is single or multiline, respectively. For example,
  *
  * ```scm
  * (#single-or-multi-line-delimiter! @foo @bar ", " ",\n")
@@ -377,12 +385,12 @@ class SingleOrMultilineDelimiter extends QueryPredicateOperator<SingleOrMultilin
   schema = z.tuple([q.node, q.node, q.string, q.string]);
 
   run(
-    nodeInfo: MutableQueryCapture,
-    conditionNodeInfo: MutableQueryCapture,
+    capture: MutableQueryCapture,
+    conditionCapture: MutableQueryCapture,
     insertionDelimiterConsequence: string,
     insertionDelimiterAlternative: string,
   ) {
-    nodeInfo.insertionDelimiter = conditionNodeInfo.range.isSingleLine
+    capture.insertionDelimiter = conditionCapture.range.isSingleLine
       ? insertionDelimiterConsequence
       : insertionDelimiterAlternative;
 
@@ -391,9 +399,9 @@ class SingleOrMultilineDelimiter extends QueryPredicateOperator<SingleOrMultilin
 }
 
 /**
- * A predicate operator that sets the insertion delimiter of {@link nodeInfo}
- * depending on the content of {@link conditionNodeInfo}. It sets the insertion
- * delimiter to {@link insertionDelimiterEmpty} if {@link conditionNodeInfo} is empty,
+ * A predicate operator that sets the insertion delimiter of {@link capture}
+ * depending on the content of {@link conditionCapture}. It sets the insertion
+ * delimiter to {@link insertionDelimiterEmpty} if {@link conditionCapture} is empty,
  * {@link insertionDelimiterSingleLine} if it is a single line, and
  * {@link insertionDelimiterMultiline} if it is multiline. For example,
  *
@@ -406,19 +414,19 @@ class EmptySingleMultiDelimiter extends QueryPredicateOperator<EmptySingleMultiD
   schema = z.tuple([q.node, q.node, q.string, q.string, q.string]);
 
   run(
-    nodeInfo: MutableQueryCapture,
-    conditionNodeInfo: MutableQueryCapture,
+    capture: MutableQueryCapture,
+    conditionCapture: MutableQueryCapture,
     insertionDelimiterEmpty: string,
     insertionDelimiterSingleLine: string,
     insertionDelimiterMultiline: string,
   ) {
-    const isEmpty = !conditionNodeInfo.node.children.some(
+    const isEmpty = !getNode(conditionCapture).children.some(
       (child) => child.isNamed,
     );
 
-    nodeInfo.insertionDelimiter = isEmpty
+    capture.insertionDelimiter = isEmpty
       ? insertionDelimiterEmpty
-      : conditionNodeInfo.range.isSingleLine
+      : conditionCapture.range.isSingleLine
         ? insertionDelimiterSingleLine
         : insertionDelimiterMultiline;
 
@@ -427,7 +435,6 @@ class EmptySingleMultiDelimiter extends QueryPredicateOperator<EmptySingleMultiD
 }
 
 export const queryPredicateOperators = [
-  new Log(),
   new Even(),
   new Odd(),
   new Text(),
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/setRange.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/setRange.ts
new file mode 100644
index 0000000000..d72d9bd5d9
--- /dev/null
+++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/setRange.ts
@@ -0,0 +1,8 @@
+import type { Range } from "@cursorless/common";
+import type { MutableQueryCapture } from "./QueryCapture";
+
+export function setRange(capture: MutableQueryCapture, range: Range) {
+  capture.range = range;
+  // Clear the node since the range has changed and the range no longer matches a specific node
+  capture.node = undefined;
+}
diff --git a/queries/c.scm b/queries/c.scm
index 786cfc8c7c..8b0549ccb7 100644
--- a/queries/c.scm
+++ b/queries/c.scm
@@ -281,8 +281,8 @@
       ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
     ) @argumentList
   )
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 (parameter_list
@@ -297,8 +297,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! if () {} else {}
diff --git a/queries/csharp.scm b/queries/csharp.scm
index 2d2f3946f4..fb891cbe03 100644
--- a/queries/csharp.scm
+++ b/queries/csharp.scm
@@ -542,8 +542,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;; !! void foo(int a, int b)
@@ -567,8 +567,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 (parameter_list
diff --git a/queries/css.scm b/queries/css.scm
index fe19c7b302..c2b52c159f 100644
--- a/queries/css.scm
+++ b/queries/css.scm
@@ -95,8 +95,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;; Entire file
diff --git a/queries/java.scm b/queries/java.scm
index 024bfe7d2e..cf7a62a6af 100644
--- a/queries/java.scm
+++ b/queries/java.scm
@@ -621,8 +621,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo(aaa, bbb);
@@ -632,8 +632,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! catch(Exception ex) {}
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
index 56f75f02dc..e08c256eb7 100644
--- a/queries/javascript.core.scm
+++ b/queries/javascript.core.scm
@@ -828,8 +828,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 (formal_parameters
@@ -844,8 +844,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 operator: [
diff --git a/queries/python.scm b/queries/python.scm
index 896f05f81c..b46c72c8d1 100644
--- a/queries/python.scm
+++ b/queries/python.scm
@@ -744,8 +744,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo (aaa, bbb)
@@ -755,8 +755,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo (aaa=1, bbb=2)
diff --git a/queries/r.scm b/queries/r.scm
index 65c9155fa4..fca8200a0c 100644
--- a/queries/r.scm
+++ b/queries/r.scm
@@ -84,8 +84,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;; argumentList.formal
@@ -97,8 +97,8 @@
       "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
       ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
     ) @argumentList
-    (#child-range! @argumentList 1 -2)
     (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+    (#child-range! @argumentList 1 -2)
   )
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
@@ -111,8 +111,8 @@
       "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
       ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
     ) @argumentList
-    (#child-range! @argumentList 1 -2)
     (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+    (#child-range! @argumentList 1 -2)
   ) @argumentList.domain @argumentOrParameter.iteration.domain
   (#not-parent-type? @argumentList.domain binary_operator)
 )
diff --git a/queries/ruby.scm b/queries/ruby.scm
index 766c4e0966..0bdc44e492 100644
--- a/queries/ruby.scm
+++ b/queries/ruby.scm
@@ -320,8 +320,8 @@ operator: [
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo(aaa, bbb)
@@ -331,8 +331,8 @@ operator: [
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo{ |aaa, bbb| }
@@ -343,7 +343,7 @@ operator: [
       "|" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
       "|" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
     ) @argumentList
-    (#child-range! @argumentList 1 -2)
     (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+    (#child-range! @argumentList 1 -2)
   )
 ) @argumentList.domain @argumentOrParameter.iteration.domain
diff --git a/queries/rust.scm b/queries/rust.scm
index 105de88965..93e8cf1c1f 100644
--- a/queries/rust.scm
+++ b/queries/rust.scm
@@ -89,7 +89,6 @@
 (
   (raw_string_literal) @string @textFragment
   (#shrink-to-match! @textFragment "r#+\"(?<keep>.*)\"#+")
-
 )
 
 [
diff --git a/queries/scala.scm b/queries/scala.scm
index f62fac220f..73a706f546 100644
--- a/queries/scala.scm
+++ b/queries/scala.scm
@@ -157,8 +157,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! def foo(aaa: Int, bbb: Int) = x
@@ -168,8 +168,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! foo(aaa, bbb)
@@ -179,8 +179,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 operator: (operator_identifier) @disqualifyDelimiter
diff --git a/queries/talon.scm b/queries/talon.scm
index ec82915292..74b212f428 100644
--- a/queries/talon.scm
+++ b/queries/talon.scm
@@ -183,8 +183,8 @@
     "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
     ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
   ) @argumentList
-  (#child-range! @argumentList 1 -2)
   (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
+  (#child-range! @argumentList 1 -2)
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! # foo