diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2e171cc60..cc48898a4 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -179,7 +179,10 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/UnusedAssignmentRemover.php">
-    <PossiblyUndefinedIntArrayOffset occurrences="3">
+    <PossiblyUndefinedIntArrayOffset occurrences="6">
+      <code>$token_list[$iter]</code>
+      <code>$token_list[$iter]</code>
+      <code>$token_list[$iter]</code>
       <code>$token_list[$iter]</code>
       <code>$token_list[0]</code>
       <code>$token_list[1]</code>
diff --git a/tests/AssignmentTest.php b/tests/AssignmentTest.php
index 8a18d4dd6..423b77bdc 100644
--- a/tests/AssignmentTest.php
+++ b/tests/AssignmentTest.php
@@ -41,6 +41,7 @@ class AssignmentTest extends TestCase
                     $x = 0;
                     $x |= (int) (rand(0, 1) !== 2);
                     $x |= 1;
+                    /** @psalm-suppress RedundantCondition Psalm now knows this is always truthy */
                     if ($x) {
                         echo $x;
                     }',