Fix (optional) warnings from variable shadowing.