clang-tidy header warnings sometimes don't disappear after the issue is fixed

i.e. edit the header to fix the issue, save, and re-running code analysis doesn't clear the warning sometimes.

Using the "Clear" command is a workaround. It may only repro in a particular circumstance, not sure yet.

I had fixed this issue previously, but I think my fix didn't work in all cases.
