More resolve/join swaps.