Fix up handling of entry_points to be more general for modules using setuptools iter_entry_points.