diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index f9813e3e6b..5b8f18a9e3 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -77,21 +77,17 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 {
 	LOG->Trace( "ScreenOptions::Set()" );
 
-	CHECKPOINT;
-
 	m_InputMode = im;
 	m_OptionRow = OptionRows;
 	m_iNumOptionRows = iNumOptionLines;
 	m_bLoadExplanations = bLoadExplanations;
 
-	CHECKPOINT;
-
 	this->ImportOptions();
-	for( unsigned l=0; l<MAX_OPTION_LINES; l++ )
+
+	for( unsigned l=0; l<m_iNumOptionRows; l++ )
 		if( m_OptionRow[l].bOneChoiceForAllPlayers )
 			m_iSelectedOption[PLAYER_2][l] = m_iSelectedOption[PLAYER_1][l];
 
-	CHECKPOINT;
 
 
 	int p;
@@ -106,8 +102,6 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 		m_framePage.AddChild( &m_Highlight[p] );
 	}
 
-	CHECKPOINT;
-
 	// init underlines
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
@@ -124,8 +118,6 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 		}
 	}
 
-	CHECKPOINT;
-
 	// init m_textItems from optionLines
 	int r;
 	for( r=0; r<m_iNumOptionRows; r++ )		// foreach line
@@ -196,10 +188,8 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 			m_framePage.AddChild( textItems[c] );
 	}
 
-	CHECKPOINT;
 	InitOptionsText();
 
-	CHECKPOINT;
 	// TRICKY:  Add one more item.  This will be "EXIT"
 	{
 		BitmapText *bt = new BitmapText;