An extra test or two.
A shameless hack on set serialization that I need to repent & fix, just
as soon as I figure out how.