Moved the JOYSTICK_*_MAPPING enum into JoystickInput where it belongs. Also renamed some local variables.