Dialing back on the error messages

g++-4.7 does not particularly like -Wshadow for our code.