Convert to sorted/list compare

This lets us remove some implicit knowledge about the return type being
a set. Now we just return something, sort it, and compare to our sorted
lists. A little saner.