diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h
index cf5755604d..41c97fc3b4 100644
--- a/stepmania/src/InputFilter.h
+++ b/stepmania/src/InputFilter.h
@@ -26,12 +26,11 @@ enum InputEventType
 	IET_LEVEL_CHANGED
 };
 
-struct InputEvent : public DeviceInput
+struct InputEvent
 {
 	InputEvent() { type=IET_FIRST_PRESS; };
-	InputEvent( InputDevice d, DeviceButton b, InputEventType t ): DeviceInput(d, b) { type=t; };
-	InputEvent( DeviceInput di, InputEventType t ): DeviceInput(di) { type=t; };
 
+	DeviceInput di;
 	InputEventType type;
 };
 
@@ -62,6 +61,7 @@ public:
 
 private:
 	void CheckButtonChange( ButtonState &bs, DeviceInput di, const RageTimer &now );
+	void ReportButtonChange( const DeviceInput &di, InputEventType t );
 
 	vector<InputEvent> queue;
 	RageMutex *queuemutex;
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 40787e1e12..620c4ec50a 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1381,7 +1381,7 @@ void HandleInputEvents(float fDeltaTime)
 	for( unsigned i=0; i<ieArray.size(); i++ )
 	{
 		InputEventPlus input;
-		input.DeviceI = (DeviceInput)ieArray[i];
+		input.DeviceI = ieArray[i].di;
 		input.type = ieArray[i].type;
 
 		// hack for testing with only one joytick