Simplified if-tree in extended_trace.cpp