Further simplify tracing
4 files changed