Making join logic more logical.