diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d86eeb6f5e5..7d51badcd35 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.x-dev@b01cf3ccfa060409e1e112f2ebec95a1eefec2da">
+<files psalm-version="6.x-dev@049d3523d462c4e2039608d41487347b9394c70c">
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$comment_block->tags['variablesfrom'][0]]]></code>
@@ -29,14 +29,6 @@
     </ImplicitToStringCast>
   </file>
   <file src="src/Psalm/CodeLocation.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->getColumn()]]></code>
-      <code><![CDATA[$this->getLineNumber()]]></code>
-      <code><![CDATA[$this->raw_file_end]]></code>
-      <code><![CDATA[$this->raw_file_start]]></code>
-      <code><![CDATA[$this->regex_type]]></code>
-      <code><![CDATA[$this->regex_type]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$this->docblock_line_number]]></code>
       <code><![CDATA[$this->docblock_line_number]]></code>
@@ -80,14 +72,6 @@
       <code><![CDATA[$config_xml['errorLevel']]]></code>
       <code><![CDATA[$stub_file['name']]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$error->line]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$line_number]]></code>
-      <code><![CDATA[$line_number]]></code>
-      <code><![CDATA[$this->level]]></code>
-      <code><![CDATA[count($declared_classes)]]></code>
-    </InvalidOperand>
     <PossiblyNullArgument>
       <code><![CDATA[$deprecated_element_xml]]></code>
     </PossiblyNullArgument>
@@ -121,7 +105,6 @@
   <file src="src/Psalm/Config/Creator.php">
     <InvalidOperand>
       <code><![CDATA[$issues_at_level[$issue_level][$issue_type] += 100 / $counted_types]]></code>
-      <code><![CDATA[$level]]></code>
     </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$suggested_dir]]></code>
@@ -169,13 +152,6 @@
       <code><![CDATA[$matches[3]]]></code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
-  <file src="src/Psalm/FileManipulation.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->end]]></code>
-      <code><![CDATA[$this->start]]></code>
-      <code><![CDATA[$this->start]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Algebra.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$creating_conditional_id]]></code>
@@ -206,10 +182,6 @@
       <code><![CDATA[$prop->name]]></code>
       <code><![CDATA[$property_storage->signature_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$class->getLine()]]></code>
-      <code><![CDATA[(int)$class->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$comments[0]]]></code>
       <code><![CDATA[$property_name]]></code>
@@ -242,12 +214,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$expected_param_count]]></code>
-      <code><![CDATA[$expected_param_count]]></code>
-      <code><![CDATA[$storage_param_count]]></code>
-      <code><![CDATA[$storage_param_count]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$property_name]]></code>
     </PossiblyUndefinedIntArrayOffset>
@@ -265,13 +231,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/ClosureAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$first_appearance->getLineNumber()]]></code>
-      <code><![CDATA[$function->getLine()]]></code>
-      <code><![CDATA[$this->function->getLine()]]></code>
-      <code><![CDATA[(int)$function->getAttribute('startFilePos')]]></code>
-      <code><![CDATA[(int)$this->function->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$context->self]]></code>
       <code><![CDATA[$context->self]]></code>
@@ -279,9 +238,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/CommentAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$comment->getStartLine()]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$original_type]]></code>
       <code><![CDATA[!$var_comment->description]]></code>
@@ -342,10 +298,7 @@
       <code><![CDATA[$this->function->name]]></code>
     </ImplicitToStringCast>
     <InvalidOperand>
-      <code><![CDATA[$offset + 1]]></code>
-      <code><![CDATA[$offset + 1]]></code>
       <code><![CDATA[$time_taken / $node_counter->count]]></code>
-      <code><![CDATA[(int) $this->function->getAttribute('startFilePos')]]></code>
     </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$context->calling_method_id]]></code>
@@ -417,20 +370,6 @@
       <code><![CDATA[$implementer_signature_return_type]]></code>
       <code><![CDATA[$implementer_signature_return_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$guide_classlike_storage->template_types]]></code>
       <code><![CDATA[$guide_method_storage->cased_name]]></code>
