Fix legacy technical debt in USB handling (readability and FSM unwanted states).