diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/RedundantAssignEliminator.cpp
index aca44d0b3..38c7881a0 100644
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/RedundantAssignEliminator.cpp
@@ -280,29 +280,28 @@ void RedundantAssignEliminator::changeUndecidedTo(YulString _variable, Redundant
 
 void RedundantAssignEliminator::finalize(YulString _variable, RedundantAssignEliminator::State _finalState)
 {
-	finalize(m_assignments, _variable, _finalState);
-	for (auto& assignments: m_forLoopInfo.pendingBreakStmts)
-		finalize(assignments, _variable, _finalState);
-	for (auto& assignments: m_forLoopInfo.pendingContinueStmts)
-		finalize(assignments, _variable, _finalState);
-}
+	std::map<Assignment const*, State> assignments;
+	joinMap(assignments, std::move(m_assignments[_variable]), State::join);
+	m_assignments.erase(_variable);
 
-void RedundantAssignEliminator::finalize(
-	TrackedAssignments& _assignments,
-	YulString _variable,
-	RedundantAssignEliminator::State _finalState
-)
-{
-	for (auto const& assignment: _assignments[_variable])
+	for (auto& breakAssignments: m_forLoopInfo.pendingBreakStmts)
+	{
+		joinMap(assignments, std::move(breakAssignments[_variable]), State::join);
+		breakAssignments.erase(_variable);
+	}
+	for (auto& continueAssignments: m_forLoopInfo.pendingContinueStmts)
+	{
+		joinMap(assignments, std::move(continueAssignments[_variable]), State::join);
+		continueAssignments.erase(_variable);
+	}
+
+	for (auto const& assignment: assignments)
 	{
 		State const state = assignment.second == State::Undecided ? _finalState : assignment.second;
 
 		if (state == State::Unused && SideEffectsCollector{*m_dialect, *assignment.first->value}.movable())
-			// TODO the only point where we actually need this
-			// to be a set is for the for loop
 			m_pendingRemovals.insert(assignment.first);
 	}
-	_assignments.erase(_variable);
 }
 
 void AssignmentRemover::operator()(Block& _block)
diff --git a/libyul/optimiser/RedundantAssignEliminator.h b/libyul/optimiser/RedundantAssignEliminator.h
index fec6a2714..7849708d6 100644
--- a/libyul/optimiser/RedundantAssignEliminator.h
+++ b/libyul/optimiser/RedundantAssignEliminator.h
@@ -161,8 +161,6 @@ private:
 	/// assignments to the final state. In this case, this also applies to pending
 	/// break and continue TrackedAssignments.
 	void finalize(YulString _variable, State _finalState);
-	/// Helper function for the above.
-	void finalize(TrackedAssignments& _assignments, YulString _variable, State _finalState);
 
 	Dialect const* m_dialect;
 	std::set<YulString> m_declaredVariables;