NEVERHOOD: Fix GCC warnings about shadowed variables