Fix the fallout of removing feature(import_shadowing).
Fix more import_shadowing fallout in collections.
Fix fallout of removing import_shadowing in tests.