I would add this optimization to a different commit, because it has nothing to do with dust logging/debugging, and you don't want to break anything.