Fix warnings when compiling with -Wshadow & clang

Fix a handful of places where parameters shadow fields.