Instrument base classes take II