Improved item swap.