diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 5606cd2461..c52fdf7d92 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -208,24 +208,24 @@ void Screen::Input( const InputEventPlus &input )
 
 void Screen::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_MenuTimer )
 	{
-	case SM_MenuTimer:
 		FOREACH_HumanPlayer(p)
 			MenuStart( p );
-		break;
-	case SM_GoToNextScreen:
+	}
+	else if( SM == SM_GoToNextScreen )
+	{
 		if( SCREENMAN->IsStackedScreen(this) )
 			SCREENMAN->PopTopScreen( m_smSendOnPop );
 		else
 			SCREENMAN->SetNewScreen( GetNextScreen() );
-		break;
-	case SM_GoToPrevScreen:
+	}
+	else if( SM == SM_GoToPrevScreen )
+	{
 		if( SCREENMAN->IsStackedScreen(this) )
 			SCREENMAN->PopTopScreen( m_smSendOnPop );
 		else
 			SCREENMAN->SetNewScreen( GetPrevScreen() );
-		break;
 	}
 }
 
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 1bd0aa0265..df7648d2fc 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -113,16 +113,14 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
 {
 	Screen::HandleScreenMessage( SM );
 
-	switch( SM )
+	if( SM == SM_MenuTimer )
 	{
-	case SM_MenuTimer:
 		if( GAMESTATE->GetNumSidesJoined() == 0 )
 		{
 			MenuStart(PLAYER_1);
 		}
 
 		StartTransitioningScreen( SM_GoToNextScreen );
-		break;
 	}
 
 	ScreenWithMenuElements::HandleScreenMessage( SM );
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index 38f8d4cd0e..b4ea533b28 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -280,18 +280,18 @@ void ScreenHowToPlay::Update( float fDelta )
 
 void ScreenHowToPlay::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_GainFocus )
 	{
-	case SM_GainFocus:
 		/* We do this ourself. */
 		SOUND->HandleSongTimer( false );
-		break;
-	case SM_LoseFocus:
+	}
+	else if( SM == SM_LoseFocus )
+	{
 		SOUND->HandleSongTimer( true );
-		break;
-	case SM_GoToNextScreen:
+	}
+	else if( SM == SM_GoToNextScreen )
+	{
 		GAMESTATE->Reset();
-		break;
 	}
 	ScreenAttract::HandleScreenMessage( SM );
 }
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 86f364a289..30b160818b 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -366,28 +366,25 @@ void ScreenNameEntry::Input( const InputEventPlus &input )
 
 void ScreenNameEntry::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_MenuTimer )
 	{
-	case SM_MenuTimer:
 		if( !m_Out.IsTransitioning() )
 		{
 			FOREACH_PlayerNumber( p )
 				this->MenuStart( p );
 		}
-		break;
-	case SM_GoToNextScreen:
-		{
-			GAMESTATE->RestoreSelectedOptions();
+	}
+	else if( SM == SM_GoToNextScreen )
+	{
+		GAMESTATE->RestoreSelectedOptions();
 
-			// There shouldn't be NameEntry in event mode.  -Chris
-//			/* Hack: go back to the select course screen in event mode. */
-//			if( GAMESTATE->GetEventMode() && GAMESTATE->IsCourseMode() )
-//			{
-//				SCREENMAN->SetNewScreen( "ScreenSelectCourse" );
-//				break;
-//			}
-		}
-		break;
+		// There shouldn't be NameEntry in event mode.  -Chris
+//		/* Hack: go back to the select course screen in event mode. */
+//		if( GAMESTATE->GetEventMode() && GAMESTATE->IsCourseMode() )
+//		{
+//			SCREENMAN->SetNewScreen( "ScreenSelectCourse" );
+//			break;
+//		}
 	}
 
 	Screen::HandleScreenMessage( SM );
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index ddebba7f0f..b6184538b9 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -172,18 +172,20 @@ void ScreenSelectCharacter::Input( const InputEventPlus &input )
 
 void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_BeginFadingOut )
 	{
-	case SM_BeginFadingOut:
 		StartTransitioningScreen( SM_GoToNextScreen );
-		return;
-	case SM_MenuTimer:
+	}
+	else if( SM == SM_MenuTimer )
+	{
 		MenuStart(PLAYER_1);
 		if( !AllAreFinishedChoosing() )
 			ResetTimer();
-		return;
 	}
-	Screen::HandleScreenMessage( SM );
+	else
+	{
+		Screen::HandleScreenMessage( SM );
+	}
 }
 
 PlayerNumber ScreenSelectCharacter::GetAffectedPlayerNumber( PlayerNumber pn )
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 4af0321b49..1497186de5 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -138,9 +138,8 @@ void ScreenSelectGroup::Input( const InputEventPlus &input )
 
 void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_BeginFadingOut )
 	{
-	case SM_BeginFadingOut:
 		StartTransitioningScreen( SM_GoToNextScreen );
 		return;
 	}
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index 38bb896a47..da7bad10f0 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -243,14 +243,10 @@ void ScreenSelectMode::UpdateSelectableChoices()
 
 void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
+	if( SM == SM_MenuTimer )
 	{
-	case SM_MenuTimer:
-		{
-			m_bSelected = true;
-			SetCharacters();
-		}
-		break;
+		m_bSelected = true;
+		SetCharacters();
 	}
 	ScreenSelect::HandleScreenMessage(SM);
 }
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index e5bb3fbd4f..6cf6762327 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -98,12 +98,8 @@ void ScreenTestLights::Input( const InputEventPlus &input )
 
 void ScreenTestLights::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
-	{
-	case SM_LoseFocus:
+	if( SM == SM_LoseFocus )
 		LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
-		break;
-	}
 }
 
 void ScreenTestLights::MenuLeft( PlayerNumber pn )