Fixes to strip-trace.py.