Fix map and miniz Wshadow warnings.
Fix various Wshadow warnings.
Fix more Wshadow warnings.