diff --git a/packages/cursorless-engine/src/languages/latex.ts b/packages/cursorless-engine/src/languages/latex.ts
index 22f5001cca..0203a67a0e 100644
--- a/packages/cursorless-engine/src/languages/latex.ts
+++ b/packages/cursorless-engine/src/languages/latex.ts
@@ -17,6 +17,7 @@ import {
 const COMMANDS = [
   "command",
   "displayed_equation",
+  "generic_command",
   "inline_formula",
   "math_set",
   "block_comment",
diff --git a/packages/cursorless-engine/src/languages/scala.ts b/packages/cursorless-engine/src/languages/scala.ts
index 25bbf04058..86dcb4f896 100644
--- a/packages/cursorless-engine/src/languages/scala.ts
+++ b/packages/cursorless-engine/src/languages/scala.ts
@@ -3,7 +3,6 @@ import type { NodeMatcherAlternative } from "../typings/Types";
 import { patternFinder } from "../util/nodeFinders";
 import {
   argumentMatcher,
-  conditionMatcher,
   createPatternMatchers,
   leadingMatcher,
   matcher,
@@ -53,7 +52,6 @@ const nodeMatchers: Partial<
     ["*[value]", "*[default_value]", "type_definition[type]"],
     ["="],
   ),
-  condition: conditionMatcher("*[condition]"),
 
   // Scala features unsupported in Cursorless terminology
   //  - Pattern matching
diff --git a/queries/php.scm b/queries/php.scm
index 273db724ee..8c0e514227 100644
--- a/queries/php.scm
+++ b/queries/php.scm
@@ -78,7 +78,7 @@
   (method_declaration) @namedFunction
   (expression_statement
     (assignment_expression
-      right: (anonymous_function_creation_expression)
+      right: (anonymous_function)
     ) @namedFunction
     ";" @_.trailing
   )
@@ -91,7 +91,7 @@
 ] @namedFunction.domain
 
 [
-  (anonymous_function_creation_expression)
+  (anonymous_function)
   (arrow_function)
 ] @anonymousFunction
 
diff --git a/queries/scala.scm b/queries/scala.scm
index 748cfc2f9e..8f90ea34e7 100644
--- a/queries/scala.scm
+++ b/queries/scala.scm
@@ -7,7 +7,10 @@
   (interpolated_string_expression)
 ] @string @textFragment
 
-(comment) @comment @textFragment
+[
+  (comment)
+  (block_comment)
+] @comment @textFragment
 
 ;; treating classes = classlike
 [
@@ -42,6 +45,15 @@
   pattern: (_) @name
 ) @_.domain
 
+(_
+  condition: (_
+    .
+    "(" @condition.start.endOf
+    ")" @condition.end.startOf
+    .
+  )
+) @_.domain
+
 operator: (operator_identifier) @disqualifyDelimiter
 (enumerator
   "<-" @disqualifyDelimiter
diff --git a/queries/scm.scm b/queries/scm.scm
index 7897bdf7c4..73da970f22 100644
--- a/queries/scm.scm
+++ b/queries/scm.scm
@@ -60,9 +60,8 @@
 (anonymous_node
   name: [
     "_" @type
-    (identifier
-      "\"" @type.start.endOf
-      "\"" @type.end.startOf
+    (string
+      (string_content) @type
     )
   ]
 ) @_.domain
@@ -105,7 +104,7 @@
   ":"
   (anonymous_node
     [
-      (identifier)
+      (string)
       "_"
     ] @value.end
     (quantifier)? @value.end