Rework join query building for association joins

An association join doesn't require an `on` following the `join`. Instead
of combining in the keyword query builder, combine in the merger.