Fixed code so BOTH(!) joystick and keyboard works.
(Note: I'm an idiot.)