Fix -Wshadow warnings

Trivial change; I'll merge when it passes moosebuild unless I hear screams.