diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e824e0ad896..00b82e63608 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -330,21 +330,6 @@ parameters:
 			count: 1
 			path: src/Query/AST/Functions/DateSubFunction.php
 
-		-
-			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
-			count: 1
-			path: src/Query/AST/Functions/LengthFunction.php
-
-		-
-			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
-			count: 1
-			path: src/Query/AST/Functions/LowerFunction.php
-
-		-
-			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
-			count: 1
-			path: src/Query/AST/Functions/UpperFunction.php
-
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\AST\\\\IndexBy\\:\\:dispatch\\(\\) should return string but returns void\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 3123bf33d28..32d50fbcae2 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1577,11 +1577,6 @@
       <code><![CDATA[$assoc['joinColumns']]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
-  <file src="src/Query/AST/Functions/LengthFunction.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$this->stringPrimary]]></code>
-    </ArgumentTypeCoercion>
-  </file>
   <file src="src/Query/AST/Functions/LocateFunction.php">
     <PossiblyInvalidArgument>
       <code><![CDATA[$this->simpleArithmeticExpression]]></code>
@@ -1590,11 +1585,6 @@
       <code><![CDATA[$parser->SimpleArithmeticExpression()]]></code>
     </PossiblyInvalidPropertyAssignmentValue>
   </file>
-  <file src="src/Query/AST/Functions/LowerFunction.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$this->stringPrimary]]></code>
-    </ArgumentTypeCoercion>
-  </file>
   <file src="src/Query/AST/Functions/ModFunction.php">
     <PossiblyInvalidPropertyAssignmentValue>
       <code><![CDATA[$parser->SimpleArithmeticExpression()]]></code>
@@ -1622,11 +1612,6 @@
       <code><![CDATA[$parser->SimpleArithmeticExpression()]]></code>
     </PossiblyInvalidPropertyAssignmentValue>
   </file>
-  <file src="src/Query/AST/Functions/UpperFunction.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$this->stringPrimary]]></code>
-    </ArgumentTypeCoercion>
-  </file>
   <file src="src/Query/AST/GeneralCaseExpression.php">
     <ParamNameMismatch>
       <code>$sqlWalker</code>
diff --git a/src/Query/SqlWalker.php b/src/Query/SqlWalker.php
index 70971459340..4948be46536 100644
--- a/src/Query/SqlWalker.php
+++ b/src/Query/SqlWalker.php
@@ -2588,7 +2588,7 @@ public function walkArithmeticExpression($arithmeticExpr)
     /**
      * Walks down an SimpleArithmeticExpression AST node, thereby generating the appropriate SQL.
      *
-     * @param AST\SimpleArithmeticExpression $simpleArithmeticExpr
+     * @param AST\Node|string $simpleArithmeticExpr
      *
      * @return string
      *