Use new helper setup stuff.