Improve instrumentation for debugging race