Cleaned up Tracer code a bit.