Eliminate a bunch of shadow warnings.