Don't store TrafficInjections in a separate datastructure!

Was a bad idea to begin with: screwed up MCS's, and made it hard to pretty
print events.

Now store the dp_event in the json trace