Update to use the common "set_relationship" functions.