Add some debugging instrumentation