Tidied up some more trace statements.