Removed local variable shadows warnings.

4 files changed