This cleans up things somewhat and also will allow better hotplugging detection in the future.
Attach a file by drag & drop or click to upload
