Check for variable shadowing

When this code was originally written, all variables were given unique
names, making it unnecessary to check for shadowing.