Start using zipN when possible, add some types