Improved tracing.