Added some more trace logging.