Revised tracing code.