COMP: Remove shadow variable code problem.