Fixed shadowing problems in the latest find usages refactoring.