[cvs-nhc98] patch applied (hat): Rationalise the arrangement of the tracing runtime system.