Even more changes to debug logging.