@@ -448,13 +387,6 @@
     </NonInvariantDocblockPropertyType>
   </file>
   <file src="src/Psalm/Internal/Analyzer/ProjectAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$codebase->getMajorAnalysisPhpVersion()]]></code>
-      <code><![CDATA[$codebase->getMinorAnalysisPhpVersion()]]></code>
-      <code><![CDATA[$location->getLineNumber()]]></code>
-      <code><![CDATA[$removed_parser_files]]></code>
-      <code><![CDATA[count($diff_files)]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$destination_parts[1]]]></code>
       <code><![CDATA[$destination_parts[1]]]></code>
@@ -525,9 +457,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Block/SwitchAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) $stmt->cond->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$context->assigned_var_ids += $switch_scope->new_assigned_var_ids]]></code>
     </InvalidPropertyAssignmentValue>
@@ -612,7 +541,6 @@
       <code><![CDATA[$var_type]]></code>
     </ImplicitToStringCast>
     <InvalidOperand>
-      <code><![CDATA[$array_literal_type->value]]></code>
       <code><![CDATA[$var_id+1]]></code>
       <code><![CDATA[$var_id+1]]></code>
       <code><![CDATA[$var_id+1]]></code>
@@ -742,10 +670,6 @@
       <code><![CDATA[$child_stmt_dim_type]]></code>
       <code><![CDATA[$child_stmt_dim_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$offset_type->value]]></code>
-      <code><![CDATA[$string_to_int]]></code>
-    </InvalidOperand>
     <PossiblyInvalidOperand>
       <code><![CDATA[$key_value->value]]></code>
     </PossiblyInvalidOperand>
@@ -827,11 +751,6 @@
       <code><![CDATA[$context->byref_constraints[$var_id]->type]]></code>
       <code><![CDATA[$var_comment_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$location->raw_file_end]]></code>
-      <code><![CDATA[$location->raw_file_start]]></code>
-      <code><![CDATA[$offset]]></code>
-    </InvalidOperand>
     <PossiblyInvalidOperand>
       <code><![CDATA[$offset_value]]></code>
     </PossiblyInvalidOperand>
@@ -905,11 +824,6 @@
       <code><![CDATA[$invalid_right_messages[0]]]></code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
-  <file src="src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) $left_expr->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ConcatAnalyzer.php">
     <ImplicitToStringCast>
       <code><![CDATA[$operand_type]]></code>
@@ -937,12 +851,6 @@
       <code><![CDATA[$atomic_right_type]]></code>
       <code><![CDATA[$atomic_right_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$string_length]]></code>
-      <code><![CDATA[$string_length]]></code>
-      <code><![CDATA[$string_length]]></code>
-      <code><![CDATA[$string_length]]></code>
-    </InvalidOperand>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/BitwiseNotAnalyzer.php">
     <ImplicitToStringCast>
@@ -957,24 +865,6 @@
       <code><![CDATA[$param_type]]></code>
       <code><![CDATA[$param_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$method_name]]></code>
       <code><![CDATA[$parts[1]]]></code>
@@ -1006,15 +896,6 @@
       <code><![CDATA[$cased_method_id ?: $method_id]]></code>
       <code><![CDATA[$cased_method_id ?: $method_id]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$arg->value->getLine()]]></code>
-      <code><![CDATA[$argument_offset]]></code>
-      <code><![CDATA[$argument_offset]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[(int)$arg->value->getAttribute('startFilePos')]]></code>
-      <code><![CDATA[count($args)]]></code>
-      <code><![CDATA[count($function_params)]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$context->self]]></code>
       <code><![CDATA[$cased_method_id]]></code>
@@ -1046,17 +927,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$max_closure_param_count]]></code>
-      <code><![CDATA[$min_closure_param_count]]></code>
-      <code><![CDATA[$required_param_count]]></code>
-      <code><![CDATA[$required_param_count]]></code>
-    </InvalidOperand>
     <ParadoxicalCondition>
       <code><![CDATA[in_array($method_id, ArgumentsAnalyzer::ARRAY_FILTERLIKE, true)]]></code>
     </ParadoxicalCondition>
