Some general usbdmx tidying up, to ensure this gets merged sooner, to make life easier later on