Simplify handling of autotest tracing