Improve tracing support.