Account for the instrument as well as the instrument.
Minor fix.
Fiddling with the metadata importer.