changes required for ICFG type generalization in Heros. Now using Lists instead of Sets for Collections whose most common use case is iterating anyway