@@ -1202,10 +1072,6 @@
       <code><![CDATA[$error_method_id]]></code>
       <code><![CDATA[$error_method_id]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[count($stmt->getArgs())]]></code>
-      <code><![CDATA[count($stmt->getArgs())]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$result->invalid_method_call_types[0]]]></code>
       <code><![CDATA[$result->non_existent_class_method_ids[0]]]></code>
@@ -1292,9 +1158,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$var_id+1]]></code>
-    </InvalidOperand>
     <PossiblyInvalidOperand>
       <code><![CDATA[$var_id]]></code>
     </PossiblyInvalidOperand>
@@ -1370,10 +1233,6 @@
       <code><![CDATA[$array_type]]></code>
       <code><![CDATA[$offset_type]]></code>
     </ImplicitToStringCast>
-    <InvalidOperand>
-      <code><![CDATA[$offset_type_part->value]]></code>
-      <code><![CDATA[$offset_type_part->value]]></code>
-    </InvalidOperand>
     <PossiblyInvalidOperand>
       <code><![CDATA[$dim_value]]></code>
       <code><![CDATA[$dim_value]]></code>
@@ -1447,15 +1306,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$first_appearance->getLineNumber()]]></code>
-      <code><![CDATA[$first_appearance->getLineNumber()]]></code>
-      <code><![CDATA[$first_appearance->raw_file_end]]></code>
-      <code><![CDATA[$first_appearance->raw_file_end]]></code>
-      <code><![CDATA[$first_appearance->raw_file_start]]></code>
-      <code><![CDATA[$first_appearance->raw_file_start]]></code>
-      <code><![CDATA[$taint_location->raw_file_start]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$branch_point]]></code>
       <code><![CDATA[$branch_point]]></code>
@@ -1483,20 +1333,11 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) $first_arg->value->getAttribute('startFilePos')]]></code>
-      <code><![CDATA[(int) $stmt->cond->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$switch_var_id]]></code>
       <code><![CDATA[$switch_var_id]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Analyzer/Statements/Expression/NullsafeAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) $stmt->var->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/Expression/SimpleTypeInferer.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$fq_classlike_name]]></code>
@@ -1528,12 +1369,6 @@
       <code><![CDATA[$var_comment->type_start]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$codebase->getMajorAnalysisPhpVersion()]]></code>
-      <code><![CDATA[$codebase->getMinorAnalysisPhpVersion()]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Analyzer/Statements/ReturnAnalyzer.php">
     <ImplicitToStringCast>
       <code><![CDATA[$inferred_type]]></code>
@@ -1575,9 +1410,6 @@
   </file>
   <file src="src/Psalm/Internal/Analyzer/StatementsAnalyzer.php">
     <InvalidOperand>
-      <code><![CDATA[$count]]></code>
-      <code><![CDATA[$count]]></code>
-      <code><![CDATA[$stmt->getLine()]]></code>
       <code><![CDATA[round($mean)]]></code>
       <code><![CDATA[round($mean)]]></code>
     </InvalidOperand>
@@ -1593,22 +1425,12 @@
       <code><![CDATA[$this->vars_to_initialize]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Clause.php">
-    <InvalidOperand>
-      <code><![CDATA[$creating_object_id]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Cli/LanguageServer.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$options['verbose']]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Cli/Psalm.php">
-    <InvalidOperand>
-      <code><![CDATA[$config_level]]></code>
-      <code><![CDATA[$init_level]]></code>
-      <code><![CDATA[$total_fixed_issues]]></code>
-    </InvalidOperand>
     <InvalidScalarArgument>
       <code><![CDATA[$options['f'] ?? null]]></code>
     </InvalidScalarArgument>
@@ -1656,9 +1478,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Codebase/Analyzer.php">
-    <InvalidOperand>
-      <code><![CDATA[$path_mixed_count]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$trait]]></code>
     </PossiblyUndefinedIntArrayOffset>
@@ -1667,10 +1486,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Codebase/ClassLikes.php">
-    <InvalidOperand>
-      <code><![CDATA[$offset + 1]]></code>
-      <code><![CDATA[$offset + 1]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$destination_name]]></code>
       <code><![CDATA[$destination_name]]></code>
