I know, I've just moved it where it belongs for now. I've been experimenting with a separate InstrumentSession object, but there are other stuff to cleanup first before refactoring is easy.