diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index c465f86b10..197a1d6ffd 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -176,7 +176,7 @@ void ScreenSelect::FinalizeChoices()
 	FOREACH_PlayerNumber( p )
 		if( GAMESTATE->IsHumanPlayer(p) )
 		{
-			const int sel = GetSelectionIndex( (PlayerNumber)p );
+			const int sel = GetSelectionIndex( p );
 			
 			if( m_aModeChoices[sel].m_pStyle )
 				GAMESTATE->m_pCurStyle = m_aModeChoices[sel].m_pStyle;
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 465853a714..e69f4b789e 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -602,20 +602,18 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
 	if( SHARED_PREVIEW_AND_CURSOR || GetCurrentPage() == PAGE_2 )
 	{
 		/* Only one player has to pick.  Choose this for all the other players, too. */
-		FOREACH_PlayerNumber( p )
-			if( GAMESTATE->IsHumanPlayer(p) )
-			{
-				ASSERT( !m_bChosen[p] );
-				fSecs = max( fSecs, DoMenuStart( (PlayerNumber)p ) );
-			}
+		FOREACH_HumanPlayer( p )
+		{
+			ASSERT( !m_bChosen[p] );
+			fSecs = max( fSecs, DoMenuStart(p) );
+		}
 	}
 	else
 	{
 		fSecs = max( fSecs, DoMenuStart(pn) );
 		// check to see if everyone has chosen
-		FOREACH_PlayerNumber( p )
-			if( GAMESTATE->IsHumanPlayer((PlayerNumber)p) )
-				bAllDone &= m_bChosen[p];
+		FOREACH_HumanPlayer( p )
+			bAllDone &= m_bChosen[p];
 	}
 
 	if( bAllDone )