Improvements to Tracer splitting code, and also fixed compiler warnings.