Adding a bunch of nops around trace calls.
5 before, 2 after (so it's easy to see what goes with what).