Improve trace messages.