Simplify ClasspathModuleProvider a bit