Changed all sets to be constructed through set([...]) instead of {...}