Fix cross-component joins (not 100% correct, but solves the inline-duplication problem)