work on swap and iter_swap customization points, zip view clean-up