Fix various bugs in tracer integration (bug 593532, r=dmandelin).