Tracing is now within ifdef-endif