Reduce usage of deprecated SiteLink methods

Focusing on SiteLink related stuff in this patch.