Rework USB handling.