Removing more shadow variables.