Rework how uplinks work, to better handle manually-added uplinks.