@@ -1736,12 +1551,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Codebase/InternalCallMapHandler.php">
-    <InvalidOperand>
-      <code><![CDATA[$analyzer_major_version]]></code>
-      <code><![CDATA[$analyzer_minor_version]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-    </InvalidOperand>
     <PossiblyNullArgument>
       <code><![CDATA[array_shift($call_map_function_args)]]></code>
     </PossiblyNullArgument>
@@ -1779,11 +1588,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Codebase/Populator.php">
-    <InvalidOperand>
-      <code><![CDATA[__LINE__]]></code>
-      <code><![CDATA[__LINE__]]></code>
-      <code><![CDATA[__LINE__]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!strpos($fq_classlike_name_lc, '\\')]]></code>
       <code><![CDATA[$mapped_name]]></code>
@@ -1809,16 +1613,6 @@
       <code><![CDATA[$context->calling_method_id]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Codebase/ReferenceMapGenerator.php">
-    <InvalidOperand>
-      <code><![CDATA[$method_storage->location->getColumn()]]></code>
-      <code><![CDATA[$method_storage->location->getLineNumber()]]></code>
-      <code><![CDATA[$property_storage->location->getColumn()]]></code>
-      <code><![CDATA[$property_storage->location->getLineNumber()]]></code>
-      <code><![CDATA[$storage->location->getColumn()]]></code>
-      <code><![CDATA[$storage->location->getLineNumber()]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Codebase/Scanner.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$composer_file_path]]></code>
@@ -1841,14 +1635,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/DataFlow/DataFlowNode.php">
-    <InvalidOperand>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$argument_offset + 1]]></code>
-      <code><![CDATA[$assignment_location->raw_file_end]]></code>
-      <code><![CDATA[$assignment_location->raw_file_start]]></code>
-      <code><![CDATA[$code_location->raw_file_start]]></code>
-      <code><![CDATA[$function_location->raw_file_start]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$specialization_key]]></code>
     </RiskyTruthyFalsyComparison>
@@ -1894,11 +1680,6 @@
       <code><![CDATA[assert(!empty($name_parts))]]></code>
     </RedundantCondition>
   </file>
-  <file src="src/Psalm/Internal/ErrorHandler.php">
-    <InvalidOperand>
-      <code><![CDATA[$error_line]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/ExecutionEnvironment/BuildInfoCollector.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$this->readEnv['CI_PR_NUMBER']]]></code>
@@ -1985,9 +1766,6 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$this->childConnectTimeout]]></code>
     </ArgumentTypeCoercion>
-    <InvalidOperand>
-      <code><![CDATA[$total]]></code>
-    </InvalidOperand>
   </file>
   <file src="src/Psalm/Internal/Fork/PsalmRestarter.php">
     <RiskyTruthyFalsyComparison>
@@ -2020,12 +1798,6 @@
       <code><![CDATA[empty($additional_info)]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/LanguageServer/Server/TextDocument.php">
-    <InvalidOperand>
-      <code><![CDATA[$position->character]]></code>
-      <code><![CDATA[$position->line]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/MethodIdentifier.php">
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$method_id_parts[1]]]></code>
@@ -2079,9 +1851,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php">
-    <InvalidOperand>
-      <code><![CDATA[$node->getLine()]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$l[4]]]></code>
       <code><![CDATA[$r[4]]]></code>
@@ -2149,9 +1918,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php">
-    <InvalidOperand>
-      <code><![CDATA[$j]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedArrayOffset>
       <code><![CDATA[$source_param_string]]></code>
     </PossiblyUndefinedArrayOffset>
@@ -2174,11 +1940,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php">
-    <InvalidOperand>
-      <code><![CDATA[$i + 1]]></code>
-      <code><![CDATA[$stmt->getLine()]]></code>
-      <code><![CDATA[(int)$stmt->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$stmt->stmts[0]]]></code>
     </PossiblyUndefinedIntArrayOffset>
@@ -2205,10 +1966,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php">
-    <InvalidOperand>
-      <code><![CDATA[$e->code_location->getColumn()]]></code>
-      <code><![CDATA[$node->getStartLine()]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$this->aliases->uses_start]]></code>
       <code><![CDATA[!$this->aliases->uses_start]]></code>
