Further tweaks for indices linking tables.