Convert some references to Base._link and clean up some code