More tracing enhancements.