diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index f51dd1b28f..5aae6a7205 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -141,7 +141,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
 	m_sprLabel->StopTweening();
 	m_textBPM.BeginTweening(0.5f);
 	m_sprLabel->BeginTweening(0.5f);
-	if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+	if( GAMESTATE->IsAnExtraStage() )
 	{
 		m_textBPM.SetDiffuse( EXTRA_COLOR );
 		m_sprLabel->SetDiffuse( EXTRA_COLOR );		
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index 15593902da..a5b468b9c2 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -93,7 +93,7 @@ LifeMeterBar::LifeMeterBar()
 	this->AddChild( &m_quadDangerGlow );
 
 	m_pStream = new StreamDisplay;
-	bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2();
+	bool bExtra = GAMESTATE->IsAnExtraStage();
 	RString sExtra = bExtra ? "extra " : "";
 	m_pStream->Load(
 		METER_WIDTH,
@@ -336,7 +336,7 @@ void LifeMeterBar::UpdateNonstopLifebar(const int cleared,
 //	if (cleared > total) cleared = total; // clear/total <= 1
 //	if (total == 0) total = 1;  // no division by 0
 
-	if (GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2())
+	if (GAMESTATE->IsAnExtraStage())
 	{   // extra stage is its own thing, should not be progressive
 	    // and it should be as difficult as life 4
 		// (e.g. it should not depend on life settings)
diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp
index 3b24586c60..b9142718c3 100644
--- a/stepmania/src/LifeMeterTime.cpp
+++ b/stepmania/src/LifeMeterTime.cpp
@@ -45,7 +45,7 @@ void LifeMeterTime::Load( const PlayerState *pPlayerState, PlayerStageStats *pPl
 	this->AddChild( &m_quadDangerGlow );
 
 	m_pStream = new StreamDisplay;
-	bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2();
+	bool bExtra = GAMESTATE->IsAnExtraStage();
 	RString sExtra = bExtra ? "extra " : "";
 	m_pStream->Load(
 		METER_WIDTH,
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index a4d7fe8377..dc75959db0 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -102,7 +102,7 @@ void MusicWheel::Load( RString sType )
 	m_soundChangeSort.Load(	THEME->GetPathS(sType,"sort") );
 	m_soundExpand.Load(	THEME->GetPathS(sType,"expand"), true );
 
-	if( GAMESTATE->IsExtraStage() ||  GAMESTATE->IsExtraStage2() )
+	if( GAMESTATE->IsAnExtraStage() )
 	{
 		// make the preferred group the group of the last song played.
 		if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL  &&  !PREFSMAN->m_bPickExtraStage )
@@ -400,7 +400,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SortOrder so, const RStr
 
 	/* Hack: Add extra stage item if it was eliminated for any reason (eg. it's a long
 	 * song). */
-	if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+	if( GAMESTATE->IsAnExtraStage() )
 	{
 		Song* pSong;
 		Steps* pSteps;
@@ -593,7 +593,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 					arrayWheelItemDatas.push_back( WheelItemData(TYPE_PORTAL, NULL, "", NULL, RageColor(1,0,0,1)) );
 			}
 
-			if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+			if( GAMESTATE->IsAnExtraStage() )
 			{
 				Song* pSong;
 				Steps* pSteps;
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index c72d550d08..3bcc4e757c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -720,7 +720,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
 
 		m_soundAssistTick.Load(	THEME->GetPathS(m_sName,"assist tick"), true );
 
-		if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )	// only load if we're going to use it
+		if( GAMESTATE->IsAnExtraStage() )	// only load if we're going to use it
 		{
 			m_textSurviveTime.LoadFromFont( THEME->GetPathF(m_sName,"survive time") );
 			m_textSurviveTime.SetShadowLength( 0 );
@@ -2036,7 +2036,7 @@ void ScreenGameplay::BeginBackingOutFromGameplay()
 	if( GAMESTATE->IsFinalStage() )
 		GAMESTATE->m_bBackedOutOfFinalStage = true;
 	// Disallow backing out of extra stage
-	if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+	if( GAMESTATE->IsAnExtraStage() )
 		SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );
 	else
 		m_Cancel.StartTransitioning( SM_DoPrevScreen );
@@ -2263,7 +2263,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_PlayGo )
 	{
-		if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+		if( GAMESTATE->IsAnExtraStage() )
 			SOUND->PlayOnceFromAnnouncer( "gameplay here we go extra" );
 		else if( GAMESTATE->IsFinalStage() )
 			SOUND->PlayOnceFromAnnouncer( "gameplay here we go final" );
@@ -2512,7 +2512,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		m_Failed.StartTransitioning( SM_DoNextScreen );
 
 		// show the survive time if extra stage
-		if( GAMESTATE->IsExtraStage()  ||  GAMESTATE->IsExtraStage2() )
+		if( GAMESTATE->IsAnExtraStage() )
 		{
 			float fMaxSurviveSeconds = 0;
 			FOREACH_EnabledPlayer(p)
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index a6fdc34949..2abbcb87bf 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -850,7 +850,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 	{
 		if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) )
 		{
-			if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+			if( GAMESTATE->IsAnExtraStage() )
 				m_soundLocked.Play();
 			else
 				ChangeDifficulty( pn, -1 );
@@ -858,7 +858,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		}
 		if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) )
 		{
-			if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+			if( GAMESTATE->IsAnExtraStage() )
 				m_soundLocked.Play();
 			else
 				ChangeDifficulty( pn, +1 );
@@ -1531,7 +1531,7 @@ void ScreenSelectMusic::AfterMusicChange()
 			if ( PREFSMAN->m_bShowBanners )
 				g_sBannerPath = pSong->GetBannerPath();
 
-			if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+			if( GAMESTATE->IsAnExtraStage() )
 			{
 				m_BPMDisplay.CycleRandomly();				
 			}