Moving some code around in the StaffInstrumentEventHandler