* Revert part of r56832, if code gets more complicated, it's better to keep it more logical here.
allocations for trace data, avoid some virtual function calls. Only helps a few percentages.