diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index f0100c0a0b..8b3906727f 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -127,7 +127,7 @@ void MusicWheel::BeginScreen()
 
 	WheelBase::BeginScreen();
 
-	if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+	if( GAMESTATE->IsAnExtraStage() )
 	{
 		m_WheelState = STATE_LOCKED;
 		SCREENMAN->PlayStartSound();
@@ -344,8 +344,7 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so, const RSt
 		Song* pSong = apAllSongs[i];
 
 		/* If we're on an extra stage, and this song is selected, ignore #SELECTABLE. */
-		if( pSong != GAMESTATE->m_pCurSong || 
-			(!GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2()) )
+		if( pSong != GAMESTATE->m_pCurSong || !GAMESTATE->IsAnExtraStage() )
 		{
 			/* Hide songs that asked to be hidden via #SELECTABLE. */
 			if( !pSong->NormallyDisplayed() )
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 3fc1816c5b..2bb65dd758 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -251,12 +251,6 @@ void ScreenEvaluation::Init()
 			grade[p] = Grade_Failed;
 	}
 	
-	m_bTryExtraStage = 
-		GAMESTATE->HasEarnedExtraStage()  && 
-		!GAMESTATE->IsCourseMode() &&
-		!SUMMARY;
- 
-
 	//
 	// load sounds
 	//
@@ -661,7 +655,10 @@ void ScreenEvaluation::Init()
 	FOREACH_PlayerNumber( p )
 		best_grade = min( best_grade, grade[p] ); 
 	
-	if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage )
+	if( PREFSMAN->m_bAllowExtraStage &&
+		GAMESTATE->HasEarnedExtraStage()  && 
+		!GAMESTATE->IsCourseMode() &&
+		!SUMMARY )
 	{
 		m_sprTryExtraStage.Load( THEME->GetPathG(m_sName,GAMESTATE->IsExtraStage()?"try extra2":"try extra1") );
 		m_sprTryExtraStage->SetName( "TryExtraStage" );
diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h
index 825208bd1b..410099377f 100644
--- a/stepmania/src/ScreenEvaluation.h
+++ b/stepmania/src/ScreenEvaluation.h
@@ -111,7 +111,6 @@ protected:
 	// extra area
 	AutoActor		m_sprMachineRecord[NUM_PLAYERS];
 	AutoActor		m_sprPersonalRecord[NUM_PLAYERS];
-	bool			m_bTryExtraStage;
 	AutoActor		m_sprTryExtraStage;
 	bool m_bFailed;
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index c6d99c31fe..81281d0355 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -379,7 +379,7 @@ void ScreenGameplay::Init()
 	 * user doesn't have full control; saving would force profiles to Difficulty_Hard
 	 * and save over their default modifiers every time someone got an extra stage.
 	 * Do this before course modifiers are set up. */
-	if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
+	if( !GAMESTATE->IsAnExtraStage() )
 	{
 		FOREACH_HumanPlayer( pn )
 			GAMESTATE->SaveCurrentSettingsToProfile(pn);
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ffd34cdbf7..c0cc3d1c76 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -581,12 +581,12 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
 	}
 	else if( CodeDetector::EnteredNextSort(input.GameI.controller) )
 	{
-		if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
+		if( GAMESTATE->IsAnExtraStage() )
 			m_soundLocked.Play();
 		else
 			m_MusicWheel.NextSort();
 	}
-	else if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )
+	else if( !GAMESTATE->IsExtraAnStage() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )
 	{
 		m_soundOptionsChange.Play();
 		MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", input.pn+1) );