fix more clang++ -Wshadow warnings