Missing changes for makelink. Switch to make_ref,self_ref