Minor cleanup to the libusb plugin