Fixes for -Wshadow warnings

We're also going to have to do some ignore_warnings/restore_warnings
trickery before -Wshadow is useful again; my PETSc build has a few
cases of shadowing and Eigen is full of them.

Issue #24