Refactor for a bit more generic operation. No functional changes.
Be consistent about joystick references