[PATCH 0/2] Fixes for CodeQL analysis of MSVC's CL.EXE