Re #8569. Refactored InstrumentActor to make code clearer.