Make `JoinKeys` related changes due to refactor #1377

All 195 tests pass in 11s

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

Results for commit 1bf9112. ± Comparison against earlier commit f35888c.