Improve log traces to match the right usages