Making instrumentation more robust.