Issue #26896: Disambiguate uses of "importer" with "finder".

Thanks to Oren Milman for the patch.