[Sombre]

If you want a cleaner solution I still think No Indy versions of maps are the way to go. Very quick to do new ones. With them you only get indy units through sites, which makes finding indy sites like brigands lair or mermen village or whatever a bit more interesting as well as stopping the AI building indy armies pretty much completely.