Fix more -Wshadow warnings