diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index c518311404..4e0e896047 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -55,20 +55,6 @@ void OptionRow::PrepareItemText( RString &s ) const
 		s.MakeUpper(); 
 }
 
-RString OptionRow::OptionTitle( RString s ) const
-{
-	bool bTheme = false;
-	
-	// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
-	if( m_pHand->m_Def.m_bAllowThemeTitle )
-		bTheme = true;
-
-	if( s.empty() )
-		return s;
-
-	return bTheme ? THEME->GetString("OptionTitles",s) : s;
-}
-
 RString ITEMS_LONG_ROW_X_NAME( size_t p )		{ return ssprintf("ItemsLongRowP%dX",int(p+1)); }
 RString ICONS_X_NAME( size_t p )				{ return ssprintf("IconsP%dX",int(p+1)); }
 
@@ -222,11 +208,10 @@ void OptionRow::ChoicesChanged()
 
 RString OptionRow::GetRowTitle() const
 {
-	RString sLineName = m_pHand->m_Def.m_sName;
-	RString sTitle = OptionTitle(sLineName);
+	RString sTitle = m_pHand->OptionTitle();
 
 	// HACK: tack the BPM onto the name of the speed line
-	if( sLineName.CompareNoCase("speed")==0 )
+	if( m_pHand->m_Def.m_sName.CompareNoCase("speed")==0 )
 	{
 		bool bShowBpmInSpeedTitle = m_pParentType->SHOW_BPM_IN_SPEED_TITLE;
 
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index 36619e7636..30517cba03 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -186,7 +186,6 @@ public:
 	bool GetFirstItemGoesDown() const { return m_bFirstItemGoesDown; }
 
 	void PrepareItemText( RString &s ) const;
-	RString OptionTitle( RString s ) const;
 
 	void SetExitText( RString sExitText );
 
diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 4f9b5c1f0f..d656f37f9f 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -28,6 +28,21 @@
 #define ENTRY_MODE(s,i)		THEME->GetMetric ("ScreenOptionsMaster",ssprintf("%s,%i",(s).c_str(),(i+1)))
 #define ENTRY_DEFAULT(s)	THEME->GetMetric ("ScreenOptionsMaster",(s) + "Default")
 
+RString OptionRowHandler::OptionTitle() const
+{
+	bool bTheme = false;
+	
+	// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
+	if( m_Def.m_bAllowThemeTitle )
+		bTheme = true;
+
+	RString s = m_Def.m_sName;
+	if( s.empty() )
+		return s;
+
+	return bTheme ? THEME->GetString("OptionTitles",s) : s;
+}
+
 void OptionRowHandler::GetIconTextAndGameCommand( int iFirstSelection, RString &sIconTextOut, GameCommand &gcOut ) const
 {
 	sIconTextOut = "";
@@ -1268,7 +1283,7 @@ OptionRowHandler* OptionRowHandlerUtil::MakeSimple( const MenuRowDef &mr )
 	pHand->m_Def.m_bOneChoiceForAllPlayers = true;
 	pHand->m_Def.m_selectType = SELECT_ONE;
 	pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
-	pHand->m_Def.m_bExportOnChange = false;
+	pHand->m_Def.m_bExportOnChange = false;//true;
 		
 	pHand->m_Def.m_vsChoices = mr.choices;
 
diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h
index c239d469a6..54eab378f2 100644
--- a/stepmania/src/OptionRowHandler.h
+++ b/stepmania/src/OptionRowHandler.h
@@ -32,6 +32,8 @@ public:
 		m_cmds = cmds;
 		this->LoadInternal( cmds );
 	}
+	RString OptionTitle() const;
+
 	virtual void LoadInternal( const Commands &cmds ) { }
 
 	/*