Renaming variables, suppressing bogus PVS warnings