Clobber -Wshadow warning.
Mark ability to Pism_TEST_USING_VALGRIND as advanced.  Port to 0.6.