Fixed query expansion of "from a in arr1 join C b in arr2 ..."

This includes a parser fix I found in a29839f606c4194f26b741e13724e6633783b21d.