Simplify tracing (now when issue 7250 is fixed)