move some debug trace support code around to a more sane location