Some more tracking and logging.