Fix 'shadow' warnings on GCC