@@ -2248,21 +2005,12 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Provider/ClassLikeStorageCacheProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) filemtime($dependent_file_path)]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$root_cache_directory]]></code>
       <code><![CDATA[$file_contents]]></code>
       <code><![CDATA[$file_path]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Provider/DynamicFunctionStorageProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[$stmt->getLine()]]></code>
-      <code><![CDATA[(int)$stmt->getAttribute('startFilePos')]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Provider/FileReferenceCacheProvider.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$cache_directory]]></code>
@@ -2284,9 +2032,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/Provider/FileStorageCacheProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[(int) filemtime($dependent_file_path)]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$root_cache_directory]]></code>
     </RiskyTruthyFalsyComparison>
@@ -2301,23 +2046,7 @@
       <code><![CDATA[$called_method_name]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Internal/Provider/ParamsProvider/ArrayFilterParamsProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[$mode]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Internal/Provider/ParamsProvider/ArrayMultisortParamsProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[$atomic->value]]></code>
-      <code><![CDATA[$first_non_ref_index_after_by_ref]]></code>
-      <code><![CDATA[$key + 1]]></code>
-      <code><![CDATA[$key + 1]]></code>
-      <code><![CDATA[$key + 1]]></code>
-      <code><![CDATA[$last_array_index + 1]]></code>
-      <code><![CDATA[$last_array_index + 1]]></code>
-      <code><![CDATA[$last_array_index + 1]]></code>
-      <code><![CDATA[$last_array_index + 1]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$extended_var_id]]></code>
     </RiskyTruthyFalsyComparison>
@@ -2464,9 +2193,6 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Type/Comparator/CallableTypeComparator.php">
-    <InvalidOperand>
-      <code><![CDATA[$i]]></code>
-    </InvalidOperand>
     <LessSpecificReturnStatement>
       <code><![CDATA[$callable]]></code>
     </LessSpecificReturnStatement>
@@ -2655,7 +2381,6 @@
     </ImplicitToStringCast>
     <InvalidOperand>
       <code><![CDATA[$property_key - 1]]></code>
-      <code><![CDATA[count($generic_params)]]></code>
     </InvalidOperand>
     <PossiblyInvalidOperand>
       <code><![CDATA[$property]]></code>
@@ -2691,10 +2416,6 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Psalm/Internal/TypeVisitor/TypeChecker.php">
-    <InvalidOperand>
-      <code><![CDATA[$template_type_count]]></code>
-      <code><![CDATA[$template_type_count]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$fq_classlike_name]]></code>
       <code><![CDATA[$class_storage->template_types]]></code>
@@ -2707,13 +2428,6 @@
       <code><![CDATA[$function_id]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Issue/CodeIssue.php">
-    <InvalidOperand>
-      <code><![CDATA[$previous_location->getLineNumber()]]></code>
-      <code><![CDATA[$this->code_location->getLineNumber()]]></code>
-      <code><![CDATA[$this->code_location->getLineNumber()]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Issue/MixedArgument.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$function_id]]></code>
@@ -2726,14 +2440,6 @@
   </file>
   <file src="src/Psalm/IssueBuffer.php">
     <InvalidOperand>
-      <code><![CDATA[$e->code_location->getColumn()]]></code>
-      <code><![CDATA[$e->code_location->getColumn()]]></code>
-      <code><![CDATA[$error_count]]></code>
-      <code><![CDATA[$error_count]]></code>
-      <code><![CDATA[$info_count]]></code>
-      <code><![CDATA[$issue->column_from]]></code>
-      <code><![CDATA[$issue->line_from]]></code>
-      <code><![CDATA[$total_count]]></code>
       <code><![CDATA[1_000 * $time]]></code>
       <code><![CDATA[round(1_000 * $time, 2)]]></code>
     </InvalidOperand>
