Cleaned up instrumentation for innerLoop