diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index a9de342a15..31b9eb33c1 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -244,10 +244,8 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
 	{
 		/* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail
 		 * but don't reduce it if it's already past. */
-		const int NewComboToRegainLife = min( 
-			(int)PREFSMAN->m_iMaxRegenComboAfterFail,
-			m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail );
-		m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife );
+		int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail;
+		m_iComboToRegainLife = clamp( iNewComboToRegainLife, m_iComboToRegainLife, (int)PREFSMAN->m_iMaxRegenComboAfterFail );
 	}
 	
 	m_fLifePercentage += fDeltaLife;