Changed header tracing to be better performing.