Removed the majority of direct imports of mi.instrument.* drivers except where test explicitly tests both egg and class loaders.