@@ -2745,11 +2451,6 @@
       <code><![CDATA[$parent_issue_type]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Plugin/Shepherd.php">
-    <InvalidOperand>
-      <code><![CDATA[strlen($payload)]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Progress/DefaultProgress.php">
     <InvalidOperand>
       <code><![CDATA[$current_float - $current]]></code>
@@ -2766,12 +2467,6 @@
     </InvalidOperand>
   </file>
   <file src="src/Psalm/Report/ByIssueLevelAndTypeReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$data->column_from]]></code>
-      <code><![CDATA[$data->column_from]]></code>
-      <code><![CDATA[$data->line_from]]></code>
-      <code><![CDATA[$data->line_from]]></code>
-    </InvalidOperand>
     <PossiblyInvalidArgument>
       <code><![CDATA[$this->link_format]]></code>
     </PossiblyInvalidArgument>
@@ -2790,25 +2485,7 @@
       <code><![CDATA[ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Report/CheckstyleReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$issue_data->column_from]]></code>
-      <code><![CDATA[$issue_data->line_from]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Report/CodeClimateReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$issue->from]]></code>
-      <code><![CDATA[$issue->to]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Report/ConsoleReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$data->column_from]]></code>
-      <code><![CDATA[$data->column_from]]></code>
-      <code><![CDATA[$data->line_from]]></code>
-      <code><![CDATA[$data->line_from]]></code>
-    </InvalidOperand>
     <PossiblyInvalidArgument>
       <code><![CDATA[$this->link_format]]></code>
     </PossiblyInvalidArgument>
@@ -2827,69 +2504,16 @@
       <code><![CDATA[ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Report/JunitReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$data->column_from]]></code>
-      <code><![CDATA[$data->column_to]]></code>
-      <code><![CDATA[$data->line_from]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Report/PhpStormReport.php">
-    <InvalidOperand>
-      <code><![CDATA[$issue_data->column_from]]></code>
-      <code><![CDATA[$issue_data->line_from]]></code>
-      <code><![CDATA[$node_data->column_from]]></code>
-      <code><![CDATA[$node_data->line_from]]></code>
-    </InvalidOperand>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$issue_data->taint_trace]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="src/Psalm/Storage/Assertion/DoesNotHaveAtLeastCount.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->count]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/DoesNotHaveExactCount.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->count]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/HasAtLeastCount.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->count]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/HasExactCount.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->count]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Storage/Assertion/IsAClass.php">
     <ImplicitToStringCast>
       <code><![CDATA[$this->type]]></code>
     </ImplicitToStringCast>
   </file>
-  <file src="src/Psalm/Storage/Assertion/IsGreaterThan.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->value]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/IsGreaterThanOrEqualTo.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->value]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/IsLessThan.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->value]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Storage/Assertion/IsLessThanOrEqualTo.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->value]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Storage/Assertion/IsNotAClass.php">
     <ImplicitToStringCast>
       <code><![CDATA[$this->type]]></code>
@@ -3086,17 +2710,6 @@
       <code><![CDATA[$this->value]]></code>
     </InvalidOperand>
   </file>
-  <file src="src/Psalm/Type/Atomic/TLiteralInt.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->value]]></code>
-      <code><![CDATA[$this->value]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="src/Psalm/Type/Atomic/TLiteralString.php">
-    <InvalidOperand>
-      <code><![CDATA[$config->max_string_length]]></code>
-    </InvalidOperand>
-  </file>
   <file src="src/Psalm/Type/Atomic/TNamedObject.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$intersection]]></code>
@@ -3236,14 +2849,6 @@
       <code><![CDATA[$expected_value_type]]></code>
     </ImplicitToStringCast>
   </file>
-  <file src="tests/Config/Plugin/Hook/CustomArrayMapFunctionStorageProvider.php">
-    <InvalidOperand>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$offset]]></code>
-      <code><![CDATA[$return_template_offset]]></code>
-      <code><![CDATA[$template_offset]]></code>
-    </InvalidOperand>
-  </file>
   <file src="tests/Config/PluginListTest.php">
     <InvalidArgument>
       <code><![CDATA[$this->composer_lock]]></code>
