Ensure swapping items does not mean an empty item gets into overflow.