Fix some -Wshadow warnings.
Merge pull request #307 from benma/develop

Fix some -Wshadow warnings.