Add u_{server,user}_by_ref, (and get rid of duplicate)
Add WHOIS