Fix shadowed variable warnings.