0.9.15.36: less intrusive step instrumentation