Remove zipWithA, fix cyclic dependency