AVALANCHE: Silent some CppCheck warnings, rename some loop variables