I'm convinced. Unless someone objects, I will remove remove reference `null`ing from the support setter functions.