Revert "Three lines into one, and it's still clear." Clearly, I wasn't thinking straight - the join variable needs to be defined before we can use it.

This reverts commit 07cfbce242f11cec1368dbf6a817ec74cb5c5b7f.
0.3.3