Simplify the `surrogateSet` return value