Make `JoinKeys` related changes due to refactor #2013

All 195 tests pass in 12s

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

Results for commit f35888c. ± Comparison against earlier commit d3dbcf0.