Adjust for USB now being at index 2 in the drive-type cycle gadget.