diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index ba5e0949d5..8eace0cb18 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -27,8 +27,8 @@ struct OptionRowData
 {
 	CString name;
 	bool bOneChoiceForAllPlayers;
-	vector<CString> choices;
 	bool bMultiSelect;
+	vector<CString> choices;
 
 	OptionRowData(): name(""), bOneChoiceForAllPlayers(false), bMultiSelect(false) { }
 
@@ -36,10 +36,10 @@ struct OptionRowData
 	{
 		name = n;
 		bOneChoiceForAllPlayers = !!b;
+		bMultiSelect = false;
 #define PUSH( c )	if(c) choices.push_back(c);
 		PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
 #undef PUSH
-		bMultiSelect = false;
 	}
 };
 
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 6d76299dbf..9934e62f04 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -218,23 +218,26 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 	{
 		OptionRowData &row = m_OptionRowAlloc[i];
 		
-		CStringArray asParts;
-		split( ROW_LINE(i), ";", asParts );
-		if( asParts.size() < 1 )
+		CString sRowCommands = ROW_LINE(i);
+		
+		vector<ParsedCommand> vCommands;
+		ParseCommands( sRowCommands, vCommands );
+		
+		if( vCommands.size() < 1 )
 			RageException::Throw( "Parse error in %s::Line%i", m_sName.c_str(), i+1 );
 
 		OptionRowHandler hand;
-		for( unsigned part = 0; part < asParts.size(); ++part)
+		for( unsigned part = 0; part < vCommands.size(); ++part)
 		{
-			CStringArray asBits;
-			split( asParts[part], ",", asBits );
+			ParsedCommand& command = vCommands[part];
 
-			const CString name = asBits[0];
-			const CString param = asBits.size() > 1? asBits[1]: "";
+			HandleParams;
+
+			const CString name = sParam(0);
 
 			if( !name.CompareNoCase("list") )
 			{
-				SetList( row, hand, param, row.name );
+				SetList( row, hand, sParam(1), row.name );
 			}
 			else if( !name.CompareNoCase("steps") )
 			{
@@ -243,7 +246,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 			}
 			else if( !name.CompareNoCase("conf") )
 			{
-				SetConf( row, hand, param, row.name );
+				SetConf( row, hand, sParam(1), row.name );
 			}
 			else if( !name.CompareNoCase("characters") )
 			{
@@ -257,6 +260,8 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 			}
 			else
 				RageException::Throw( "Unexpected type '%s' in %s::Line%i", name.c_str(), m_sName.c_str(), i );
+
+			CheckHandledParams;
 		}
 		OptionRowHandlers.push_back( hand );
 	}