Improve AutoConfigMaker's checks for uninstalled providers.

-------------------------------------
I think this should fix any problems, but you be the judge. I also did some cleanup here and there.