fixes up instrumentation further to make it less intrusive.