[devel] Eliminate more GCC shadow warnings
7 files changed