Reorganize the InstrumentedRuntime stuff