Migration from X-Trace 2.0 to X-Trace 3.0.  Preliminary commit of untested instrumentation