more special-casing joins