diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index b8dacf52dee..c8dee018001 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -56,17 +56,17 @@
       <code>$source_parts[1]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
+  <file src="src/Psalm/Internal/Analyzer/Statements/Block/ForAnalyzer.php">
+    <ArgumentTypeCoercion occurrences="1">
+      <code>$stmt-&gt;cond</code>
+    </ArgumentTypeCoercion>
+  </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php">
     <ConflictingReferenceConstraint occurrences="2">
       <code>if (AtomicTypeComparator::isContainedBy(</code>
       <code>if (AtomicTypeComparator::isContainedBy(</code>
     </ConflictingReferenceConstraint>
   </file>
-  <file src="src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php">
-    <PossiblyUndefinedIntArrayOffset occurrences="1">
-      <code>$pre_conditions[0]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Block/SwitchAnalyzer.php">
     <InvalidPropertyAssignmentValue occurrences="1">
       <code>$context-&gt;assigned_var_ids += $switch_scope-&gt;new_assigned_var_ids</code>
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php
index 79ac5bda923..985d73c3c3b 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php
@@ -33,8 +33,8 @@ class LoopAnalyzer
     /**
      * Checks an array of statements in a loop
      *
-     * @param  array<PhpParser\Node\Stmt>   $stmts
-     * @param  PhpParser\Node\Expr[]        $pre_conditions
+     * @param  list<PhpParser\Node\Stmt>    $stmts
+     * @param  list<PhpParser\Node\Expr>    $pre_conditions
      * @param  PhpParser\Node\Expr[]        $post_expressions
      * @return false|null
      */
diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
index 768d8d4dd9a..f82b4bf9788 100644
--- a/tests/ArrayFunctionCallTest.php
+++ b/tests/ArrayFunctionCallTest.php
@@ -2133,7 +2133,7 @@ function makeAList(int $ofThisInteger): array {
             'arrayMapWithEmptyArrayReturn' => [
                 'code' => '<?php
                     /**
-                     * @param array<array<string>> $elements
+                     * @param array<int, array<string>> $elements
                      * @return list<string>
                      */
                     function resolvePossibleFilePaths($elements) : array