Enable -Wshadow and fix shadowing variables.
5 files changed