Fix some -Wshadow warnings.
Merge pull request #315 from benma/shadow

Fix some -Wshadow warnings.