Fixing issue with ChoiceLoader override and ModuleLoader.load entrypoint.