diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 13a126d3e5..56d38434c9 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -634,11 +634,8 @@ void ScreenNameEntryTraditional::UpdateSelectionText( int pn )
 	m_textSelection[pn].SetText( WStringToRString(text) );
 }
 
-void ScreenNameEntryTraditional::MenuStart( const InputEventPlus &input )
+void ScreenNameEntryTraditional::MenuStart( PlayerNumber pn )
 {
-	if( input.type != IET_FIRST_PRESS )
-		return;		// ignore
-
 	HandleStart( input.MenuI.player );
 }
 
@@ -686,15 +683,10 @@ void ScreenNameEntryTraditional::HandleStart( PlayerNumber pn )
 	}
 }
 
-void ScreenNameEntryTraditional::MenuSelect( const InputEventPlus &input )
+void ScreenNameEntryTraditional::MenuSelect( PlayerNumber pn )
 {
-	PlayerNumber pn = input.MenuI.player;
-
 	if( !m_bStillEnteringName[pn] )
 		return;	// ignore
-	if( input.type != IET_FIRST_PRESS )
-		return;		// ignore
-
 	Backspace( pn );
 }
 
diff --git a/stepmania/src/ScreenNameEntryTraditional.h b/stepmania/src/ScreenNameEntryTraditional.h
index 673a9f339a..f7b40077cd 100644
--- a/stepmania/src/ScreenNameEntryTraditional.h
+++ b/stepmania/src/ScreenNameEntryTraditional.h
@@ -51,8 +51,8 @@ public:
 	void HandleScreenMessage( const ScreenMessage SM );
 	void Input( const InputEventPlus &input );
 
-	void MenuStart( const InputEventPlus &input );
-	void MenuSelect( const InputEventPlus &input );
+	void MenuStart( PlayerNumber pn );
+	void MenuSelect( PlayerNumber pn );
 	void MenuLeft( const InputEventPlus &input );
 	void MenuRight( const InputEventPlus &input );
 
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 69cbd0edf6..0e9c47f4cb 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -318,34 +318,28 @@ done:
 	ScreenNetSelectBase::HandleScreenMessage( SM );
 }
 
-void ScreenNetSelectMusic::MenuLeft( const InputEventPlus &input )
+void ScreenNetSelectMusic::MenuLeft( PlayerNumber pn )
 {
-	bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_LEFT) );
-	bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_RIGHT) );
+	bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_LEFT) );
+	bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_RIGHT) );
 	bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
 
-	if( input.type == IET_FIRST_PRESS )
-	{
-		if ( bLeftAndRightPressed )
-			m_MusicWheel.ChangeSort( SORT_MODE_MENU );		
-		else
-			m_MusicWheel.Move( -1 );
-	}
+	if ( bLeftAndRightPressed )
+		m_MusicWheel.ChangeSort( SORT_MODE_MENU );		
+	else
+		m_MusicWheel.Move( -1 );
 }
 
-void ScreenNetSelectMusic::MenuRight( const InputEventPlus &input )
+void ScreenNetSelectMusic::MenuRight( PlayerNumber pn )
 {
-	bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput (input.MenuI.player, MENU_BUTTON_LEFT) );
-	bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_RIGHT) ) ;
+	bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput (pn, MENU_BUTTON_LEFT) );
+	bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_RIGHT) ) ;
 	bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
 
-	if( input.type == IET_FIRST_PRESS )
-	{
-		if ( bLeftAndRightPressed )
-			m_MusicWheel.ChangeSort( SORT_MODE_MENU );		
-		else
-			m_MusicWheel.Move( +1 );
-	}
+	if ( bLeftAndRightPressed )
+		m_MusicWheel.ChangeSort( SORT_MODE_MENU );		
+	else
+		m_MusicWheel.Move( +1 );
 }
 
 void ScreenNetSelectMusic::MenuUp( const InputEventPlus &input )
diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h
index f4e8b1b214..1f238264c4 100644
--- a/stepmania/src/ScreenNetSelectMusic.h
+++ b/stepmania/src/ScreenNetSelectMusic.h
@@ -52,10 +52,10 @@ private:
 
 protected:
 	virtual void MenuStart( PlayerNumber pn );
-	virtual void MenuLeft( const InputEventPlus &input );
+	virtual void MenuLeft( PlayerNumber pn );
 	virtual void MenuUp( const InputEventPlus &input );
 	virtual void MenuDown( const InputEventPlus &input );
-	virtual void MenuRight( const InputEventPlus &input );
+	virtual void MenuRight( PlayerNumber pn );
 	virtual void MenuBack( PlayerNumber pn );
 
 	virtual void Update( float fDeltaTime );
diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp
index 8992f37a48..cd5f127ce9 100644
--- a/stepmania/src/ScreenNetworkOptions.cpp
+++ b/stepmania/src/ScreenNetworkOptions.cpp
@@ -145,8 +145,6 @@ void ScreenNetworkOptions::HandleScreenMessage( const ScreenMessage SM )
 
 void ScreenNetworkOptions::MenuStart( const InputEventPlus &input )
 {
-#if defined( WITHOUT_NETWORKING )
-#else
 	switch( GetCurrentRow() )
 	{
 	case PO_CONNECTION:
@@ -201,7 +199,6 @@ void ScreenNetworkOptions::MenuStart( const InputEventPlus &input )
 	default:
 		ScreenOptions::MenuStart( input );
 	}
-#endif
 }
 
 void ScreenNetworkOptions::ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp
index 23ac9da96c..d0e66db7a0 100644
--- a/stepmania/src/ScreenOptionsManageCourses.cpp
+++ b/stepmania/src/ScreenOptionsManageCourses.cpp
@@ -72,13 +72,10 @@ void ScreenOptionsEditCourseSubMenu::Init()
 	ScreenOptions::Init();
 }
 
-void ScreenOptionsEditCourseSubMenu::MenuSelect( const InputEventPlus &input )
+void ScreenOptionsEditCourseSubMenu::MenuSelect( PlayerNumber pn )
 {
-	if( input.type == IET_FIRST_PRESS )
-	{
-		SetNextCombination();
-		m_soundDifficultyChanged.Play();
-	}
+	SetNextCombination();
+	m_soundDifficultyChanged.Play();
 
 }
 
diff --git a/stepmania/src/ScreenOptionsManageCourses.h b/stepmania/src/ScreenOptionsManageCourses.h
index 45f3bba0ea..00ba4ffe0a 100644
--- a/stepmania/src/ScreenOptionsManageCourses.h
+++ b/stepmania/src/ScreenOptionsManageCourses.h
@@ -15,7 +15,7 @@ public:
 	virtual void Init();
 	
 protected:
-	virtual void MenuSelect( const InputEventPlus &input );
+	virtual void MenuSelect( PlayerNumber pn );
 	void WriteCourse();
 };