Revert "Fixed shadowing problems in the latest find usages refactoring."

This reverts commit 0088a3dab7bc9bb5b4120d19ec46550fea314896.
Revert "Faster find usages with Scala plugin."