Make `JoinKeys` related changes due to refactor #2016

All 195 tests pass in 12s

    1 files ±0   18 suites ±0 12s ⏱️ -1s
195 tests ±0 195 ✔️ ±0 0 💤 ±0 0 ❌ ±0
369 runs ±0 369 ✔️ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 6b3916d. ± Comparison against earlier commit 8cba826.