Improve trace formatting somewhat