WYIL: minor tweak for sets and maps