Use new Small(Ptr)Set API

This fixes the recent build failures.