More improvements to expression join