Fix bogus shadowing.