Migrate to defactions that do not require the calling RID to be specified.