@@ -3278,38 +2883,13 @@
       <code><![CDATA[$php_version]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="tests/FileDiffTest.php">
-    <InvalidOperand>
-      <code><![CDATA[$a_stmt->getLine()]]></code>
-    </InvalidOperand>
-  </file>
   <file src="tests/FileManipulation/FileManipulationTestCase.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[strpos(static::class, 'Unnecessary')]]></code>
       <code><![CDATA[strpos(static::class, 'Unused')]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="tests/FileReferenceTest.php">
-    <InvalidOperand>
-      <code><![CDATA[$actual_location->getColumn()]]></code>
-      <code><![CDATA[$actual_location->getLineNumber()]]></code>
-    </InvalidOperand>
-  </file>
-  <file src="tests/FileUpdates/TemporaryUpdateTest.php">
-    <InvalidOperand>
-      <code><![CDATA[$i + 2]]></code>
-      <code><![CDATA[$i + 2]]></code>
-    </InvalidOperand>
-  </file>
   <file src="tests/Internal/Codebase/InternalCallMapHandlerTest.php">
-    <InvalidOperand>
-      <code><![CDATA[PHP_MAJOR_VERSION]]></code>
-      <code><![CDATA[PHP_MAJOR_VERSION]]></code>
-      <code><![CDATA[PHP_MAJOR_VERSION]]></code>
-      <code><![CDATA[PHP_MINOR_VERSION]]></code>
-      <code><![CDATA[PHP_MINOR_VERSION]]></code>
-      <code><![CDATA[PHP_MINOR_VERSION]]></code>
-    </InvalidOperand>
     <MixedReturnStatement>
       <code><![CDATA[ReflectionMethod::createFromMethodName($functionName)]]></code>
     </MixedReturnStatement>
@@ -3317,12 +2897,6 @@
       <code><![CDATA[empty($normalizedEntry['type'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
-  <file src="tests/TestCase.php">
-    <InvalidOperand>
-      <code><![CDATA[$issue->column_from]]></code>
-      <code><![CDATA[$issue->line_from]]></code>
-    </InvalidOperand>
-  </file>
   <file src="tests/TestConfig.php">
     <InvalidExtendClass>
       <code><![CDATA[Config]]></code>
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ConcatAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ConcatAnalyzer.php
index 9ec221c1b90..ab5bda5fa57 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ConcatAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ConcatAnalyzer.php
@@ -465,7 +465,9 @@ private static function analyzeOperand(
         }
 
         if (!$operand_type_match
-            && (!$comparison_result->scalar_type_match_found || $config->strict_binary_operands)
+            && (!$comparison_result->scalar_type_match_found
+                || (!$operand_type->isInt() && $config->strict_binary_operands)
+            )
         ) {
             if ($has_valid_operand) {
                 IssueBuffer::maybeAdd(
diff --git a/tests/BinaryOperationTest.php b/tests/BinaryOperationTest.php
index 917e0b97f87..dd5e66aefb2 100644
--- a/tests/BinaryOperationTest.php
+++ b/tests/BinaryOperationTest.php
@@ -275,23 +275,6 @@ public function testDifferingNumericTypesAdditionInStrictMode(): void
         $this->analyzeFile('somefile.php', new Context());
     }
 
-    public function testConcatenationWithNumberInStrictMode(): void
-    {
-        $config = Config::getInstance();
-        $config->strict_binary_operands = true;
-
-        $this->addFile(
-            'somefile.php',
-            '<?php
-                    $a = "hi" . 5;',
-        );
-
-        $this->expectException(CodeException::class);
-        $this->expectExceptionMessage('InvalidOperand');
-
-        $this->analyzeFile('somefile.php', new Context());
-    }
-
     public function testImplicitStringConcatenation(): void
     {
         $config = Config::getInstance();