Convert resolve_ref+xstrdup to new resolve_refdup function