Comment 2 for bug 1978744

I improved all relevant unit tests to do a basic verification of the file that triggered the warning (if not the exact line number), and I think that's about the best I can do.