Replace Olist with OrderedSet subclass of set
Merge branch 'temp'