Improve handling of sets

[huahaiy]

Right now, the sets are handled as maps, i.e. a map of keys to themselves. This will induce non-optimal edits, where a compound set element with slight change will be deleted, then changed element inserted. The correct approach is to try to drill down.