Use a Builder instead of MSet.

It more closely matches what we're doing here.