diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index a7127a39c3..82cae72fe1 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -284,21 +284,17 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 		GetExplanationTitle( r );
 	}
 
-
 	CHECKPOINT;
 
 	PositionItems();
 	PositionUnderlines();
 	PositionIcons();
-	CHECKPOINT;
 	RefreshIcons();
-	CHECKPOINT;
 	PositionCursors();
-	CHECKPOINT;
 	UpdateEnabledDisabled();
-	CHECKPOINT;
 	for( p=0; p<NUM_PLAYERS; p++ )
 		OnChange( (PlayerNumber)p );
+
 	CHECKPOINT;
 
 	/* It's tweening into position, but on the initial tween-in we only want to
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index c1a37b25ff..3e47506558 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -100,13 +100,16 @@ protected:
 	OptionRow*		m_OptionRow;
 
 protected:	// derived classes need access to these
-	int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
-	int m_iCurrentRow[NUM_PLAYERS];
+	int				m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
+	int				m_iNumOptionRows;
+	int				m_iCurrentRow[NUM_PLAYERS];
+
+	OptionIcon		m_OptionIcons[NUM_PLAYERS][MAX_OPTION_LINES];
+
+private:
 
 	InputMode		m_InputMode;
 
-	int				m_iNumOptionRows;
-
 	ActorFrame		m_framePage;
 	AutoActor		m_sprPage;
 	AutoActor		m_sprFrame;
@@ -122,7 +125,6 @@ protected:	// derived classes need access to these
 
 
 	OptionsCursor	m_Underline[NUM_PLAYERS][MAX_OPTION_LINES];
-	OptionIcon		m_OptionIcons[NUM_PLAYERS][MAX_OPTION_LINES];
 	OptionsCursor	m_Highlight[NUM_PLAYERS];
 	Sprite			m_sprLineHighlight[NUM_PLAYERS];