fix shadow warnings from clang trunk