When comparing traces, where multiple classes share the same zone names, the behavior prior to this patch was to auto-select the first matching zone name in the other trace. Instead, find the most correct zone by using filename and line number.