Further updates to auto-swap.