Removed shadowing warnings.