Eliminate name shadowing.
Remove unused imports.