minor changes to short circuit the 'no linkage' case earlier for