Changing simple=untyped to use normal lists/sets/maps