Close #15425: Eliminate more importlib related traceback noise
5 files changed