diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 65801e1c04..c4114c25a9 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -321,8 +321,8 @@ done:
 
 void ScreenNetSelectMusic::MenuLeft( PlayerNumber pn )
 {
-	bool bLeftPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT) );
-	bool bRightPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT) );
+	bool bLeftPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT), pn );
+	bool bRightPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT), pn );
 	bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
 
 	if ( bLeftAndRightPressed )
@@ -333,8 +333,8 @@ void ScreenNetSelectMusic::MenuLeft( PlayerNumber pn )
 
 void ScreenNetSelectMusic::MenuRight( PlayerNumber pn )
 {
-	bool bLeftPressed = INPUTMAPPER->IsBeingPressed( MenuInput (pn, MENU_BUTTON_LEFT) );
-	bool bRightPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT) ) ;
+	bool bLeftPressed = INPUTMAPPER->IsBeingPressed( MenuInput (pn, MENU_BUTTON_LEFT), pn );
+	bool bRightPressed = INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT), pn );
 	bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
 
 	if ( bLeftAndRightPressed )
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 56e2e6acfd..e831fa3917 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -503,9 +503,9 @@ void ScreenOptions::Input( const InputEventPlus &input )
 		case MENU_BUTTON_SELECT:
 		case MENU_BUTTON_RIGHT:
 		case MENU_BUTTON_LEFT:
-			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_START) );
-			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_RIGHT) );
-			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_LEFT) );
+			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_START), input.pn );
+			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_RIGHT), input.pn );
+			INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_LEFT), input.pn );
 		}
 	}
 
@@ -794,8 +794,8 @@ void ScreenOptions::MenuStart( const InputEventPlus &input )
 	case NAV_TOGGLE_THREE_KEY:
 		{
 			bool bHoldingLeftAndRight = 
-				INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT) ) &&
-				INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT) );
+				INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT), pn ) &&
+				INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT), pn );
 			if( bHoldingLeftAndRight )
 			{
 				if( MoveRowRelative(pn, -1, input.type != IET_FIRST_PRESS) )
@@ -1223,14 +1223,14 @@ void ScreenOptions::MenuUpDown( const InputEventPlus &input, int iDir )
 		 * holding both up and down from toggling repeatedly in-place. */
 		if( iDir == +1 )
 		{
-			if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_UP)) ||
-				INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_SELECT)) )
+			if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_UP), pn) ||
+				INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_SELECT), pn) )
 				return;
 		}
 		else
 		{
-			if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_DOWN)) ||
-				INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_START)) )
+			if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_DOWN), pn) ||
+				INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_START), pn) )
 				return;
 		}
 	}
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ed72d92fa4..675f0c595b 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -285,7 +285,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		return;		// don't care
 
 
-	PlayerNumber pn = input.MenuI.player;
+	PlayerNumber pn = input.pn;
 	if( !GAMESTATE->IsHumanPlayer(pn) )
 		return;
 
@@ -334,7 +334,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		return;
 	}
 
-	if( SELECT_MENU_AVAILABLE && INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_SELECT) ) )
+	if( SELECT_MENU_AVAILABLE && INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_SELECT), pn ) )
 	{
 		if( input.type == IET_FIRST_PRESS )
 		{
@@ -370,8 +370,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 			bool bRightIsDown = false;
 			FOREACH_EnabledPlayer( p )
 			{
-				bLeftIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(p, MENU_BUTTON_LEFT) );
-				bRightIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(p, MENU_BUTTON_RIGHT) );
+				bLeftIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(p, MENU_BUTTON_LEFT), p );
+				bRightIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(p, MENU_BUTTON_RIGHT), p );
 			}
 			
 			bool bBothDown = bLeftIsDown && bRightIsDown;
@@ -422,8 +422,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 			{
 				FOREACH_HumanPlayer( p )
 				{
-					INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_LEFT) );
-					INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_RIGHT) );
+					INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_LEFT), p );
+					INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_RIGHT), p );
 				}
 			}
 		}
@@ -444,7 +444,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 	case MENU_BUTTON_BACK:
 		/* Don't make the user hold the back button if they're pressing escape and escape is the back button. */
 		if( input.DeviceI.device == DEVICE_KEYBOARD  &&  input.DeviceI.button == KEY_ESC )
-			this->MenuBack( input.MenuI.player );
+			this->MenuBack( input.pn );
 		else
 			Screen::MenuBack( input );
 		break;
@@ -506,8 +506,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 void ScreenSelectMusic::UpdateSelectButton()
 {
 	bool bSelectIsDown = false;
-	FOREACH_EnabledPlayer( p )
-		bSelectIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(p, MENU_BUTTON_SELECT) );
+	FOREACH_EnabledPlayer( pn )
+		bSelectIsDown |= INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_SELECT), pn );
 	if( !SELECT_MENU_AVAILABLE )
 		bSelectIsDown = false;
 
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index 883a4aa340..f8f1c45bd7 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -184,8 +184,8 @@ void ScreenSetTime::MenuRight( PlayerNumber pn )
 void ScreenSetTime::MenuStart( PlayerNumber pn )
 {
 	bool bHoldingLeftAndRight = 
-		INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT) ) &&
-		INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT) );
+		INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT), pn ) &&
+		INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT), pn );
 
 	if( bHoldingLeftAndRight )
 		ChangeSelection( -1 );