Follow up to the USB refactoring patch: Missed setting pid values correctly.