WIP: Port Set.hs over to the new types