Fix some -Wshadow warnings.

What about 

    #pragma GCC diagnostic warning "-Wshadow"

?