Make `JoinKeys` related changes due to refactor #1986

All 179 tests pass in 12s

    1 files ±0   17 suites ±0 12s ⏱️ -3s
179 tests ±0 179 ✔️ ±0 0 💤 ±0 0 ❌ ±0
350 runs ±0 350 ✔️ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 16d7585. ± Comparison against earlier commit 8de177a.