Separate out some of the non-USB changes for easy review.