More TraceEngine format work.