@fncts/io 0.0.21 → 0.0.22

package/_mjs/Stream/api.mjs

@@ -11,55 +11,61 @@ import * as tsplus_module_9 from "@fncts/io/IO/api/sequenceT";
 import * as tsplus_module_10 from "@fncts/io/Channel/api";
 import * as tsplus_module_11 from "@fncts/io/Channel/core-api";
 import * as tsplus_module_12 from "@fncts/base/collection/immutable/Conc/api";
-import * as tsplus_module_13 from "@fncts/io/Channel/api/runScoped";
-import * as tsplus_module_14 from "@fncts/io/IO/api/forkScoped";
-import * as tsplus_module_15 from "@fncts/base/data/Either/constructors";
-import * as tsplus_module_16 from "@fncts/base/collection/immutable/Conc/constructors";
-import * as tsplus_module_17 from "@fncts/base/data/Maybe/destructors";
-import * as tsplus_module_18 from "@fncts/io/Stream/internal/SinkEndReason";
-import * as tsplus_module_19 from "@fncts/io/Fiber/api/join";
-import * as tsplus_module_20 from "@fncts/io/Fiber/api/interrupt";
-import * as tsplus_module_21 from "@fncts/io/IO/api/core-scope";
-import * as tsplus_module_22 from "@fncts/base/data/Cause/api";
-import * as tsplus_module_23 from "@fncts/io/Stream/internal/Take";
-import * as tsplus_module_24 from "@fncts/io/IO/runtime";
-import * as tsplus_module_25 from "@fncts/io/Queue/constructors";
-import * as tsplus_module_26 from "@fncts/io/IO/api/acquireRelease";
-import * as tsplus_module_27 from "@fncts/io/IO/api/acquireReleaseExit";
-import * as tsplus_module_28 from "@fncts/base/collection/immutable/Conc/api/replicate";
-import * as tsplus_module_29 from "@fncts/io/Hub/constructors";
-import * as tsplus_module_30 from "@fncts/base/data/Exit/api";
-import * as tsplus_module_31 from "@fncts/io/Future/api";
-import * as tsplus_module_32 from "@fncts/io/Future/constructors";
-import * as tsplus_module_33 from "@fncts/base/data/Maybe/api";
-import * as tsplus_module_34 from "@fncts/base/collection/Iterable/constructors";
-import * as tsplus_module_35 from "@fncts/base/data/Exit/constructors";
-import * as tsplus_module_36 from "@fncts/io/Stream/internal/DebounceState";
-import * as tsplus_module_37 from "@fncts/io/Clock/api";
-import * as tsplus_module_38 from "@fncts/base/collection/immutable/HashMap/api";
-import * as tsplus_module_39 from "@fncts/io/TSemaphore/api";
-import * as tsplus_module_40 from "@fncts/io/TSemaphore/constructors";
-import * as tsplus_module_41 from "@fncts/io/STM/api";
-import * as tsplus_module_42 from "@fncts/io/Sink/api";
-import * as tsplus_module_43 from "@fncts/base/data/Predicate/api";
-import * as tsplus_module_44 from "@fncts/io/Fiber/api/poll";
-import * as tsplus_module_45 from "@fncts/io/IO/api/environment";
-import * as tsplus_module_46 from "@fncts/io/collection/immutable/Conc/findIO";
-import * as tsplus_module_47 from "@fncts/base/data/Exit/definition";
-import * as tsplus_module_48 from "@fncts/io/Stream/internal/Pull";
-import * as tsplus_module_49 from "@fncts/io/Channel/api/interruptWhen";
-import * as tsplus_module_50 from "@fncts/io/Channel/api/mapOutIOC";
-import * as tsplus_module_51 from "@fncts/io/Channel/api/mergeMap";
-import * as tsplus_module_52 from "@fncts/io/Channel/internal/MergeDecision";
-import * as tsplus_module_53 from "@fncts/io/Channel/api/mergeWith";
-import * as tsplus_module_54 from "@fncts/io/Layer/MemoMap";
-import * as tsplus_module_55 from "@fncts/io/Layer/api";
-import * as tsplus_module_56 from "@fncts/io/Channel/api/runDrain";
-import * as tsplus_module_57 from "@fncts/base/data/exceptions";
-import * as tsplus_module_58 from "@fncts/io/Channel/api/toPull";
+import * as tsplus_module_13 from "@fncts/io/Ref/api/set";
+import * as tsplus_module_14 from "@fncts/io/Ref/api/get";
+import * as tsplus_module_15 from "@fncts/io/Ref/api/modify";
+import * as tsplus_module_16 from "@fncts/io/Channel/api/runScoped";
+import * as tsplus_module_17 from "@fncts/io/IO/api/forkScoped";
+import * as tsplus_module_18 from "@fncts/base/data/Either/constructors";
+import * as tsplus_module_19 from "@fncts/base/collection/immutable/Conc/constructors";
+import * as tsplus_module_20 from "@fncts/base/data/Maybe/destructors";
+import * as tsplus_module_21 from "@fncts/io/Stream/internal/SinkEndReason";
+import * as tsplus_module_22 from "@fncts/io/Fiber/api/join";
+import * as tsplus_module_23 from "@fncts/io/Fiber/api/interrupt";
+import * as tsplus_module_24 from "@fncts/io/IO/api/core-scope";
+import * as tsplus_module_25 from "@fncts/base/data/Cause/api";
+import * as tsplus_module_26 from "@fncts/io/Stream/internal/Take";
+import * as tsplus_module_27 from "@fncts/io/Queue/api/operations";
+import * as tsplus_module_28 from "@fncts/io/IO/runtime";
+import * as tsplus_module_29 from "@fncts/io/Queue/constructors";
+import * as tsplus_module_30 from "@fncts/io/IO/api/acquireRelease";
+import * as tsplus_module_31 from "@fncts/io/IO/api/acquireReleaseExit";
+import * as tsplus_module_32 from "@fncts/io/IO/api/fork";
+import * as tsplus_module_33 from "@fncts/io/Hub/api";
+import * as tsplus_module_34 from "@fncts/base/collection/immutable/Conc/api/replicate";
+import * as tsplus_module_35 from "@fncts/base/data/Exit/api";
+import * as tsplus_module_36 from "@fncts/io/Future/api";
+import * as tsplus_module_37 from "@fncts/io/Future/constructors";
+import * as tsplus_module_38 from "@fncts/base/data/Maybe/api";
+import * as tsplus_module_39 from "@fncts/base/collection/Iterable/constructors";
+import * as tsplus_module_40 from "@fncts/base/data/Exit/constructors";
+import * as tsplus_module_41 from "@fncts/io/Stream/internal/DebounceState";
+import * as tsplus_module_42 from "@fncts/io/Clock/api";
+import * as tsplus_module_43 from "@fncts/base/collection/immutable/HashMap/api";
+import * as tsplus_module_44 from "@fncts/io/TSemaphore/api";
+import * as tsplus_module_45 from "@fncts/io/TSemaphore/constructors";
+import * as tsplus_module_46 from "@fncts/io/STM/api";
+import * as tsplus_module_47 from "@fncts/io/Sink/api";
+import * as tsplus_module_48 from "@fncts/base/data/Predicate/api";
+import * as tsplus_module_49 from "@fncts/io/Fiber/api/poll";
+import * as tsplus_module_50 from "@fncts/io/IO/api/environment";
+import * as tsplus_module_51 from "@fncts/io/collection/immutable/Conc/findIO";
+import * as tsplus_module_52 from "@fncts/base/data/Exit/definition";
+import * as tsplus_module_53 from "@fncts/io/Stream/internal/Pull";
+import * as tsplus_module_54 from "@fncts/io/Queue/api/takeBetween";
+import * as tsplus_module_55 from "@fncts/io/Channel/api/interruptWhen";
+import * as tsplus_module_56 from "@fncts/io/Channel/api/mapOutConcurrentIO";
+import * as tsplus_module_57 from "@fncts/io/Channel/api/mergeMap";
+import * as tsplus_module_58 from "@fncts/io/Channel/internal/MergeDecision";
+import * as tsplus_module_59 from "@fncts/io/Channel/api/mergeWith";
+import * as tsplus_module_60 from "@fncts/io/Layer/MemoMap";
+import * as tsplus_module_61 from "@fncts/io/Layer/api";
+import * as tsplus_module_62 from "@fncts/io/Channel/api/runDrain";
+import * as tsplus_module_63 from "@fncts/base/data/exceptions";
+import * as tsplus_module_64 from "@fncts/io/Channel/api/toPull";
 export const aggregateAsyncWithin = aggregateAsyncWithin_1;
 export const aggregateAsyncWithinEither = aggregateAsyncWithinEither_1;
-export const apSecond = apSecond_1;
+export const zipRight = zipRight_1;
 export const asyncInterrupt = asyncInterrupt_1;
 export const asyncMaybe = asyncMaybe_1;
 export const broadcastedQueues = broadcastedQueues_1;
@@ -111,7 +117,7 @@ export const repeatIOMaybe = repeatIOMaybe_1;
 export const repeatIOChunkMaybe = repeatIOChunkMaybe_1;
 export const run = run_1;
 export const runForeachScoped = runForeachScoped_1;
-export const runIntoElementsScoped = runIntoElementsScoped_1;
+export const runIntoElementsScoped_ = runIntoElementsScoped_1;
 export const runIntoQueueScoped = runIntoQueueScoped_1;
 export const runIntoHubScoped = runIntoHubScoped_1;
 export const runScoped = runScoped_1;
@@ -138,7 +144,6 @@ import { ScheduleEnd, UpstreamEnd } from "./internal/SinkEndReason.mjs";
  *
  * @tsplus getter fncts.io.Stream absolve
  */
-
 export function absolve(self, __tsplusTrace) {
   return mapIO_1(either => tsplus_module_1.fromEither(() => either, __tsplusTrace), __tsplusTrace)(self);
 }
@@ -156,7 +161,6 @@ export function absolve(self, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream aggregateAsync
  */
-
 export function aggregateAsync(sink, __tsplusTrace) {
   return stream => {
     return aggregateAsyncWithin_1(sink, tsplus_module_2.forever, __tsplusTrace)(stream);
@@ -167,7 +171,6 @@ export function aggregateAsync(sink, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream aggregateAsyncWithin
  */
-
 function aggregateAsyncWithin_1(sink, schedule, __tsplusTrace) {
   return stream => {
     return filterMap_1(cb => tsplus_module_4.match(() => tsplus_module_3.nothing(), tsplus_module_3.just)(cb), __tsplusTrace)(aggregateAsyncWithinEither_1(sink, schedule, __tsplusTrace)(stream));
@@ -187,60 +190,51 @@ function aggregateAsyncWithin_1(sink, schedule, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream aggregateAsyncWithinEither
  */
-
-
 function aggregateAsyncWithinEither_1(sink, schedule, __tsplusTrace) {
   return stream => {
     const deps = tsplus_module_9.sequenceT(tsplus_module_5.make(), tsplus_module_6.make(() => new ScheduleEnd(), __tsplusTrace), tsplus_module_6.make(() => tsplus_module_7.empty(), __tsplusTrace), tsplus_module_8.driver(schedule, __tsplusTrace), tsplus_module_6.make(() => false, __tsplusTrace));
     return flatMap_1(([handoff, sinkEndReason, sinkLeftovers, scheduleDriver, consumed]) => {
-      const handoffProducer = tsplus_module_10.readWithCause(_in => tsplus_module_11.apSecond(handoffProducer)(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.emit(_in))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff)), _ => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.end(new UpstreamEnd()))(handoff)));
+      const handoffProducer = tsplus_module_10.readWithCause(_in => tsplus_module_11.zipRight(handoffProducer)(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.emit(_in))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff)), _ => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.end(new UpstreamEnd()))(handoff)));
       const handoffConsumer = tsplus_module_10.unwrap(() => tsplus_module_1.flatMap(leftovers => {
         if (tsplus_module_12.isNonEmpty(leftovers)) {
-          return tsplus_module_1.apSecond(tsplus_module_1.succeedNow(tsplus_module_11.apSecond(handoffConsumer)(tsplus_module_10.writeNow(leftovers)), __tsplusTrace), __tsplusTrace)(consumed.set(true, __tsplusTrace));
+          return tsplus_module_1.zipRight(tsplus_module_1.succeedNow(tsplus_module_11.zipRight(handoffConsumer)(tsplus_module_10.writeNow(leftovers)), __tsplusTrace), __tsplusTrace)(tsplus_module_13.set(true, __tsplusTrace)(consumed));
         } else {
           return tsplus_module_1.map(signal => tsplus_module_5.matchSignal({
             Emit: ({
               els
-            }) => tsplus_module_11.apSecond(handoffConsumer)(tsplus_module_11.apSecond(tsplus_module_10.writeNow(els))(tsplus_module_10.fromIO(() => consumed.set(true, __tsplusTrace)))),
+            }) => tsplus_module_11.zipRight(handoffConsumer)(tsplus_module_11.zipRight(tsplus_module_10.writeNow(els))(tsplus_module_10.fromIO(() => tsplus_module_13.set(true, __tsplusTrace)(consumed)))),
             Halt: ({
               error
             }) => tsplus_module_11.failCause(() => error),
             End: ({
               reason
             }) => {
-              if (reason._tag === "ScheduleEnd"
-              /* SinkEndReasonTag.ScheduleEnd */
-              ) {
-                return tsplus_module_10.unwrap(() => tsplus_module_1.map(p => p ? tsplus_module_10.fromIO(() => sinkEndReason.set(new ScheduleEnd(), __tsplusTrace)) : tsplus_module_11.apSecond(handoffConsumer)(tsplus_module_10.fromIO(() => sinkEndReason.set(new ScheduleEnd(), __tsplusTrace))), __tsplusTrace)(consumed.get));
+              if (reason._tag === "ScheduleEnd" /* SinkEndReasonTag.ScheduleEnd */) {
+                return tsplus_module_10.unwrap(() => tsplus_module_1.map(p => p ? tsplus_module_10.fromIO(() => tsplus_module_13.set(new ScheduleEnd(), __tsplusTrace)(sinkEndReason)) : tsplus_module_11.zipRight(handoffConsumer)(tsplus_module_10.fromIO(() => tsplus_module_13.set(new ScheduleEnd(), __tsplusTrace)(sinkEndReason))), __tsplusTrace)(tsplus_module_14.get(consumed, __tsplusTrace)));
               } else {
-                return tsplus_module_10.fromIO(() => sinkEndReason.set(reason, __tsplusTrace));
+                return tsplus_module_10.fromIO(() => tsplus_module_13.set(reason, __tsplusTrace)(sinkEndReason));
               }
             }
           })(signal), __tsplusTrace)(tsplus_module_5.take(handoff));
         }
-      }, __tsplusTrace)(sinkLeftovers.getAndSet(tsplus_module_7.empty(), __tsplusTrace)));
-
+      }, __tsplusTrace)(tsplus_module_15.getAndSet(tsplus_module_7.empty(), __tsplusTrace)(sinkLeftovers)));
       function timeout(lastB, __tsplusTrace) {
         return scheduleDriver.next(lastB, __tsplusTrace);
       }
-
       const scheduledAggregator = (sinkFiber, scheduleFiber) => {
-        const forkSink = tsplus_module_1.apSecond(tsplus_module_14.forkScoped(tsplus_module_13.runScoped(tsplus_module_10.doneCollect(tsplus_module_10.pipeToOrFail(sink.channel)(handoffConsumer))), __tsplusTrace), __tsplusTrace)(consumed.set(false, __tsplusTrace));
-
+        const forkSink = tsplus_module_1.zipRight(tsplus_module_17.forkScoped(tsplus_module_16.runScoped(tsplus_module_10.doneCollect(tsplus_module_10.pipeToOrFail(sink.channel)(handoffConsumer))), __tsplusTrace), __tsplusTrace)(tsplus_module_13.set(false, __tsplusTrace)(consumed));
         function handleSide(leftovers, b, c, __tsplusTrace) {
-          return tsplus_module_10.unwrap(() => tsplus_module_1.apSecond(tsplus_module_1.map(reason => tsplus_module_18.matchSinkEndReason({
+          return tsplus_module_10.unwrap(() => tsplus_module_1.zipRight(tsplus_module_1.map(reason => tsplus_module_21.matchSinkEndReason({
             ScheduleEnd: () => tsplus_module_10.unwrapScoped(() => tsplus_module_1.flatMap(consumed_ => tsplus_module_1.flatMap(sinkFiber => tsplus_module_1.map(scheduleFiber => {
-              const toWrite = tsplus_module_17.match(() => tsplus_module_16.make(tsplus_module_15.right(b)), c => tsplus_module_16.make(tsplus_module_15.right(b), tsplus_module_15.left(c)))(c);
-              return consumed_ ? tsplus_module_11.apSecond(scheduledAggregator(sinkFiber, scheduleFiber))(tsplus_module_10.write(() => toWrite)) : scheduledAggregator(sinkFiber, scheduleFiber);
-            }, __tsplusTrace)(tsplus_module_14.forkScoped(timeout(tsplus_module_3.just(b), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(forkSink), __tsplusTrace)(consumed.get)),
-            UpstreamEnd: () => tsplus_module_10.unwrap(() => tsplus_module_1.map(p => p ? tsplus_module_10.write(() => tsplus_module_16.make(tsplus_module_15.right(b))) : tsplus_module_10.unit, __tsplusTrace)(consumed.get))
-          })(reason), __tsplusTrace)(sinkEndReason.get), __tsplusTrace)(sinkLeftovers.set(tsplus_module_12.flatten(leftovers), __tsplusTrace)));
+              const toWrite = tsplus_module_20.match(() => tsplus_module_19.make(tsplus_module_18.right(b)), c => tsplus_module_19.make(tsplus_module_18.right(b), tsplus_module_18.left(c)))(c);
+              return consumed_ ? tsplus_module_11.zipRight(scheduledAggregator(sinkFiber, scheduleFiber))(tsplus_module_10.write(() => toWrite)) : scheduledAggregator(sinkFiber, scheduleFiber);
+            }, __tsplusTrace)(tsplus_module_17.forkScoped(timeout(tsplus_module_3.just(b), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(forkSink), __tsplusTrace)(tsplus_module_14.get(consumed, __tsplusTrace))),
+            UpstreamEnd: () => tsplus_module_10.unwrap(() => tsplus_module_1.map(p => p ? tsplus_module_10.write(() => tsplus_module_19.make(tsplus_module_18.right(b))) : tsplus_module_10.unit, __tsplusTrace)(tsplus_module_14.get(consumed, __tsplusTrace)))
+          })(reason), __tsplusTrace)(tsplus_module_14.get(sinkEndReason, __tsplusTrace)), __tsplusTrace)(tsplus_module_13.set(tsplus_module_12.flatten(leftovers), __tsplusTrace)(sinkLeftovers)));
         }
-
-        return tsplus_module_10.unwrap(() => tsplus_module_21.raceWith(() => tsplus_module_19.join(scheduleFiber, __tsplusTrace), (sinkExit, scheduleFiber) => tsplus_module_1.apSecond(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_1.fromExit(() => sinkExit, __tsplusTrace)), __tsplusTrace)(tsplus_module_20.interrupt(scheduleFiber, __tsplusTrace)), (scheduleExit, sinkFiber) => tsplus_module_1.matchCauseIO(cause => tsplus_module_4.match(() => tsplus_module_1.apSecond(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_19.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_21.forkDaemon(tsplus_module_5.offer(tsplus_module_5.end(new ScheduleEnd()))(handoff), __tsplusTrace)), cause => tsplus_module_1.apSecond(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_19.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_21.forkDaemon(tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff), __tsplusTrace)))(tsplus_module_22.failureOrCause(cause)), c => tsplus_module_1.apSecond(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.just(c), __tsplusTrace), __tsplusTrace)(tsplus_module_19.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_21.forkDaemon(tsplus_module_5.offer(tsplus_module_5.end(new ScheduleEnd()))(handoff), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fromExit(() => scheduleExit, __tsplusTrace)), __tsplusTrace)(tsplus_module_19.join(sinkFiber, __tsplusTrace)));
+        return tsplus_module_10.unwrap(() => tsplus_module_24.raceWith(() => tsplus_module_22.join(scheduleFiber, __tsplusTrace), (sinkExit, scheduleFiber) => tsplus_module_1.zipRight(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_1.fromExit(() => sinkExit, __tsplusTrace)), __tsplusTrace)(tsplus_module_23.interrupt(scheduleFiber)), (scheduleExit, sinkFiber) => tsplus_module_1.matchCauseIO(cause => tsplus_module_4.match(() => tsplus_module_1.zipRight(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_22.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_24.forkDaemon(tsplus_module_5.offer(tsplus_module_5.end(new ScheduleEnd()))(handoff), __tsplusTrace)), cause => tsplus_module_1.zipRight(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)(tsplus_module_22.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_24.forkDaemon(tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff), __tsplusTrace)))(tsplus_module_25.failureOrCause(cause)), c => tsplus_module_1.zipRight(tsplus_module_1.map(([leftovers, b]) => handleSide(leftovers, b, tsplus_module_3.just(c), __tsplusTrace), __tsplusTrace)(tsplus_module_22.join(sinkFiber, __tsplusTrace)), __tsplusTrace)(tsplus_module_24.forkDaemon(tsplus_module_5.offer(tsplus_module_5.end(new ScheduleEnd()))(handoff), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fromExit(() => scheduleExit, __tsplusTrace)), __tsplusTrace)(tsplus_module_22.join(sinkFiber, __tsplusTrace)));
       };
-
-      return unwrapScoped_1(tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(sinkFiber => tsplus_module_1.map(scheduleFiber => new Stream(scheduledAggregator(sinkFiber, scheduleFiber)), __tsplusTrace)(tsplus_module_14.forkScoped(timeout(tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(tsplus_module_14.forkScoped(tsplus_module_13.runScoped(tsplus_module_10.doneCollect(tsplus_module_10.pipeToOrFail(sink.channel)(handoffConsumer))), __tsplusTrace)), __tsplusTrace)(tsplus_module_14.forkScoped(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(handoffProducer)(stream.channel)), __tsplusTrace)), __tsplusTrace);
+      return unwrapScoped_1(tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(sinkFiber => tsplus_module_1.map(scheduleFiber => new Stream(scheduledAggregator(sinkFiber, scheduleFiber)), __tsplusTrace)(tsplus_module_17.forkScoped(timeout(tsplus_module_3.nothing(), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(tsplus_module_17.forkScoped(tsplus_module_16.runScoped(tsplus_module_10.doneCollect(tsplus_module_10.pipeToOrFail(sink.channel)(handoffConsumer))), __tsplusTrace)), __tsplusTrace)(tsplus_module_17.forkScoped(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(handoffProducer)(stream.channel)), __tsplusTrace)), __tsplusTrace);
     }, __tsplusTrace)(fromIO_1(deps, __tsplusTrace));
   };
 }
@@ -249,11 +243,9 @@ function aggregateAsyncWithinEither_1(sink, schedule, __tsplusTrace) {
  * but keeps only elements from this stream.
  * The `that` stream would be run multiple times, for every element in the `this` stream.
  *
- * @tsplus pipeable fncts.io.Stream apFirst
+ * @tsplus pipeable fncts.io.Stream zipLeft
  */
-
-
-export function apFirst(that, __tsplusTrace) {
+export function zipLeft(that, __tsplusTrace) {
   return stream => {
     return crossWith_1(that, (a, _) => a, __tsplusTrace)(stream);
   };
@@ -263,10 +255,9 @@ export function apFirst(that, __tsplusTrace) {
  * but keeps only elements from the other stream.
  * The `that` stream would be run multiple times, for every element in the `this` stream.
  *
- * @tsplus pipeable fncts.io.Stream apSecond
+ * @tsplus pipeable fncts.io.Stream zipRight
  */
-
-function apSecond_1(that, __tsplusTrace) {
+function zipRight_1(that, __tsplusTrace) {
   return stream => {
     return crossWith_1(that, (_, b) => b, __tsplusTrace)(stream);
   };
@@ -276,8 +267,6 @@ function apSecond_1(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream as
  */
-
-
 export function as(b, __tsplusTrace) {
   return stream => {
     return map_1(() => b(), __tsplusTrace)(stream);
@@ -286,15 +275,14 @@ export function as(b, __tsplusTrace) {
 /**
  * @tsplus static fncts.io.StreamOps asyncInterrupt
  */
-
 function asyncInterrupt_1(register, outputBuffer = 16, __tsplusTrace) {
   return unwrapScoped_1(tsplus_module_1.flatMap(output => tsplus_module_1.flatMap(runtime => tsplus_module_1.map(eitherStream => tsplus_module_4.match(canceler => {
-    const loop = tsplus_module_10.unwrap(() => tsplus_module_1.match(maybeError => tsplus_module_17.match(() => tsplus_module_11.endNow(undefined), tsplus_module_10.failNow)(maybeError), as => tsplus_module_11.apSecond(loop)(tsplus_module_10.writeNow(as)), __tsplusTrace)(tsplus_module_1.flatMap(take => tsplus_module_23.done(take), __tsplusTrace)(output.take)));
+    const loop = tsplus_module_10.unwrap(() => tsplus_module_1.match(maybeError => tsplus_module_20.match(() => tsplus_module_11.endNow(undefined), tsplus_module_10.failNow)(maybeError), as => tsplus_module_11.zipRight(loop)(tsplus_module_10.writeNow(as)), __tsplusTrace)(tsplus_module_1.flatMap(take => tsplus_module_26.done(take), __tsplusTrace)(tsplus_module_27.take(output, __tsplusTrace))));
     return ensuring_1(canceler, __tsplusTrace)(new Stream(loop));
-  }, stream => unwrap_1(tsplus_module_1.as(() => stream, __tsplusTrace)(output.shutdown), __tsplusTrace))(eitherStream), __tsplusTrace)(tsplus_module_1.succeed(() => register((k, cb) => {
-    const effect = tsplus_module_1.flatMap(a => output.offer(a, __tsplusTrace), __tsplusTrace)(tsplus_module_23.fromPull(k));
+  }, stream => unwrap_1(tsplus_module_1.as(() => stream, __tsplusTrace)(tsplus_module_27.shutdown(output, __tsplusTrace)), __tsplusTrace))(eitherStream), __tsplusTrace)(tsplus_module_1.succeed(() => register((k, cb) => {
+    const effect = tsplus_module_1.flatMap(a => tsplus_module_27.offer(a, __tsplusTrace)(output), __tsplusTrace)(tsplus_module_26.fromPull(k));
     return runtime.unsafeRunAsyncWith(effect, cb || constVoid, __tsplusTrace);
-  }), __tsplusTrace)), __tsplusTrace)(tsplus_module_24.runtime(__tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeBounded(outputBuffer, __tsplusTrace), queue => queue.shutdown, __tsplusTrace)), __tsplusTrace);
+  }), __tsplusTrace)), __tsplusTrace)(tsplus_module_28.runtime(__tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeBounded(outputBuffer, __tsplusTrace), queue => tsplus_module_27.shutdown(queue, __tsplusTrace), __tsplusTrace)), __tsplusTrace);
 }
 /**
  * Creates a stream from an asynchronous callback that can be called multiple times.
@@ -304,16 +292,12 @@ function asyncInterrupt_1(register, outputBuffer = 16, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps asyncMaybe
  */
-
-
 function asyncMaybe_1(register, outputBuffer = 16, __tsplusTrace) {
-  return asyncInterrupt_1(k => tsplus_module_17.match(() => tsplus_module_15.left(tsplus_module_1.unit), tsplus_module_15.right)(register(k)), outputBuffer, __tsplusTrace);
+  return asyncInterrupt_1(k => tsplus_module_20.match(() => tsplus_module_18.left(tsplus_module_1.unit), tsplus_module_18.right)(register(k)), outputBuffer, __tsplusTrace);
 }
 /**
  * @tsplus static fncts.io.StreamOps async
  */
-
-
 export function async(register, outputBuffer = 16, __tsplusTrace) {
   return asyncMaybe_1(cb => {
     register(cb);
@@ -323,12 +307,11 @@ export function async(register, outputBuffer = 16, __tsplusTrace) {
 /**
  * @tsplus static fncts.io.StreamOps asyncIO
  */
-
 export function asyncIO(register, outputBuffer = 16, __tsplusTrace) {
   return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.flatMap(output => tsplus_module_1.flatMap(runtime => tsplus_module_1.map(() => {
-    const loop = tsplus_module_10.unwrap(() => tsplus_module_1.matchCauseIO(cause => tsplus_module_1.as(() => tsplus_module_4.match(maybeError => tsplus_module_17.match(() => tsplus_module_11.endNow(undefined), tsplus_module_10.failNow)(maybeError), tsplus_module_11.failCauseNow)(tsplus_module_22.failureOrCause(cause)), __tsplusTrace)(output.shutdown), as => tsplus_module_1.succeed(() => tsplus_module_11.apSecond(loop)(tsplus_module_10.writeNow(as)), __tsplusTrace), __tsplusTrace)(tsplus_module_1.flatMap(take => tsplus_module_23.done(take), __tsplusTrace)(output.take)));
+    const loop = tsplus_module_10.unwrap(() => tsplus_module_1.matchCauseIO(cause => tsplus_module_1.as(() => tsplus_module_4.match(maybeError => tsplus_module_20.match(() => tsplus_module_11.endNow(undefined), tsplus_module_10.failNow)(maybeError), tsplus_module_11.failCauseNow)(tsplus_module_25.failureOrCause(cause)), __tsplusTrace)(tsplus_module_27.shutdown(output, __tsplusTrace)), as => tsplus_module_1.succeed(() => tsplus_module_11.zipRight(loop)(tsplus_module_10.writeNow(as)), __tsplusTrace), __tsplusTrace)(tsplus_module_1.flatMap(take => tsplus_module_26.done(take), __tsplusTrace)(tsplus_module_27.take(output, __tsplusTrace))));
     return loop;
-  }, __tsplusTrace)(register((k, cb) => runtime.unsafeRunAsyncWith(tsplus_module_1.flatMap(a => output.offer(a, __tsplusTrace), __tsplusTrace)(tsplus_module_23.fromPull(k)), cb || constVoid, __tsplusTrace))), __tsplusTrace)(tsplus_module_24.runtime(__tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeBounded(outputBuffer, __tsplusTrace), _ => _.shutdown, __tsplusTrace))));
+  }, __tsplusTrace)(register((k, cb) => runtime.unsafeRunAsyncWith(tsplus_module_1.flatMap(a => tsplus_module_27.offer(a, __tsplusTrace)(output), __tsplusTrace)(tsplus_module_26.fromPull(k)), cb || constVoid, __tsplusTrace))), __tsplusTrace)(tsplus_module_28.runtime(__tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeBounded(outputBuffer, __tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace))));
 }
 /**
  * Returns a stream whose failure and success channels have been mapped by
@@ -336,7 +319,6 @@ export function asyncIO(register, outputBuffer = 16, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream bimap
  */
-
 export function bimap(f, g, __tsplusTrace) {
   return stream => map_1(g, __tsplusTrace)(mapError_1(f, __tsplusTrace)(stream));
 }
@@ -346,9 +328,8 @@ export function bimap(f, g, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps acquireRelease
  */
-
 export function acquireRelease(acquire, release, __tsplusTrace) {
-  return scoped_1(() => tsplus_module_26.acquireRelease(() => acquire, release, __tsplusTrace), __tsplusTrace);
+  return scoped_1(() => tsplus_module_30.acquireRelease(() => acquire, release, __tsplusTrace), __tsplusTrace);
 }
 /**
  * Creates a stream from a single value that will get cleaned up after the
@@ -356,9 +337,8 @@ export function acquireRelease(acquire, release, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps acquireReleaseExit
  */
-
 export function acquireReleaseExit(acquire, release, __tsplusTrace) {
-  return scoped_1(() => tsplus_module_27.acquireReleaseExit(() => acquire, release, __tsplusTrace), __tsplusTrace);
+  return scoped_1(() => tsplus_module_31.acquireReleaseExit(() => acquire, release, __tsplusTrace), __tsplusTrace);
 }
 /**
  * Fan out the stream, producing a list of streams that have the same elements as this stream.
@@ -367,7 +347,6 @@ export function acquireReleaseExit(acquire, release, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream broadcast
  */
-
 export function broadcast(n, maximumLag, __tsplusTrace) {
   return stream => {
     return tsplus_module_1.map(c => tsplus_module_12.map(hub => flattenTake_1(fromQueueWithShutdown_1(hub), __tsplusTrace))(c), __tsplusTrace)(broadcastedQueues_1(n, maximumLag, __tsplusTrace)(stream));
@@ -380,7 +359,6 @@ export function broadcast(n, maximumLag, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream broadcastDynamic
  */
-
 export function broadcastDynamic(maximumLag, __tsplusTrace) {
   return stream => {
     return tsplus_module_1.map(scoped => flattenTake_1(flatMap_1(fromQueue_1, __tsplusTrace)(scoped_1(() => scoped, __tsplusTrace)), __tsplusTrace), __tsplusTrace)(broadcastedQueuesDynamic_1(maximumLag, __tsplusTrace)(stream));
@@ -394,10 +372,9 @@ export function broadcastDynamic(maximumLag, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream broadcastedQueues
  */
-
 function broadcastedQueues_1(n, maximumLag, __tsplusTrace) {
-  return stream => {
-    return tsplus_module_1.flatMap(hub => tsplus_module_1.flatMap(queues => tsplus_module_1.map(() => queues, __tsplusTrace)(tsplus_module_1.fork(runIntoHubScoped_1(hub, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.sequenceIterable(tsplus_module_28.replicate(n, hub.subscribe), __tsplusTrace)), __tsplusTrace)(tsplus_module_29.makeBounded(maximumLag, __tsplusTrace));
+  return self => {
+    return tsplus_module_1.flatMap(hub => tsplus_module_1.flatMap(queues => tsplus_module_1.map(() => queues, __tsplusTrace)(tsplus_module_32.fork(runIntoHubScoped_1(hub, __tsplusTrace)(self), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.sequenceIterable(tsplus_module_34.replicate(n, tsplus_module_33.subscribe(hub, __tsplusTrace)), __tsplusTrace)), __tsplusTrace)(tsplus_module_33.makeBounded(maximumLag, __tsplusTrace));
   };
 }
 /**
@@ -408,11 +385,9 @@ function broadcastedQueues_1(n, maximumLag, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream broadcastedQueuesDynamic
  */
-
-
 function broadcastedQueuesDynamic_1(maximumLag, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.map(hub => hub.subscribe, __tsplusTrace)(toHub_1(maximumLag, __tsplusTrace)(stream));
+    return tsplus_module_1.map(hub => tsplus_module_33.subscribe(hub, __tsplusTrace), __tsplusTrace)(toHub_1(maximumLag, __tsplusTrace)(stream));
   };
 }
 /**
@@ -421,13 +396,11 @@ function broadcastedQueuesDynamic_1(maximumLag, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream buffer
  */
-
-
 export function buffer(capacity, __tsplusTrace) {
   return stream => {
     const queue = toQueueOfElements_1(capacity, __tsplusTrace)(stream);
     return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(queue => {
-      const process = tsplus_module_11.flatMap(exit => tsplus_module_30.match(cause => tsplus_module_17.match(() => tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow)(tsplus_module_22.flipCauseOption(cause)), value => tsplus_module_11.apSecond(process)(tsplus_module_10.writeNow(tsplus_module_16.single(value))))(exit))(tsplus_module_10.fromIO(() => queue.take));
+      const process = tsplus_module_11.flatMap(exit => tsplus_module_35.match(cause => tsplus_module_20.match(() => tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow)(tsplus_module_25.flipCauseOption(cause)), value => tsplus_module_11.zipRight(process)(tsplus_module_10.writeNow(tsplus_module_19.single(value))))(exit))(tsplus_module_10.fromIO(() => tsplus_module_27.take(queue, __tsplusTrace)));
       return process;
     }, __tsplusTrace)(queue)));
   };
@@ -435,12 +408,11 @@ export function buffer(capacity, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream bufferChunks
  */
-
 export function bufferChunks(capacity, __tsplusTrace) {
   return stream => {
     const queue = toQueue_1(capacity, __tsplusTrace)(stream);
     return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(queue => {
-      const process = tsplus_module_11.flatMap(take => tsplus_module_23.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.apSecond(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => queue.take));
+      const process = tsplus_module_11.flatMap(take => tsplus_module_26.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.zipRight(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => tsplus_module_27.take(queue, __tsplusTrace)));
       return process;
     }, __tsplusTrace)(queue)));
   };
@@ -451,23 +423,19 @@ export function bufferChunks(capacity, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream bufferUnbounded
  */
-
 export function bufferUnbounded(stream, __tsplusTrace) {
   const queue = toQueueUnbounded_1(stream, __tsplusTrace);
   return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(queue => {
-    const process = tsplus_module_11.flatMap(take => tsplus_module_23.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.apSecond(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => queue.take));
+    const process = tsplus_module_11.flatMap(take => tsplus_module_26.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.zipRight(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => tsplus_module_27.take(queue, __tsplusTrace)));
     return process;
   }, __tsplusTrace)(queue)));
 }
-
 function bufferSignalProducer(queue, ref, __tsplusTrace) {
-  const terminate = take => tsplus_module_10.fromIO(() => tsplus_module_1.flatMap(latch => tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(p => tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => void 0, __tsplusTrace)(tsplus_module_31.wait(p, __tsplusTrace)), __tsplusTrace)(ref.set(p, __tsplusTrace)), __tsplusTrace)(queue.offer(tuple(take, p), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.make(__tsplusTrace)), __tsplusTrace)(tsplus_module_31.wait(latch, __tsplusTrace)), __tsplusTrace)(ref.get));
-
-  return tsplus_module_10.readWith(inp => tsplus_module_11.apSecond(bufferSignalProducer(queue, ref, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_1.flatMap(p => tsplus_module_1.flatMap(added => tsplus_module_1.map(() => void 0, __tsplusTrace)(tsplus_module_1.when(() => added, __tsplusTrace)(ref.set(p, __tsplusTrace))), __tsplusTrace)(queue.offer(tuple(tsplus_module_23.chunk(inp), p), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.make(__tsplusTrace)))), e => terminate(tsplus_module_23.fail(e)), () => terminate(tsplus_module_23.end));
+  const terminate = take => tsplus_module_10.fromIO(() => tsplus_module_1.flatMap(latch => tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(p => tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => void 0, __tsplusTrace)(tsplus_module_36.wait(p, __tsplusTrace)), __tsplusTrace)(tsplus_module_13.set(p, __tsplusTrace)(ref)), __tsplusTrace)(tsplus_module_27.offer(tuple(take, p), __tsplusTrace)(queue)), __tsplusTrace)(tsplus_module_37.make(__tsplusTrace)), __tsplusTrace)(tsplus_module_36.wait(latch, __tsplusTrace)), __tsplusTrace)(tsplus_module_14.get(ref, __tsplusTrace)));
+  return tsplus_module_10.readWith(inp => tsplus_module_11.zipRight(bufferSignalProducer(queue, ref, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_1.flatMap(p => tsplus_module_1.flatMap(added => tsplus_module_1.map(() => void 0, __tsplusTrace)(tsplus_module_1.when(() => added, __tsplusTrace)(tsplus_module_13.set(p, __tsplusTrace)(ref))), __tsplusTrace)(tsplus_module_27.offer(tuple(tsplus_module_26.chunk(inp), p), __tsplusTrace)(queue)), __tsplusTrace)(tsplus_module_37.make(__tsplusTrace)))), e => terminate(tsplus_module_26.fail(e)), () => terminate(tsplus_module_26.end));
 }
-
 function bufferSignalConsumer(queue, __tsplusTrace) {
-  const process = tsplus_module_11.flatMap(([take, promise]) => tsplus_module_11.apSecond(tsplus_module_23.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.apSecond(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => tsplus_module_31.succeed_(undefined, __tsplusTrace)(promise))))(tsplus_module_10.fromIO(() => queue.take));
+  const process = tsplus_module_11.flatMap(([take, promise]) => tsplus_module_11.zipRight(tsplus_module_26.match(tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow, value => tsplus_module_11.zipRight(process)(tsplus_module_10.writeNow(value)))(take))(tsplus_module_10.fromIO(() => tsplus_module_36.succeed_(undefined, __tsplusTrace)(promise))))(tsplus_module_10.fromIO(() => tsplus_module_27.take(queue, __tsplusTrace)));
   return process;
 }
 /**
@@ -476,11 +444,9 @@ function bufferSignalConsumer(queue, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream catchAll
  */
-
-
 function catchAll_1(f, __tsplusTrace) {
   return stream => {
-    return catchAllCause_1(cause => tsplus_module_4.match(f, failCauseNow_1)(tsplus_module_22.failureOrCause(cause)), __tsplusTrace)(stream);
+    return catchAllCause_1(cause => tsplus_module_4.match(f, failCauseNow_1)(tsplus_module_25.failureOrCause(cause)), __tsplusTrace)(stream);
   };
 }
 /**
@@ -490,8 +456,6 @@ function catchAll_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream catchAllCause
  */
-
-
 function catchAllCause_1(f, __tsplusTrace) {
   return stream => {
     const channel = tsplus_module_10.catchAllCause(cause => f(cause).channel)(stream.channel);
@@ -504,11 +468,9 @@ function catchAllCause_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream catchJust
  */
-
-
 export function catchJust(pf, __tsplusTrace) {
   return stream => {
-    return catchAll_1(e => tsplus_module_33.getOrElse(() => failNow_1(e, __tsplusTrace))(pf(e)), __tsplusTrace)(stream);
+    return catchAll_1(e => tsplus_module_38.getOrElse(() => failNow_1(e, __tsplusTrace))(pf(e)), __tsplusTrace)(stream);
   };
 }
 /**
@@ -518,10 +480,9 @@ export function catchJust(pf, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream catchJustCause
  */
-
 export function catchJustCause(pf, __tsplusTrace) {
   return stream => {
-    return catchAllCause_1(cause => tsplus_module_33.getOrElse(() => failCauseNow_1(cause, __tsplusTrace))(pf(cause)), __tsplusTrace)(stream);
+    return catchAllCause_1(cause => tsplus_module_38.getOrElse(() => failCauseNow_1(cause, __tsplusTrace))(pf(cause)), __tsplusTrace)(stream);
   };
 }
 /**
@@ -530,7 +491,6 @@ export function catchJustCause(pf, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream flatMap
  */
-
 function flatMap_1(f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.concatMap(as => tsplus_module_12.foldLeft(tsplus_module_10.unit, (s, a) => tsplus_module_11.flatMap(() => a)(s))(tsplus_module_12.map(a => f(a).channel)(as)))(stream.channel));
@@ -541,10 +501,8 @@ function flatMap_1(f, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream chunks
  */
-
-
 function chunks_1(stream, __tsplusTrace) {
-  return mapChunks_1(tsplus_module_16.single, __tsplusTrace)(stream);
+  return mapChunks_1(tsplus_module_19.single, __tsplusTrace)(stream);
 }
 /**
  * Performs the specified stream transformation with the chunk structure of
@@ -552,18 +510,15 @@ function chunks_1(stream, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream chunksWith
  */
-
-
 export function chunksWith(f, __tsplusTrace) {
   return self => {
     return flattenChunks_1(f(chunks_1(self, __tsplusTrace)), __tsplusTrace);
   };
 }
-
 function changesWithWriter(f, last, __tsplusTrace) {
   return tsplus_module_10.readWithCause(chunk => {
-    const [newLast, newChunk] = tsplus_module_12.foldLeft([last, tsplus_module_7.empty()], ([maybeLast, os], o1) => tsplus_module_17.match(() => [tsplus_module_3.just(o1), tsplus_module_12.append(o1)(os)], o => f(o, o1) ? [tsplus_module_3.just(o1), os] : [tsplus_module_3.just(o1), tsplus_module_12.append(o1)(os)])(maybeLast))(chunk);
-    return tsplus_module_11.apSecond(changesWithWriter(f, newLast, __tsplusTrace))(tsplus_module_10.writeNow(newChunk));
+    const [newLast, newChunk] = tsplus_module_12.foldLeft([last, tsplus_module_7.empty()], ([maybeLast, os], o1) => tsplus_module_20.match(() => [tsplus_module_3.just(o1), tsplus_module_12.append(o1)(os)], o => f(o, o1) ? [tsplus_module_3.just(o1), os] : [tsplus_module_3.just(o1), tsplus_module_12.append(o1)(os)])(maybeLast))(chunk);
+    return tsplus_module_11.zipRight(changesWithWriter(f, newLast, __tsplusTrace))(tsplus_module_10.writeNow(newChunk));
   }, tsplus_module_11.failCauseNow, () => tsplus_module_10.unit);
 }
 /**
@@ -573,8 +528,6 @@ function changesWithWriter(f, last, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream changesWith
  */
-
-
 export function changesWith(f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.pipeTo(changesWithWriter(f, tsplus_module_3.nothing(), __tsplusTrace))(stream.channel));
@@ -585,14 +538,12 @@ export function changesWith(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream collectWhile
  */
-
 export function collectWhile(pf, __tsplusTrace) {
   return stream => {
     const loop = tsplus_module_10.readWith(inp => {
       const mapped = tsplus_module_12.collectWhile(pf)(inp);
-
       if (mapped.length === inp.length) {
-        return tsplus_module_11.apSecond(loop)(tsplus_module_10.writeNow(mapped));
+        return tsplus_module_11.zipRight(loop)(tsplus_module_10.writeNow(mapped));
       } else {
         return tsplus_module_10.writeNow(mapped);
       }
@@ -603,23 +554,19 @@ export function collectWhile(pf, __tsplusTrace) {
 /**
  * Effectfully transforms all elements of the stream for as long as the specified partial function is defined.
  */
-
 export function collectWhileIO(stream, pf, __tsplusTrace) {
-  return new Stream(tsplus_module_10.pipeTo(collectWhileIOLoop(tsplus_module_34.empty()[Symbol.iterator](), pf, __tsplusTrace))(stream.channel));
+  return new Stream(tsplus_module_10.pipeTo(collectWhileIOLoop(tsplus_module_39.empty()[Symbol.iterator](), pf, __tsplusTrace))(stream.channel));
 }
-
 function collectWhileIOLoop(iterator, pf, __tsplusTrace) {
   const next = iterator.next();
-
   if (next.done) {
     return tsplus_module_10.readWithCause(elem => collectWhileIOLoop(elem[Symbol.iterator](), pf, __tsplusTrace), tsplus_module_11.failCauseNow, tsplus_module_11.succeedNow);
   } else {
-    return tsplus_module_10.unwrap(() => tsplus_module_17.match(() => tsplus_module_1.succeedNow(tsplus_module_10.unit, __tsplusTrace), b => tsplus_module_1.map(b => tsplus_module_11.apSecond(collectWhileIOLoop(iterator, pf, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(b))), __tsplusTrace)(b))(pf(next.value)));
+    return tsplus_module_10.unwrap(() => tsplus_module_20.match(() => tsplus_module_1.succeedNow(tsplus_module_10.unit, __tsplusTrace), b => tsplus_module_1.map(b => tsplus_module_11.zipRight(collectWhileIOLoop(iterator, pf, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(b))), __tsplusTrace)(b))(pf(next.value)));
   }
 }
-
 function combineProducer(handoff, latch, __tsplusTrace) {
-  return tsplus_module_11.apSecond(tsplus_module_10.readWithCause(value => tsplus_module_11.apSecond(combineProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_35.succeed(value))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_35.failCause(tsplus_module_22.map(tsplus_module_3.just)(cause)))(handoff)), () => tsplus_module_11.apSecond(combineProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_35.fail(tsplus_module_3.nothing()))(handoff)))))(tsplus_module_10.fromIO(() => tsplus_module_5.take(latch)));
+  return tsplus_module_11.zipRight(tsplus_module_10.readWithCause(value => tsplus_module_11.zipRight(combineProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_40.succeed(value))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_40.failCause(tsplus_module_25.map(tsplus_module_3.just)(cause)))(handoff)), () => tsplus_module_11.zipRight(combineProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_40.fail(tsplus_module_3.nothing()))(handoff)))))(tsplus_module_10.fromIO(() => tsplus_module_5.take(latch)));
 }
 /**
  * Combines the elements from this stream and the specified stream by repeatedly applying the
@@ -631,20 +578,17 @@ function combineProducer(handoff, latch, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream combine
  */
-
-
 export function combine(that, s, f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(([left, right, latchL, latchR]) => {
-      const pullLeft = tsplus_module_1.flatMap(tsplus_module_1.fromExitNow, __tsplusTrace)(tsplus_module_1.apSecond(tsplus_module_5.take(left), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchL)));
-      const pullRight = tsplus_module_1.flatMap(tsplus_module_1.fromExitNow, __tsplusTrace)(tsplus_module_1.apSecond(tsplus_module_5.take(right), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchR)));
+      const pullLeft = tsplus_module_1.flatMap(tsplus_module_1.fromExitNow, __tsplusTrace)(tsplus_module_1.zipRight(tsplus_module_5.take(left), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchL)));
+      const pullRight = tsplus_module_1.flatMap(tsplus_module_1.fromExitNow, __tsplusTrace)(tsplus_module_1.zipRight(tsplus_module_5.take(right), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchR)));
       return unfoldIO_1(s, s => tsplus_module_1.flatMap(exit => tsplus_module_1.optional(tsplus_module_1.fromExitNow(exit, __tsplusTrace), __tsplusTrace), __tsplusTrace)(f(s, pullLeft, pullRight)), __tsplusTrace).channel;
-    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(latchL => tsplus_module_1.flatMap(latchR => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right, latchL, latchR), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(combineProducer(right, latchR, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(that.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(combineProducer(left, latchL, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(stream.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
+    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(latchL => tsplus_module_1.flatMap(latchR => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right, latchL, latchR), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(combineProducer(right, latchR, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(that.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(combineProducer(left, latchL, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(stream.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
   };
 }
-
 function combineChunksProducer(handoff, latch, __tsplusTrace) {
-  return tsplus_module_11.apSecond(tsplus_module_10.readWithCause(chunk => tsplus_module_11.apSecond(combineChunksProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.chunk(chunk))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.failCause(cause))(handoff)), () => tsplus_module_11.apSecond(combineChunksProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.end)(handoff)))))(tsplus_module_10.fromIO(() => tsplus_module_5.take(latch)));
+  return tsplus_module_11.zipRight(tsplus_module_10.readWithCause(chunk => tsplus_module_11.zipRight(combineChunksProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.chunk(chunk))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.failCause(cause))(handoff)), () => tsplus_module_11.zipRight(combineChunksProducer(handoff, latch, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.end)(handoff)))))(tsplus_module_10.fromIO(() => tsplus_module_5.take(latch)));
 }
 /**
  * Combines the chunks from this stream and the specified stream by repeatedly applying the
@@ -654,15 +598,13 @@ function combineChunksProducer(handoff, latch, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream combineChunks
  */
-
-
 export function combineChunks(that, s, f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(([left, right, latchL, latchR]) => {
-      const pullLeft = tsplus_module_1.flatMap(take => tsplus_module_23.done(take), __tsplusTrace)(tsplus_module_1.apSecond(tsplus_module_5.take(left), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchL)));
-      const pullRight = tsplus_module_1.flatMap(take => tsplus_module_23.done(take), __tsplusTrace)(tsplus_module_1.apSecond(tsplus_module_5.take(right), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchR)));
+      const pullLeft = tsplus_module_1.flatMap(take => tsplus_module_26.done(take), __tsplusTrace)(tsplus_module_1.zipRight(tsplus_module_5.take(left), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchL)));
+      const pullRight = tsplus_module_1.flatMap(take => tsplus_module_26.done(take), __tsplusTrace)(tsplus_module_1.zipRight(tsplus_module_5.take(right), __tsplusTrace)(tsplus_module_5.offer(undefined)(latchR)));
       return unfoldChunkIO_1(s, s => tsplus_module_1.flatMap(exit => tsplus_module_1.optional(tsplus_module_1.fromExit(() => exit, __tsplusTrace), __tsplusTrace), __tsplusTrace)(f(s, pullLeft, pullRight)), __tsplusTrace).channel;
-    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(latchL => tsplus_module_1.flatMap(latchR => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right, latchL, latchR), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(combineChunksProducer(right, latchR, __tsplusTrace))(that.channel)), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(combineChunksProducer(left, latchL, __tsplusTrace))(stream.channel)), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
+    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(latchL => tsplus_module_1.flatMap(latchR => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right, latchL, latchR), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(combineChunksProducer(right, latchR, __tsplusTrace))(that.channel)), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(combineChunksProducer(left, latchL, __tsplusTrace))(stream.channel)), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
   };
 }
 /**
@@ -671,10 +613,9 @@ export function combineChunks(that, s, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream concat
  */
-
 function concat_1(that, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_11.apSecond(that.channel)(stream.channel));
+    return new Stream(tsplus_module_11.zipRight(that.channel)(stream.channel));
   };
 }
 /**
@@ -683,8 +624,6 @@ function concat_1(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream cross
  */
-
-
 export function cross(that, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.concatMap(as => tsplus_module_10.mapOut(bs => tsplus_module_12.flatMap(a => tsplus_module_12.map(b => tuple(a, b))(bs))(as))(that.channel))(stream.channel));
@@ -697,7 +636,6 @@ export function cross(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream crossWith
  */
-
 function crossWith_1(fb, f, __tsplusTrace) {
   return fa => {
     return flatMap_1(a => map_1(b => f(a, b), __tsplusTrace)(fb), __tsplusTrace)(fa);
@@ -709,8 +647,6 @@ function crossWith_1(fb, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream contramapEnvironment
  */
-
-
 export function contramapEnvironment(f, __tsplusTrace) {
   return ra => {
     return flatMap_1(r0 => provideEnvironment_1(f(r0), __tsplusTrace)(ra), __tsplusTrace)(environment_1(__tsplusTrace));
@@ -719,18 +655,15 @@ export function contramapEnvironment(f, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream debounce
  */
-
 export function debounce(duration, __tsplusTrace) {
   return stream => {
-    return unwrap_1(tsplus_module_21.transplant(grafter => tsplus_module_1.map(handoff => {
+    return unwrap_1(tsplus_module_24.transplant(grafter => tsplus_module_1.map(handoff => {
       function enqueue(last, __tsplusTrace) {
-        return tsplus_module_1.map(f => consumer(tsplus_module_36.previous(f), __tsplusTrace), __tsplusTrace)(grafter(tsplus_module_1.fork(tsplus_module_1.as(() => last, __tsplusTrace)(tsplus_module_37.sleep(duration, __tsplusTrace)), __tsplusTrace)));
+        return tsplus_module_1.map(f => consumer(tsplus_module_41.previous(f), __tsplusTrace), __tsplusTrace)(grafter(tsplus_module_32.fork(tsplus_module_1.as(() => last, __tsplusTrace)(tsplus_module_42.sleep(duration, __tsplusTrace)), __tsplusTrace)));
       }
-
-      const producer = tsplus_module_10.readWithCause(inp => tsplus_module_17.match(() => producer, last => tsplus_module_11.apSecond(producer)(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.emit(tsplus_module_16.single(last)))(handoff))))(tsplus_module_12.last(inp)), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff)), () => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.end(new UpstreamEnd()))(handoff)));
-
+      const producer = tsplus_module_10.readWithCause(inp => tsplus_module_20.match(() => producer, last => tsplus_module_11.zipRight(producer)(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.emit(tsplus_module_19.single(last)))(handoff))))(tsplus_module_12.last(inp)), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.halt(cause))(handoff)), () => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_5.end(new UpstreamEnd()))(handoff)));
       function consumer(state, __tsplusTrace) {
-        return tsplus_module_10.unwrap(() => tsplus_module_36.match({
+        return tsplus_module_10.unwrap(() => tsplus_module_41.match({
           NotStarted: () => tsplus_module_1.map(signal => tsplus_module_5.matchSignal({
             Emit: ({
               els
@@ -750,36 +683,32 @@ export function debounce(duration, __tsplusTrace) {
               error
             }) => tsplus_module_11.failCauseNow(error),
             End: () => tsplus_module_10.unit
-          })(signal), __tsplusTrace)(tsplus_module_19.join(fiber, __tsplusTrace)),
+          })(signal), __tsplusTrace)(tsplus_module_22.join(fiber, __tsplusTrace)),
           Previous: ({
             fiber
-          }) => tsplus_module_21.raceWith(() => tsplus_module_5.take(handoff), (ex, current) => tsplus_module_30.match(cause => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(cause), __tsplusTrace)(tsplus_module_20.interrupt(current, __tsplusTrace)), chunk => tsplus_module_1.succeedNow(tsplus_module_11.apSecond(consumer(tsplus_module_36.current(current), __tsplusTrace))(tsplus_module_10.writeNow(chunk)), __tsplusTrace))(ex), (ex, previous) => tsplus_module_30.match(cause => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(cause), __tsplusTrace)(tsplus_module_20.interrupt(previous, __tsplusTrace)), signal => tsplus_module_5.matchSignal({
+          }) => tsplus_module_24.raceWith(() => tsplus_module_5.take(handoff), (ex, current) => tsplus_module_35.match(cause => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(cause), __tsplusTrace)(tsplus_module_23.interrupt(current)), chunk => tsplus_module_1.succeedNow(tsplus_module_11.zipRight(consumer(tsplus_module_41.current(current), __tsplusTrace))(tsplus_module_10.writeNow(chunk)), __tsplusTrace))(ex), (ex, previous) => tsplus_module_35.match(cause => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(cause), __tsplusTrace)(tsplus_module_23.interrupt(previous)), signal => tsplus_module_5.matchSignal({
             Emit: ({
               els
-            }) => tsplus_module_1.apSecond(enqueue(els, __tsplusTrace), __tsplusTrace)(tsplus_module_20.interrupt(previous, __tsplusTrace)),
+            }) => tsplus_module_1.zipRight(enqueue(els, __tsplusTrace), __tsplusTrace)(tsplus_module_23.interrupt(previous)),
             Halt: ({
               error
-            }) => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(error), __tsplusTrace)(tsplus_module_20.interrupt(previous, __tsplusTrace)),
-            End: () => tsplus_module_1.map(chunk => tsplus_module_11.apSecond(tsplus_module_10.unit)(tsplus_module_10.writeNow(chunk)), __tsplusTrace)(tsplus_module_19.join(previous, __tsplusTrace))
-          })(signal))(ex), __tsplusTrace)(tsplus_module_19.join(fiber, __tsplusTrace))
+            }) => tsplus_module_1.as(() => tsplus_module_11.failCauseNow(error), __tsplusTrace)(tsplus_module_23.interrupt(previous)),
+            End: () => tsplus_module_1.map(chunk => tsplus_module_11.zipRight(tsplus_module_10.unit)(tsplus_module_10.writeNow(chunk)), __tsplusTrace)(tsplus_module_22.join(previous, __tsplusTrace))
+          })(signal))(ex), __tsplusTrace)(tsplus_module_22.join(fiber, __tsplusTrace))
         })(state));
       }
-
-      return apSecond_1(new Stream(consumer(tsplus_module_36.notStarted, __tsplusTrace)), __tsplusTrace)(scoped_1(() => tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(producer)(stream.channel)), __tsplusTrace), __tsplusTrace));
+      return zipRight_1(new Stream(consumer(tsplus_module_41.notStarted, __tsplusTrace)), __tsplusTrace)(scoped_1(() => tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(producer)(stream.channel)), __tsplusTrace), __tsplusTrace));
     }, __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace), __tsplusTrace);
   };
 }
-
 function defaultIfEmptyWriter(fb, __tsplusTrace) {
-  return tsplus_module_10.readWith(i => tsplus_module_12.isEmpty(i) ? defaultIfEmptyWriter(fb, __tsplusTrace) : tsplus_module_11.apSecond(tsplus_module_10.id())(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => fb.channel);
+  return tsplus_module_10.readWith(i => tsplus_module_12.isEmpty(i) ? defaultIfEmptyWriter(fb, __tsplusTrace) : tsplus_module_11.zipRight(tsplus_module_10.id())(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => fb.channel);
 }
 /**
  * Switches to the provided stream in case this one is empty.
  *
  * @tsplus pipeable fncts.io.Stream defaultIfEmpty
  */
-
-
 export function defaultIfEmpty(fb, __tsplusTrace) {
   return fa => {
     return new Stream(tsplus_module_10.pipeTo(defaultIfEmptyWriter(fb, __tsplusTrace))(fa.channel));
@@ -792,13 +721,12 @@ export function defaultIfEmpty(fb, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream distributedWith
  */
-
 export function distributedWith(n, maximumLag, decide, __tsplusTrace) {
   return self => {
     return tsplus_module_1.flatMap(p => tsplus_module_1.flatMap(next => tsplus_module_1.flatMap(entries => {
-      const [mappings, queues] = tsplus_module_12.foldRight([tsplus_module_38.makeDefault(), tsplus_module_7.empty()], ([mapping, queue], [mappings, queues]) => [tsplus_module_38.set(mapping[0], mapping[1])(mappings), tsplus_module_12.append(queue)(queues)])(entries);
-      return tsplus_module_1.as(() => queues, __tsplusTrace)(tsplus_module_31.succeed_(a => tsplus_module_1.map(f => key => f(tsplus_module_33.toUndefined(tsplus_module_38.get(key)(mappings))), __tsplusTrace)(decide(a)), __tsplusTrace)(p));
-    }, __tsplusTrace)(tsplus_module_1.sequenceIterable(tsplus_module_12.map(id => tsplus_module_1.map(([key, queue]) => [[key, id], queue], __tsplusTrace)(next))(tsplus_module_16.range(0, n)), __tsplusTrace)), __tsplusTrace)(distributedWithDynamic_1(maximumLag, a => tsplus_module_1.flatMap(f => f(a), __tsplusTrace)(tsplus_module_31.wait(p, __tsplusTrace)), () => tsplus_module_1.unit, __tsplusTrace)(self)), __tsplusTrace)(tsplus_module_32.make(__tsplusTrace));
+      const [mappings, queues] = tsplus_module_12.foldRight([tsplus_module_43.empty(), tsplus_module_7.empty()], ([mapping, queue], [mappings, queues]) => [tsplus_module_43.set(mapping[0], mapping[1])(mappings), tsplus_module_12.append(queue)(queues)])(entries);
+      return tsplus_module_1.as(() => queues, __tsplusTrace)(tsplus_module_36.succeed_(a => tsplus_module_1.map(f => key => f(tsplus_module_38.toUndefined(tsplus_module_43.get(key)(mappings))), __tsplusTrace)(decide(a)), __tsplusTrace)(p));
+    }, __tsplusTrace)(tsplus_module_1.sequenceIterable(tsplus_module_12.map(id => tsplus_module_1.map(([key, queue]) => [[key, id], queue], __tsplusTrace)(next))(tsplus_module_19.range(0, n)), __tsplusTrace)), __tsplusTrace)(distributedWithDynamic_1(maximumLag, a => tsplus_module_1.flatMap(f => f(a), __tsplusTrace)(tsplus_module_36.wait(p, __tsplusTrace)), () => tsplus_module_1.unit, __tsplusTrace)(self)), __tsplusTrace)(tsplus_module_37.make(__tsplusTrace));
   };
 }
 /**
@@ -811,25 +739,22 @@ export function distributedWith(n, maximumLag, decide, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream distributedWithDynamic
  */
-
 function distributedWithDynamic_1(maximumLag, decide, done = () => tsplus_module_1.unit, __tsplusTrace) {
   return self => {
-    const offer = queuesRef => a => tsplus_module_1.flatMap(shouldProcess => tsplus_module_1.flatMap(queues => tsplus_module_1.flatMap(ids => tsplus_module_12.isNonEmpty(ids) ? queuesRef.update(map => tsplus_module_38.removeMany(ids)(map), __tsplusTrace) : tsplus_module_1.unit, __tsplusTrace)(tsplus_module_1.foldLeft(queues, tsplus_module_7.empty(), (b, [id, queue]) => {
+    const offer = queuesRef => a => tsplus_module_1.flatMap(shouldProcess => tsplus_module_1.flatMap(queues => tsplus_module_1.flatMap(ids => tsplus_module_12.isNonEmpty(ids) ? tsplus_module_15.update(map => tsplus_module_43.removeMany(ids)(map), __tsplusTrace)(queuesRef) : tsplus_module_1.unit, __tsplusTrace)(tsplus_module_1.foldLeft(queues, tsplus_module_7.empty(), (b, [id, queue]) => {
       if (shouldProcess(id)) {
-        return tsplus_module_1.matchCauseIO(c => tsplus_module_22.interrupted(c) ? tsplus_module_1.succeedNow(tsplus_module_12.append(id)(b), __tsplusTrace) : tsplus_module_1.failCauseNow(c, __tsplusTrace), () => tsplus_module_1.succeedNow(b, __tsplusTrace), __tsplusTrace)(queue.offer(tsplus_module_35.succeed(a), __tsplusTrace));
+        return tsplus_module_1.matchCauseIO(c => tsplus_module_25.interrupted(c) ? tsplus_module_1.succeedNow(tsplus_module_12.append(id)(b), __tsplusTrace) : tsplus_module_1.failCauseNow(c, __tsplusTrace), () => tsplus_module_1.succeedNow(b, __tsplusTrace), __tsplusTrace)(tsplus_module_27.offer(tsplus_module_40.succeed(a), __tsplusTrace)(queue));
       } else {
         return tsplus_module_1.succeedNow(b, __tsplusTrace);
       }
-    }, __tsplusTrace)), __tsplusTrace)(queuesRef.get), __tsplusTrace)(decide(a));
-
+    }, __tsplusTrace)), __tsplusTrace)(tsplus_module_14.get(queuesRef, __tsplusTrace)), __tsplusTrace)(decide(a));
     return tsplus_module_1.flatMap(queuesRef => tsplus_module_1.map(add => add, __tsplusTrace)(tsplus_module_1.flatMap(queuesLock => tsplus_module_1.flatMap(newQueue => {
-      const finalize = endTake => tsplus_module_39.withPermit(queuesLock, __tsplusTrace)(tsplus_module_1.asUnit(tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(queues => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => void 0, __tsplusTrace)(done(endTake)), __tsplusTrace)(tsplus_module_1.foreach(queues, queue => tsplus_module_1.catchJustCause(c => tsplus_module_22.interrupted(c) ? tsplus_module_3.just(tsplus_module_1.unit) : tsplus_module_3.nothing(), __tsplusTrace)(queue.offer(endTake, __tsplusTrace)), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.map(map => tsplus_module_38.values(map), __tsplusTrace)(queuesRef.get)), __tsplusTrace)(newQueue.set(tsplus_module_1.flatMap(queue => tsplus_module_1.flatMap(() => {
+      const finalize = endTake => tsplus_module_44.withPermit(queuesLock, __tsplusTrace)(tsplus_module_1.asUnit(tsplus_module_1.flatMap(() => tsplus_module_1.flatMap(queues => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => void 0, __tsplusTrace)(done(endTake)), __tsplusTrace)(tsplus_module_1.foreach(queues, queue => tsplus_module_1.catchJustCause(c => tsplus_module_25.interrupted(c) ? tsplus_module_3.just(tsplus_module_1.unit) : tsplus_module_3.nothing(), __tsplusTrace)(tsplus_module_27.offer(endTake, __tsplusTrace)(queue)), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.map(map => tsplus_module_43.values(map), __tsplusTrace)(tsplus_module_14.get(queuesRef, __tsplusTrace))), __tsplusTrace)(tsplus_module_13.set(tsplus_module_1.flatMap(queue => tsplus_module_1.flatMap(() => {
         const id = Symbol();
-        return tsplus_module_1.map(() => tuple(id, queue), __tsplusTrace)(queuesRef.update(map => tsplus_module_38.set(id, queue)(map), __tsplusTrace));
-      }, __tsplusTrace)(queue.offer(endTake, __tsplusTrace)), __tsplusTrace)(tsplus_module_25.makeBounded(1, __tsplusTrace)), __tsplusTrace)), __tsplusTrace));
-
-      return tsplus_module_1.map(() => tsplus_module_39.withPermit(queuesLock, __tsplusTrace)(tsplus_module_1.flatten(newQueue.get, __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_1.matchCauseIO(cause => finalize(tsplus_module_35.failCause(tsplus_module_22.map(tsplus_module_3.just)(cause))), () => finalize(tsplus_module_35.fail(tsplus_module_3.nothing())), __tsplusTrace)(runForeachScoped_1(offer(queuesRef), __tsplusTrace)(self)), __tsplusTrace));
-    }, __tsplusTrace)(tsplus_module_6.make(() => tsplus_module_1.flatMap(queue => tsplus_module_1.flatMap(id => tsplus_module_1.map(() => tuple(id, queue), __tsplusTrace)(queuesRef.update(map => tsplus_module_38.set(id, queue)(map), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.succeed(() => Symbol(), __tsplusTrace)), __tsplusTrace)(tsplus_module_25.makeBounded(maximumLag, __tsplusTrace)), __tsplusTrace)), __tsplusTrace)(tsplus_module_41.atomically(tsplus_module_40.make(1, __tsplusTrace), __tsplusTrace))), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_6.make(() => tsplus_module_38.makeDefault(), __tsplusTrace), ref => tsplus_module_1.flatMap(qs => tsplus_module_1.foreach(tsplus_module_38.values(qs), q => q.shutdown, __tsplusTrace), __tsplusTrace)(ref.get), __tsplusTrace));
+        return tsplus_module_1.map(() => tuple(id, queue), __tsplusTrace)(tsplus_module_15.update(map => tsplus_module_43.set(id, queue)(map), __tsplusTrace)(queuesRef));
+      }, __tsplusTrace)(tsplus_module_27.offer(endTake, __tsplusTrace)(queue)), __tsplusTrace)(tsplus_module_29.makeBounded(1, __tsplusTrace)), __tsplusTrace)(newQueue)), __tsplusTrace));
+      return tsplus_module_1.map(() => tsplus_module_44.withPermit(queuesLock, __tsplusTrace)(tsplus_module_1.flatten(tsplus_module_14.get(newQueue, __tsplusTrace), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_1.matchCauseIO(cause => finalize(tsplus_module_40.failCause(tsplus_module_25.map(tsplus_module_3.just)(cause))), () => finalize(tsplus_module_40.fail(tsplus_module_3.nothing())), __tsplusTrace)(runForeachScoped_1(offer(queuesRef), __tsplusTrace)(self)), __tsplusTrace));
+    }, __tsplusTrace)(tsplus_module_6.make(() => tsplus_module_1.flatMap(queue => tsplus_module_1.flatMap(id => tsplus_module_1.map(() => tuple(id, queue), __tsplusTrace)(tsplus_module_15.update(map => tsplus_module_43.set(id, queue)(map), __tsplusTrace)(queuesRef)), __tsplusTrace)(tsplus_module_1.succeed(() => Symbol(), __tsplusTrace)), __tsplusTrace)(tsplus_module_29.makeBounded(maximumLag, __tsplusTrace)), __tsplusTrace)), __tsplusTrace)(tsplus_module_46.atomically(tsplus_module_45.make(1, __tsplusTrace), __tsplusTrace))), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_6.make(() => tsplus_module_43.empty(), __tsplusTrace), ref => tsplus_module_1.flatMap(qs => tsplus_module_1.foreach(tsplus_module_43.values(qs), q => tsplus_module_27.shutdown(q, __tsplusTrace), __tsplusTrace), __tsplusTrace)(tsplus_module_14.get(ref, __tsplusTrace)), __tsplusTrace));
   };
 }
 /**
@@ -838,18 +763,15 @@ function distributedWithDynamic_1(maximumLag, decide, done = () => tsplus_module
  *
  * @tsplus getter fncts.io.Stream drain
  */
-
-
 export function drain(fa, __tsplusTrace) {
   return new Stream(tsplus_module_10.drain(fa.channel));
 }
-
 function dropLoop(r, __tsplusTrace) {
   return tsplus_module_10.readWith(inp => {
     const dropped = tsplus_module_12.drop(r)(inp);
     const leftover = Math.max(0, r - inp.length);
     const more = tsplus_module_12.isEmpty(inp) || leftover > 0;
-    return more ? dropLoop(leftover, __tsplusTrace) : tsplus_module_11.apSecond(tsplus_module_10.id())(tsplus_module_10.write(() => dropped));
+    return more ? dropLoop(leftover, __tsplusTrace) : tsplus_module_11.zipRight(tsplus_module_10.id())(tsplus_module_10.write(() => dropped));
   }, tsplus_module_10.failNow, () => tsplus_module_10.unit);
 }
 /**
@@ -857,8 +779,6 @@ function dropLoop(r, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream drop
  */
-
-
 function drop_1(n, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.pipeTo(dropLoop(n, __tsplusTrace))(stream.channel));
@@ -870,11 +790,9 @@ function drop_1(n, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream dropWhile
  */
-
-
 function dropWhile_1(p, __tsplusTrace) {
   return stream => {
-    return pipeThrough_1(tsplus_module_42.makeDropWhile(p, __tsplusTrace), __tsplusTrace)(stream);
+    return pipeThrough_1(tsplus_module_47.makeDropWhile(p, __tsplusTrace), __tsplusTrace)(stream);
   };
 }
 /**
@@ -883,11 +801,9 @@ function dropWhile_1(p, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream dropUntil
  */
-
-
 export function dropUntil(p, __tsplusTrace) {
   return stream => {
-    return drop_1(1, __tsplusTrace)(dropWhile_1(tsplus_module_43.invert(p), __tsplusTrace)(stream));
+    return drop_1(1, __tsplusTrace)(dropWhile_1(tsplus_module_48.invert(p), __tsplusTrace)(stream));
   };
 }
 /**
@@ -899,19 +815,16 @@ export function dropUntil(p, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream either
  */
-
 export function either(stream, __tsplusTrace) {
-  return catchAll_1(e => succeedNow_1(tsplus_module_15.left(e), __tsplusTrace), __tsplusTrace)(map_1(tsplus_module_15.right, __tsplusTrace)(stream));
+  return catchAll_1(e => succeedNow_1(tsplus_module_18.left(e), __tsplusTrace), __tsplusTrace)(map_1(tsplus_module_18.right, __tsplusTrace)(stream));
 }
 /**
  * @tsplus static fncts.io.StreamOps empty
  */
-
-const empty_1 = /*#__PURE__*/fromChunkNow_1( /*#__PURE__*/tsplus_module_7.empty(), fileName_1 + ":1219:70");
+const empty_1 = /*#__PURE__*/fromChunkNow_1( /*#__PURE__*/tsplus_module_7.empty(), fileName_1 + ":1220:70");
 export const empty = empty_1;
-
 function endWhenWriter(fiber, __tsplusTrace) {
-  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeExit => tsplus_module_17.match(() => tsplus_module_10.readWith(inp => tsplus_module_11.apSecond(endWhenWriter(fiber, __tsplusTrace))(tsplus_module_10.writeNow(inp)), tsplus_module_10.failNow, () => tsplus_module_10.unit), exit => tsplus_module_30.match(tsplus_module_11.failCauseNow, () => tsplus_module_10.unit)(exit))(maybeExit), __tsplusTrace)(tsplus_module_44.poll(fiber, __tsplusTrace)));
+  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeExit => tsplus_module_20.match(() => tsplus_module_10.readWith(inp => tsplus_module_11.zipRight(endWhenWriter(fiber, __tsplusTrace))(tsplus_module_10.writeNow(inp)), tsplus_module_10.failNow, () => tsplus_module_10.unit), exit => tsplus_module_35.match(tsplus_module_11.failCauseNow, () => tsplus_module_10.unit)(exit))(maybeExit), __tsplusTrace)(tsplus_module_49.poll(fiber, __tsplusTrace)));
 }
 /**
  * Halts the evaluation of this stream when the provided IO completes. The given IO
@@ -924,17 +837,14 @@ function endWhenWriter(fiber, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream endWhen
  */
-
-
 export function endWhen(io, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(fiber => tsplus_module_10.pipeTo(endWhenWriter(fiber, __tsplusTrace))(stream.channel), __tsplusTrace)(tsplus_module_14.forkScoped(io, __tsplusTrace))));
+    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(fiber => tsplus_module_10.pipeTo(endWhenWriter(fiber, __tsplusTrace))(stream.channel), __tsplusTrace)(tsplus_module_17.forkScoped(io, __tsplusTrace))));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream ensuring
  */
-
 function ensuring_1(finalizer, __tsplusTrace) {
   return self => {
     return new Stream(tsplus_module_10.ensuring(finalizer)(self.channel));
@@ -943,18 +853,14 @@ function ensuring_1(finalizer, __tsplusTrace) {
 /**
  * @tsplus static fncts.io.StreamOps environment
  */
-
-
 function environment_1(__tsplusTrace) {
-  return fromIO_1(tsplus_module_45.environment(__tsplusTrace), __tsplusTrace);
+  return fromIO_1(tsplus_module_50.environment(__tsplusTrace), __tsplusTrace);
 }
 /**
  * Accesses the environment of the stream.
  *
  * @tsplus static fncts.io.StreamOps environmentWith
  */
-
-
 export function environmentWith(f, __tsplusTrace) {
   return map_1(f, __tsplusTrace)(environment_1(__tsplusTrace));
 }
@@ -963,7 +869,6 @@ export function environmentWith(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps environmentWithIO
  */
-
 export function environmentWithIO(f, __tsplusTrace) {
   return mapIO_1(f, __tsplusTrace)(environment_1(__tsplusTrace));
 }
@@ -972,7 +877,6 @@ export function environmentWithIO(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps environmentWithStream
  */
-
 export function environmentWithStream(f, __tsplusTrace) {
   return flatMap_1(f, __tsplusTrace)(environment_1(__tsplusTrace));
 }
@@ -981,7 +885,6 @@ export function environmentWithStream(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps failNow
  */
-
 function failNow_1(error, __tsplusTrace) {
   return new Stream(tsplus_module_10.failNow(error));
 }
@@ -990,8 +893,6 @@ function failNow_1(error, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps fail
  */
-
-
 export function fail(error, __tsplusTrace) {
   return new Stream(tsplus_module_10.fail(error));
 }
@@ -1000,7 +901,6 @@ export function fail(error, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps failCauseNow
  */
-
 function failCauseNow_1(cause, __tsplusTrace) {
   return fromIO_1(tsplus_module_1.failCauseNow(cause, __tsplusTrace), __tsplusTrace);
 }
@@ -1009,8 +909,6 @@ function failCauseNow_1(cause, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps failCause
  */
-
-
 export function failCause(cause, __tsplusTrace) {
   return fromIO_1(tsplus_module_1.failCause(cause, __tsplusTrace), __tsplusTrace);
 }
@@ -1022,27 +920,22 @@ export function filter(predicate, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream filterIO
  */
-
 export function filterIO(f, __tsplusTrace) {
   return fa => {
-    return new Stream(tsplus_module_10.pipeTo(filterIOLoop(tsplus_module_34.empty()[Symbol.iterator](), f, __tsplusTrace))(fa.channel));
+    return new Stream(tsplus_module_10.pipeTo(filterIOLoop(tsplus_module_39.empty()[Symbol.iterator](), f, __tsplusTrace))(fa.channel));
   };
 }
-
 function filterIOLoop(iterator, f, __tsplusTrace) {
   const next = iterator.next();
-
   if (next.done) {
     return tsplus_module_10.readWithCause(elem => filterIOLoop(elem[Symbol.iterator](), f, __tsplusTrace), tsplus_module_11.failCauseNow, tsplus_module_11.succeedNow);
   } else {
-    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => b ? tsplus_module_11.apSecond(filterIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(next.value))) : filterIOLoop(iterator, f, __tsplusTrace), __tsplusTrace)(f(next.value)));
+    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => b ? tsplus_module_11.zipRight(filterIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(next.value))) : filterIOLoop(iterator, f, __tsplusTrace), __tsplusTrace)(f(next.value)));
   }
 }
 /**
  * @tsplus pipeable fncts.io.Stream filterMap
  */
-
-
 function filterMap_1(f, __tsplusTrace) {
   return fa => {
     return mapChunks_1(chunk => tsplus_module_12.filterMap(f)(chunk), __tsplusTrace)(fa);
@@ -1051,21 +944,17 @@ function filterMap_1(f, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream filterMapIO
  */
-
-
 export function filterMapIO(f, __tsplusTrace) {
   return fa => {
-    return new Stream(tsplus_module_10.pipeTo(filterMapIOLoop(tsplus_module_34.empty()[Symbol.iterator](), f, __tsplusTrace))(fa.channel));
+    return new Stream(tsplus_module_10.pipeTo(filterMapIOLoop(tsplus_module_39.empty()[Symbol.iterator](), f, __tsplusTrace))(fa.channel));
   };
 }
-
 function filterMapIOLoop(iterator, f, __tsplusTrace) {
   const next = iterator.next();
-
   if (next.done) {
     return tsplus_module_10.readWithCause(elem => filterMapIOLoop(elem[Symbol.iterator](), f, __tsplusTrace), tsplus_module_11.failCauseNow, tsplus_module_11.succeedNow);
   } else {
-    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => tsplus_module_17.match(() => filterMapIOLoop(iterator, f, __tsplusTrace), b => tsplus_module_11.apSecond(filterMapIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(b))))(b), __tsplusTrace)(f(next.value)));
+    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => tsplus_module_20.match(() => filterMapIOLoop(iterator, f, __tsplusTrace), b => tsplus_module_11.zipRight(filterMapIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(b))))(b), __tsplusTrace)(f(next.value)));
   }
 }
 /**
@@ -1073,11 +962,9 @@ function filterMapIOLoop(iterator, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream find
  */
-
-
 export function find(p, __tsplusTrace) {
   return stream => {
-    const loop = tsplus_module_10.readWith(inp => tsplus_module_17.match(() => loop, a => tsplus_module_10.writeNow(tsplus_module_16.single(a)))(tsplus_module_12.find(p)(inp)), tsplus_module_10.failNow, () => tsplus_module_10.unit);
+    const loop = tsplus_module_10.readWith(inp => tsplus_module_20.match(() => loop, a => tsplus_module_10.writeNow(tsplus_module_19.single(a)))(tsplus_module_12.find(p)(inp)), tsplus_module_10.failNow, () => tsplus_module_10.unit);
     return new Stream(tsplus_module_10.pipeTo(loop)(stream.channel));
   };
 }
@@ -1086,10 +973,9 @@ export function find(p, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream findIO
  */
-
 export function findIO(f, __tsplusTrace) {
   return stream => {
-    const loop = tsplus_module_10.readWith(inp => tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeA => tsplus_module_17.match(() => loop, a => tsplus_module_10.writeNow(tsplus_module_16.single(a)))(maybeA), __tsplusTrace)(tsplus_module_46.findIO(f, __tsplusTrace)(inp))), tsplus_module_10.failNow, () => tsplus_module_10.unit);
+    const loop = tsplus_module_10.readWith(inp => tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeA => tsplus_module_20.match(() => loop, a => tsplus_module_10.writeNow(tsplus_module_19.single(a)))(maybeA), __tsplusTrace)(tsplus_module_51.findIO(f, __tsplusTrace)(inp))), tsplus_module_10.failNow, () => tsplus_module_10.unit);
     return new Stream(tsplus_module_10.pipeTo(loop)(stream.channel));
   };
 }
@@ -1099,7 +985,6 @@ export function findIO(f, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream flatten
  */
-
 function flatten_1(self, __tsplusTrace) {
   return flatMap_1(identity, __tsplusTrace)(self);
 }
@@ -1110,15 +995,12 @@ function flatten_1(self, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream flattenExitOption
  */
-
-
 function flattenExitOption_1(stream, __tsplusTrace) {
   const processChunk = (chunk, cont) => {
-    const [toEmit, rest] = tsplus_module_12.splitWhere(_ => !tsplus_module_47.isSuccess(_))(chunk);
-    const next = tsplus_module_17.match(() => cont, exit => tsplus_module_30.match(cause => tsplus_module_17.match(() => tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow)(tsplus_module_22.flipCauseOption(cause)), () => tsplus_module_11.endNow(undefined))(exit))(tsplus_module_12.head(rest));
-    return tsplus_module_11.apSecond(next)(tsplus_module_10.writeNow(tsplus_module_12.filterMap(exit => tsplus_module_30.match(() => tsplus_module_3.nothing(), tsplus_module_3.just)(exit))(toEmit)));
+    const [toEmit, rest] = tsplus_module_12.splitWhere(_ => !tsplus_module_52.isSuccess(_))(chunk);
+    const next = tsplus_module_20.match(() => cont, exit => tsplus_module_35.match(cause => tsplus_module_20.match(() => tsplus_module_11.endNow(undefined), tsplus_module_11.failCauseNow)(tsplus_module_25.flipCauseOption(cause)), () => tsplus_module_11.endNow(undefined))(exit))(tsplus_module_12.head(rest));
+    return tsplus_module_11.zipRight(next)(tsplus_module_10.writeNow(tsplus_module_12.filterMap(exit => tsplus_module_35.match(() => tsplus_module_3.nothing(), tsplus_module_3.just)(exit))(toEmit)));
   };
-
   const process = tsplus_module_10.readWithCause(chunk => processChunk(chunk, process), tsplus_module_11.failCauseNow, _ => tsplus_module_11.endNow(undefined));
   return new Stream(tsplus_module_10.pipeTo(process)(stream.channel));
 }
@@ -1127,8 +1009,6 @@ function flattenExitOption_1(stream, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream flattenTake
  */
-
-
 function flattenTake_1(stream, __tsplusTrace) {
   return flattenChunks_1(flattenExitOption_1(map_1(take => take.exit, __tsplusTrace)(stream), __tsplusTrace), __tsplusTrace);
 }
@@ -1138,8 +1018,6 @@ function flattenTake_1(stream, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream flattenChunks
  */
-
-
 function flattenChunks_1(stream, __tsplusTrace) {
   return new Stream(tsplus_module_10.mapOut(c => tsplus_module_12.flatten(c))(stream.channel));
 }
@@ -1148,8 +1026,6 @@ function flattenChunks_1(stream, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream forever
  */
-
-
 function forever_1(stream, __tsplusTrace) {
   return new Stream(tsplus_module_10.repeated(stream.channel));
 }
@@ -1158,8 +1034,6 @@ function forever_1(stream, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps fromChunkNow
  */
-
-
 function fromChunkNow_1(c, __tsplusTrace) {
   return new Stream(tsplus_module_10.defer(() => tsplus_module_12.isEmpty(c) ? tsplus_module_10.unit : tsplus_module_10.writeNow(c)));
 }
@@ -1168,8 +1042,6 @@ function fromChunkNow_1(c, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps fromChunk
  */
-
-
 function fromChunk_1(c, __tsplusTrace) {
   return new Stream(tsplus_module_10.unwrap(() => tsplus_module_1.succeedNow(tsplus_module_10.write(c), __tsplusTrace)));
 }
@@ -1178,18 +1050,14 @@ function fromChunk_1(c, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps scoped
  */
-
-
 function scoped_1(stream, __tsplusTrace) {
-  return new Stream(tsplus_module_10.scoped(() => tsplus_module_1.map(tsplus_module_16.single, __tsplusTrace)(stream())));
+  return new Stream(tsplus_module_10.scoped(() => tsplus_module_1.map(tsplus_module_19.single, __tsplusTrace)(stream())));
 }
 /**
  * Creates a stream from an effect producing a value of type `A`
  *
  * @tsplus static fncts.io.StreamOps fromIO
  */
-
-
 function fromIO_1(fa, __tsplusTrace) {
   return fromIOMaybe_1(tsplus_module_1.mapError(tsplus_module_3.just, __tsplusTrace)(fa), __tsplusTrace);
 }
@@ -1198,65 +1066,52 @@ function fromIO_1(fa, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps fromIOMaybe
  */
-
-
 function fromIOMaybe_1(fa, __tsplusTrace) {
-  return new Stream(tsplus_module_10.unwrap(() => tsplus_module_1.match(maybeError => tsplus_module_17.match(() => tsplus_module_10.unit, tsplus_module_10.failNow)(maybeError), a => tsplus_module_10.writeNow(tsplus_module_16.single(a)), __tsplusTrace)(fa)));
+  return new Stream(tsplus_module_10.unwrap(() => tsplus_module_1.match(maybeError => tsplus_module_20.match(() => tsplus_module_10.unit, tsplus_module_10.failNow)(maybeError), a => tsplus_module_10.writeNow(tsplus_module_19.single(a)), __tsplusTrace)(fa)));
 }
-
 function fromAsyncIterableLoop(iterator, __tsplusTrace) {
   return tsplus_module_10.unwrap(() => tsplus_module_1.async(k => {
-    iterator.next().then(result => result.done ? k(tsplus_module_1.succeedNow(tsplus_module_11.end(() => undefined), __tsplusTrace)) : k(tsplus_module_1.succeedNow(tsplus_module_11.apSecond(fromAsyncIterableLoop(iterator, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(result.value))), __tsplusTrace)));
+    iterator.next().then(result => result.done ? k(tsplus_module_1.succeedNow(tsplus_module_11.end(() => undefined), __tsplusTrace)) : k(tsplus_module_1.succeedNow(tsplus_module_11.zipRight(fromAsyncIterableLoop(iterator, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(result.value))), __tsplusTrace)));
   }));
 }
 /**
  * @tsplus static fncts.io.StreamOps fromAsyncIterable
  */
-
-
 export function fromAsyncIterable(iterable, __tsplusTrace) {
   return new Stream(fromAsyncIterableLoop(iterable[Symbol.asyncIterator](), __tsplusTrace));
 }
 /**
  * @tsplus static fncts.io.StreamOps fromIterable
  */
-
 export function fromIterable(iterable, maxChunkSize = DEFAULT_CHUNK_SIZE, __tsplusTrace) {
   return unwrap_1(tsplus_module_1.succeed(() => {
     const loop = iterator => tsplus_module_10.unwrap(() => tsplus_module_1.succeed(() => {
       let result = iterator.next();
-
       if (result.done) {
         return tsplus_module_10.unit;
       }
-
       if (maxChunkSize === 1) {
-        return tsplus_module_11.apSecond(loop(iterator))(tsplus_module_10.writeNow(tsplus_module_16.single(result.value)));
+        return tsplus_module_11.zipRight(loop(iterator))(tsplus_module_10.writeNow(tsplus_module_19.single(result.value)));
       } else {
         const out = Array(maxChunkSize);
         out[0] = result.value;
         let count = 1;
-
         while (count < maxChunkSize && !(result = iterator.next()).done) {
           out[count] = result.value;
           count++;
         }
-
-        return tsplus_module_11.apSecond(loop(iterator))(tsplus_module_10.writeNow(tsplus_module_16.from(out)));
+        return tsplus_module_11.zipRight(loop(iterator))(tsplus_module_10.writeNow(tsplus_module_19.from(out)));
       }
     }, __tsplusTrace));
-
     return new Stream(loop(iterable[Symbol.iterator]()));
   }, __tsplusTrace), __tsplusTrace);
 }
 /**
  * @tsplus static fncts.io.StreamOps fromIterableSingle
  */
-
 export function fromIterableSingle(iterable, __tsplusTrace) {
   return flatMap_1(iterator => repeatIOMaybe_1(tsplus_module_1.defer(() => {
     const value = iterator.next();
-
     if (value.done) {
       return tsplus_module_1.failNow(tsplus_module_3.nothing(), __tsplusTrace);
     } else {
@@ -1267,7 +1122,6 @@ export function fromIterableSingle(iterable, __tsplusTrace) {
 /**
  * @tsplus static fncts.io.StreamOps fromPull
  */
-
 function fromPull_1(scopedPull, __tsplusTrace) {
   return unwrapScoped_1(tsplus_module_1.map(pull => repeatIOChunkMaybe_1(pull, __tsplusTrace), __tsplusTrace)(scopedPull), __tsplusTrace);
 }
@@ -1276,46 +1130,38 @@ function fromPull_1(scopedPull, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps fromQueue
  */
-
-
 function fromQueue_1(queue, maxChunkSize = DEFAULT_CHUNK_SIZE, __tsplusTrace) {
   return repeatIOChunkMaybe_1(tsplus_module_1.catchAllCause(c => tsplus_module_1.flatMap(down => {
-    if (down && tsplus_module_22.interrupted(c)) {
-      return tsplus_module_48.end;
+    if (down && tsplus_module_25.interrupted(c)) {
+      return tsplus_module_53.end;
     } else {
-      return tsplus_module_48.failCause(c);
+      return tsplus_module_53.failCause(c);
     }
-  }, __tsplusTrace)(queue.isShutdown), __tsplusTrace)(tsplus_module_1.map(tsplus_module_16.from, __tsplusTrace)(queue.takeBetween(1, maxChunkSize, __tsplusTrace))), __tsplusTrace);
+  }, __tsplusTrace)(tsplus_module_27.isShutdown(queue, __tsplusTrace)), __tsplusTrace)(tsplus_module_1.map(tsplus_module_19.from, __tsplusTrace)(tsplus_module_54.takeBetween(1, maxChunkSize, __tsplusTrace)(queue))), __tsplusTrace);
 }
 /**
  * @tsplus static fncts.io.StreamOps fromQueueWithShutdown
  */
-
-
 function fromQueueWithShutdown_1(queue, maxChunkSize = DEFAULT_CHUNK_SIZE, __tsplusTrace) {
-  return ensuring_1(queue.shutdown, __tsplusTrace)(fromQueue_1(queue, maxChunkSize, __tsplusTrace));
+  return ensuring_1(tsplus_module_27.shutdown(queue, __tsplusTrace), __tsplusTrace)(fromQueue_1(queue, maxChunkSize, __tsplusTrace));
 }
 /**
  * @tsplus static fncts.io.StreamOps fromHub
  */
-
-
 export function fromHub(hub, maxChunkSize = DEFAULT_CHUNK_SIZE, __tsplusTrace) {
-  return flatMap_1(queue => fromQueueWithShutdown_1(queue, maxChunkSize, __tsplusTrace), __tsplusTrace)(scoped_1(() => hub().subscribe, __tsplusTrace));
+  return flatMap_1(queue => fromQueueWithShutdown_1(queue, maxChunkSize, __tsplusTrace), __tsplusTrace)(scoped_1(() => tsplus_module_33.subscribe(hub(), __tsplusTrace), __tsplusTrace));
 }
 /**
  * @tsplus static fncts.io.StreamOps fromHubScoped
  */
-
 export function fromHubScoped(hub, maxChunkSize = DEFAULT_CHUNK_SIZE, __tsplusTrace) {
-  return tsplus_module_1.defer(() => tsplus_module_1.map(queue => fromQueueWithShutdown_1(queue, maxChunkSize, __tsplusTrace), __tsplusTrace)(hub().subscribe), __tsplusTrace);
+  return tsplus_module_1.defer(() => tsplus_module_1.map(queue => fromQueueWithShutdown_1(queue, maxChunkSize, __tsplusTrace), __tsplusTrace)(tsplus_module_33.subscribe(hub(), __tsplusTrace)), __tsplusTrace);
 }
 /**
  * Halt a stream with the specified exception
  *
  * @tsplus static fncts.io.StreamOps haltNow
  */
-
 export function haltNow(u, __tsplusTrace) {
   return new Stream(tsplus_module_10.halt(() => u));
 }
@@ -1324,13 +1170,11 @@ export function haltNow(u, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps halt
  */
-
 function halt_1(u, __tsplusTrace) {
   return new Stream(tsplus_module_10.halt(u));
 }
-
 function haltWhenWriter(fiber, __tsplusTrace) {
-  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeExit => tsplus_module_17.match(() => tsplus_module_10.readWith(i => tsplus_module_11.apSecond(haltWhenWriter(fiber, __tsplusTrace))(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => tsplus_module_10.unit), exit => tsplus_module_30.match(tsplus_module_11.failCauseNow, () => tsplus_module_10.unit)(exit))(maybeExit), __tsplusTrace)(tsplus_module_44.poll(fiber, __tsplusTrace)));
+  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeExit => tsplus_module_20.match(() => tsplus_module_10.readWith(i => tsplus_module_11.zipRight(haltWhenWriter(fiber, __tsplusTrace))(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => tsplus_module_10.unit), exit => tsplus_module_35.match(tsplus_module_11.failCauseNow, () => tsplus_module_10.unit)(exit))(maybeExit), __tsplusTrace)(tsplus_module_49.poll(fiber, __tsplusTrace)));
 }
 /**
  * Halts the evaluation of this stream when the provided IO completes. The
@@ -1344,16 +1188,13 @@ function haltWhenWriter(fiber, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream haltWhen
  */
-
-
 export function haltWhen(io, __tsplusTrace) {
   return fa => {
-    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(fiber => tsplus_module_10.pipeTo(haltWhenWriter(fiber, __tsplusTrace))(fa.channel), __tsplusTrace)(tsplus_module_14.forkScoped(io, __tsplusTrace))));
+    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(fiber => tsplus_module_10.pipeTo(haltWhenWriter(fiber, __tsplusTrace))(fa.channel), __tsplusTrace)(tsplus_module_17.forkScoped(io, __tsplusTrace))));
   };
 }
-
 function haltWhenFutureWriter(future, __tsplusTrace) {
-  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeIO => tsplus_module_17.match(() => tsplus_module_10.readWith(i => tsplus_module_11.apSecond(haltWhenFutureWriter(future, __tsplusTrace))(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => tsplus_module_10.unit), io => tsplus_module_10.unwrap(() => tsplus_module_1.match(tsplus_module_10.failNow, () => tsplus_module_10.unit, __tsplusTrace)(io)))(maybeIO), __tsplusTrace)(tsplus_module_31.poll(future, __tsplusTrace)));
+  return tsplus_module_10.unwrap(() => tsplus_module_1.map(maybeIO => tsplus_module_20.match(() => tsplus_module_10.readWith(i => tsplus_module_11.zipRight(haltWhenFutureWriter(future, __tsplusTrace))(tsplus_module_10.writeNow(i)), tsplus_module_10.failNow, () => tsplus_module_10.unit), io => tsplus_module_10.unwrap(() => tsplus_module_1.match(tsplus_module_10.failNow, () => tsplus_module_10.unit, __tsplusTrace)(io)))(maybeIO), __tsplusTrace)(tsplus_module_36.poll(future, __tsplusTrace)));
 }
 /**
  * Halts the evaluation of this stream when the provided promise resolves.
@@ -1362,8 +1203,6 @@ function haltWhenFutureWriter(future, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream haltWhen
  */
-
-
 export function haltWhenFuture(future, __tsplusTrace) {
   return fa => {
     return new Stream(tsplus_module_10.pipeTo(haltWhenFutureWriter(future, __tsplusTrace))(fa.channel));
@@ -1372,15 +1211,13 @@ export function haltWhenFuture(future, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream interleave
  */
-
 export function interleave(sb, __tsplusTrace) {
   return sa => {
-    return interleaveWith_1(sb, forever_1(fromChunk_1(() => tsplus_module_16.make(true, false), __tsplusTrace), __tsplusTrace), __tsplusTrace)(sa);
+    return interleaveWith_1(sb, forever_1(fromChunk_1(() => tsplus_module_19.make(true, false), __tsplusTrace), __tsplusTrace), __tsplusTrace)(sa);
   };
 }
-
 function interleaveWithProducer(handoff, __tsplusTrace) {
-  return tsplus_module_10.readWithCause(value => tsplus_module_11.apSecond(interleaveWithProducer(handoff, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.single(value))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.failCause(cause))(handoff)), () => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_23.end)(handoff)));
+  return tsplus_module_10.readWithCause(value => tsplus_module_11.zipRight(interleaveWithProducer(handoff, __tsplusTrace))(tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.single(value))(handoff))), cause => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.failCause(cause))(handoff)), () => tsplus_module_10.fromIO(() => tsplus_module_5.offer(tsplus_module_26.end)(handoff)));
 }
 /**
  * Combines this stream and the specified stream deterministically using the
@@ -1392,28 +1229,22 @@ function interleaveWithProducer(handoff, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream interleaveWith
  */
-
-
 function interleaveWith_1(sb, b, __tsplusTrace) {
   return sa => {
     return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(([left, right]) => {
       const process = (leftDone, rightDone) => tsplus_module_10.readWithCause(b => {
         if (b && !leftDone) {
-          return tsplus_module_11.flatMap(take => tsplus_module_23.match(rightDone ? tsplus_module_10.unit : process(true, rightDone), tsplus_module_11.failCauseNow, chunk => tsplus_module_11.apSecond(process(leftDone, rightDone))(tsplus_module_10.writeNow(chunk)))(take))(tsplus_module_10.fromIO(() => tsplus_module_5.take(left)));
+          return tsplus_module_11.flatMap(take => tsplus_module_26.match(rightDone ? tsplus_module_10.unit : process(true, rightDone), tsplus_module_11.failCauseNow, chunk => tsplus_module_11.zipRight(process(leftDone, rightDone))(tsplus_module_10.writeNow(chunk)))(take))(tsplus_module_10.fromIO(() => tsplus_module_5.take(left)));
         }
-
         if (!b && !rightDone) {
-          return tsplus_module_11.flatMap(take => tsplus_module_23.match(leftDone ? tsplus_module_10.unit : process(leftDone, true), tsplus_module_11.failCauseNow, chunk => tsplus_module_11.apSecond(process(leftDone, rightDone))(tsplus_module_10.writeNow(chunk)))(take))(tsplus_module_10.fromIO(() => tsplus_module_5.take(right)));
+          return tsplus_module_11.flatMap(take => tsplus_module_26.match(leftDone ? tsplus_module_10.unit : process(leftDone, true), tsplus_module_11.failCauseNow, chunk => tsplus_module_11.zipRight(process(leftDone, rightDone))(tsplus_module_10.writeNow(chunk)))(take))(tsplus_module_10.fromIO(() => tsplus_module_5.take(right)));
         }
-
         return process(leftDone, rightDone);
       }, tsplus_module_11.failCauseNow, () => tsplus_module_10.unit);
-
       return tsplus_module_10.pipeTo(process(false, false))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(b.channel));
-    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(interleaveWithProducer(right, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(sb.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_1.fork(tsplus_module_13.runScoped(tsplus_module_10.pipeTo(interleaveWithProducer(left, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(sa.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
+    }, __tsplusTrace)(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => tsplus_module_1.flatMap(() => tsplus_module_1.map(() => tuple(left, right), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(interleaveWithProducer(right, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(sb.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_32.fork(tsplus_module_16.runScoped(tsplus_module_10.pipeTo(interleaveWithProducer(left, __tsplusTrace))(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(sa.channel))), __tsplusTrace)), __tsplusTrace)(tsplus_module_5.make()), __tsplusTrace)(tsplus_module_5.make()))));
   };
 }
-
 function intersperseWriter(middle, isFirst, __tsplusTrace) {
   return tsplus_module_10.readWith(inp => {
     const builder = tsplus_module_12.builder();
@@ -1427,14 +1258,12 @@ function intersperseWriter(middle, isFirst, __tsplusTrace) {
         builder.append(a);
       }
     })(inp);
-    return tsplus_module_11.apSecond(intersperseWriter(middle, flagResult, __tsplusTrace))(tsplus_module_10.writeNow(builder.result()));
+    return tsplus_module_11.zipRight(intersperseWriter(middle, flagResult, __tsplusTrace))(tsplus_module_10.writeNow(builder.result()));
   }, tsplus_module_10.failNow, () => tsplus_module_10.unit);
 }
 /**
  * Intersperse stream with provided element
  */
-
-
 export function intersperse(stream, middle, __tsplusTrace) {
   return new Stream(tsplus_module_10.pipeTo(intersperseWriter(middle, true, __tsplusTrace))(stream.channel));
 }
@@ -1448,19 +1277,17 @@ export function intersperse(stream, middle, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream interruptWhen
  */
-
 export function interruptWhen(io, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_49.interruptWhen(io)(stream.channel));
+    return new Stream(tsplus_module_55.interruptWhen(io)(stream.channel));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream interruptWhen
  */
-
 export function interruptWhenFuture(future, __tsplusTrace) {
   return fa => {
-    return new Stream(tsplus_module_49.interruptWhenFuture(future)(fa.channel));
+    return new Stream(tsplus_module_55.interruptWhenFuture(future)(fa.channel));
   };
 }
 /**
@@ -1468,17 +1295,15 @@ export function interruptWhenFuture(future, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream map
  */
-
 function map_1(f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.mapOut(as => tsplus_module_12.map(f)(as))(stream.channel));
   };
 }
-
 function mapAccumAccumulator(currS, f, __tsplusTrace) {
   return tsplus_module_10.readWith(inp => {
     const [nextS, bs] = tsplus_module_12.mapAccum(currS, f)(inp);
-    return tsplus_module_11.apSecond(mapAccumAccumulator(nextS, f, __tsplusTrace))(tsplus_module_10.writeNow(bs));
+    return tsplus_module_11.zipRight(mapAccumAccumulator(nextS, f, __tsplusTrace))(tsplus_module_10.writeNow(bs));
   }, tsplus_module_10.failNow, () => tsplus_module_10.unit);
 }
 /**
@@ -1486,26 +1311,21 @@ function mapAccumAccumulator(currS, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapAccum
  */
-
-
 function mapAccum_1(s, f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.pipeTo(mapAccumAccumulator(s, f, __tsplusTrace))(stream.channel));
   };
 }
-
 function mapAccumIOAccumulator(s, f, __tsplusTrace) {
   return tsplus_module_10.readWith(inp => tsplus_module_10.unwrap(() => tsplus_module_1.defer(() => {
     const outputChunk = tsplus_module_12.builder();
-
     const emit = b => tsplus_module_1.succeed(() => {
       outputChunk.append(b);
     }, __tsplusTrace);
-
     return tsplus_module_1.match(e => {
       const partialResult = outputChunk.result();
-      return tsplus_module_12.isNonEmpty(partialResult) ? tsplus_module_11.apSecond(tsplus_module_10.failNow(e))(tsplus_module_10.writeNow(partialResult)) : tsplus_module_10.failNow(e);
-    }, s => tsplus_module_11.apSecond(mapAccumIOAccumulator(s, f, __tsplusTrace))(tsplus_module_10.writeNow(outputChunk.result())), __tsplusTrace)(tsplus_module_1.foldLeft(inp, s, (s1, a) => tsplus_module_1.flatMap(([b, s2]) => tsplus_module_1.as(() => s2, __tsplusTrace)(emit(b)), __tsplusTrace)(f(s1, a)), __tsplusTrace));
+      return tsplus_module_12.isNonEmpty(partialResult) ? tsplus_module_11.zipRight(tsplus_module_10.failNow(e))(tsplus_module_10.writeNow(partialResult)) : tsplus_module_10.failNow(e);
+    }, s => tsplus_module_11.zipRight(mapAccumIOAccumulator(s, f, __tsplusTrace))(tsplus_module_10.writeNow(outputChunk.result())), __tsplusTrace)(tsplus_module_1.foldLeft(inp, s, (s1, a) => tsplus_module_1.flatMap(([b, s2]) => tsplus_module_1.as(() => s2, __tsplusTrace)(emit(b)), __tsplusTrace)(f(s1, a)), __tsplusTrace));
   }, __tsplusTrace)), tsplus_module_10.failNow, () => tsplus_module_10.unit);
 }
 /**
@@ -1514,8 +1334,6 @@ function mapAccumIOAccumulator(s, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapAccumIO
  */
-
-
 function mapAccumIO_1(s, f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.pipeTo(mapAccumIOAccumulator(s, f, __tsplusTrace))(stream.channel));
@@ -1526,8 +1344,6 @@ function mapAccumIO_1(s, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapChunks
  */
-
-
 function mapChunks_1(f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.mapOut(f)(stream.channel));
@@ -1538,11 +1354,9 @@ function mapChunks_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapChunksIO
  */
-
-
 export function mapChunksIO(f, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_10.mapOutIO_(f)(stream.channel));
+    return new Stream(tsplus_module_10.mapOutIO(f)(stream.channel));
   };
 }
 /**
@@ -1551,10 +1365,9 @@ export function mapChunksIO(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapConcat
  */
-
 export function mapConcat(f, __tsplusTrace) {
   return stream => {
-    return mapConcatChunk_1(a => tsplus_module_16.from(f(a)), __tsplusTrace)(stream);
+    return mapConcatChunk_1(a => tsplus_module_19.from(f(a)), __tsplusTrace)(stream);
   };
 }
 /**
@@ -1563,7 +1376,6 @@ export function mapConcat(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapConcatChunk
  */
-
 function mapConcatChunk_1(f, __tsplusTrace) {
   return stream => {
     return mapChunks_1(c => tsplus_module_12.flatMap(f)(c), __tsplusTrace)(stream);
@@ -1575,8 +1387,6 @@ function mapConcatChunk_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapConcatChunkIO
  */
-
-
 export function mapConcatChunkIO(f, __tsplusTrace) {
   return stream => {
     return mapConcatChunk_1(identity, __tsplusTrace)(mapIO_1(f, __tsplusTrace)(stream));
@@ -1588,10 +1398,9 @@ export function mapConcatChunkIO(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapConcatIO
  */
-
 export function mapConcatIO(f, __tsplusTrace) {
   return stream => {
-    return mapConcatChunk_1(identity, __tsplusTrace)(mapIO_1(a => tsplus_module_1.map(tsplus_module_16.from, __tsplusTrace)(f(a)), __tsplusTrace)(stream));
+    return mapConcatChunk_1(identity, __tsplusTrace)(mapIO_1(a => tsplus_module_1.map(tsplus_module_19.from, __tsplusTrace)(f(a)), __tsplusTrace)(stream));
   };
 }
 /**
@@ -1599,7 +1408,6 @@ export function mapConcatIO(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapError
  */
-
 function mapError_1(f, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.mapError(f)(stream.channel));
@@ -1610,8 +1418,6 @@ function mapError_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapErrorCause
  */
-
-
 export function mapErrorCause(f, __tsplusTrace) {
   return fa => {
     return new Stream(tsplus_module_10.mapErrorCause(f)(fa.channel));
@@ -1622,20 +1428,17 @@ export function mapErrorCause(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapIO
  */
-
 function mapIO_1(f, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_10.pipeTo(mapIOLoop(tsplus_module_34.empty()[Symbol.iterator](), f, __tsplusTrace))(stream.channel));
+    return new Stream(tsplus_module_10.pipeTo(mapIOLoop(tsplus_module_39.empty()[Symbol.iterator](), f, __tsplusTrace))(stream.channel));
   };
 }
-
 function mapIOLoop(iterator, f, __tsplusTrace) {
   const next = iterator.next();
-
   if (next.done) {
     return tsplus_module_10.readWithCause(elem => mapIOLoop(elem[Symbol.iterator](), f, __tsplusTrace), tsplus_module_11.failCauseNow, tsplus_module_11.succeedNow);
   } else {
-    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => tsplus_module_11.apSecond(mapIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(b))), __tsplusTrace)(f(next.value)));
+    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => tsplus_module_11.zipRight(mapIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(b))), __tsplusTrace)(f(next.value)));
   }
 }
 /**
@@ -1647,11 +1450,9 @@ function mapIOLoop(iterator, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mapIOC
  */
-
-
 export function mapIOC(n, f, __tsplusTrace) {
   return stream => {
-    return new Stream(tsplus_module_10.mapOut(tsplus_module_16.single)(tsplus_module_50.mapOutIOC(n, f)(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(stream.channel))));
+    return new Stream(tsplus_module_10.mapOut(tsplus_module_19.single)(tsplus_module_56.mapOutConcurrentIO(n, f)(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(stream.channel))));
   };
 }
 /**
@@ -1662,10 +1463,9 @@ export function mapIOC(n, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mergeMap
  */
-
 function mergeMap_1(f, n, bufferSize = 16, __tsplusTrace) {
   return ma => {
-    return new Stream(tsplus_module_51.mergeMap(a => f(a).channel, n, bufferSize)(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(ma.channel)));
+    return new Stream(tsplus_module_57.mergeMap(a => f(a).channel, n, bufferSize)(tsplus_module_10.concatMap(tsplus_module_10.writeChunk)(ma.channel)));
   };
 }
 /**
@@ -1675,8 +1475,6 @@ function mergeMap_1(f, n, bufferSize = 16, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream mergeMapIO
  */
-
-
 export function mergeMapIO(f, n, bufferSize = 16, __tsplusTrace) {
   return stream => {
     return mergeMap_1(a => fromIO_1(f(a), __tsplusTrace), n, bufferSize, __tsplusTrace)(stream);
@@ -1685,23 +1483,20 @@ export function mergeMapIO(f, n, bufferSize = 16, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream mergeEither
  */
-
 function mergeEither_1(fb, __tsplusTrace) {
   return fa => {
-    return mergeWith_1(fb, tsplus_module_15.left, tsplus_module_15.right)(fa);
+    return mergeWith_1(fb, tsplus_module_18.left, tsplus_module_18.right)(fa);
   };
 }
-
 export function mergeWithHandler(terminate, __tsplusTrace) {
-  return exit => terminate || !tsplus_module_47.isSuccess(exit) ? tsplus_module_52.done(tsplus_module_1.fromExitNow(exit, __tsplusTrace)) : tsplus_module_52.wait(tsplus_module_1.fromExitNow);
+  return exit => terminate || !tsplus_module_52.isSuccess(exit) ? tsplus_module_58.done(tsplus_module_1.fromExitNow(exit, __tsplusTrace)) : tsplus_module_58.wait(tsplus_module_1.fromExitNow);
 }
 /**
  * @tsplus pipeable fncts.io.Stream mergeWith
  */
-
 function mergeWith_1(sb, l, r, strategy = "Both", __tsplusTrace) {
   return sa => {
-    return new Stream(tsplus_module_53.mergeWith(map_1(r, __tsplusTrace)(sb).channel, mergeWithHandler(strategy === "Either" || strategy === "Left", __tsplusTrace), mergeWithHandler(strategy === "Either" || strategy === "Right", __tsplusTrace))(map_1(l, __tsplusTrace)(sa).channel));
+    return new Stream(tsplus_module_59.mergeWith(map_1(r, __tsplusTrace)(sb).channel, mergeWithHandler(strategy === "Either" || strategy === "Left", __tsplusTrace), mergeWithHandler(strategy === "Either" || strategy === "Right", __tsplusTrace))(map_1(l, __tsplusTrace)(sa).channel));
   };
 }
 /**
@@ -1711,11 +1506,9 @@ function mergeWith_1(sb, l, r, strategy = "Both", __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream onError
  */
-
-
 export function onError(cleanup, __tsplusTrace) {
   return stream => {
-    return catchAllCause_1(cause => fromIO_1(tsplus_module_1.apSecond(tsplus_module_1.failCauseNow(cause, __tsplusTrace), __tsplusTrace)(cleanup(cause)), __tsplusTrace), __tsplusTrace)(stream);
+    return catchAllCause_1(cause => fromIO_1(tsplus_module_1.zipRight(tsplus_module_1.failCauseNow(cause, __tsplusTrace), __tsplusTrace)(cleanup(cause)), __tsplusTrace), __tsplusTrace)(stream);
   };
 }
 /**
@@ -1725,7 +1518,6 @@ export function onError(cleanup, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream orElse
  */
-
 function orElse_1(that, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.orElse(that().channel)(stream.channel));
@@ -1738,11 +1530,9 @@ function orElse_1(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream orElseEither
  */
-
-
 export function orElseEither(that, __tsplusTrace) {
   return stream => {
-    return orElse_1(() => map_1(tsplus_module_15.right, __tsplusTrace)(that()), __tsplusTrace)(map_1(tsplus_module_15.left, __tsplusTrace)(stream));
+    return orElse_1(() => map_1(tsplus_module_18.right, __tsplusTrace)(that()), __tsplusTrace)(map_1(tsplus_module_18.left, __tsplusTrace)(stream));
   };
 }
 /**
@@ -1752,7 +1542,6 @@ export function orElseEither(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream orElseFail
  */
-
 export function orElseFail(e, __tsplusTrace) {
   return stream => {
     return orElse_1(() => failNow_1(e(), __tsplusTrace), __tsplusTrace)(stream);
@@ -1763,16 +1552,14 @@ export function orElseFail(e, __tsplusTrace) {
  *
  * See also Stream#catchAll.
  */
-
 export function orElseOptional(stream, that, __tsplusTrace) {
-  return catchAll_1(maybeError => tsplus_module_17.match(() => that(), e => failNow_1(tsplus_module_3.just(e), __tsplusTrace))(maybeError), __tsplusTrace)(stream);
+  return catchAll_1(maybeError => tsplus_module_20.match(() => that(), e => failNow_1(tsplus_module_3.just(e), __tsplusTrace))(maybeError), __tsplusTrace)(stream);
 }
 /**
  * Succeeds with the specified value if this one fails with a typed error.
  *
  * @tsplus pipeable fncts.io.Stream orElseSucceed
  */
-
 export function orElseSucceed(a, __tsplusTrace) {
   return stream => {
     return orElse_1(() => succeedNow_1(a(), __tsplusTrace), __tsplusTrace)(stream);
@@ -1781,7 +1568,6 @@ export function orElseSucceed(a, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream pipeThrough
  */
-
 function pipeThrough_1(sa, __tsplusTrace) {
   return ma => {
     return new Stream(tsplus_module_10.pipeToOrFail(sa.channel)(ma.channel));
@@ -1793,8 +1579,6 @@ function pipeThrough_1(sa, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream provideEnvironment
  */
-
-
 function provideEnvironment_1(r, __tsplusTrace) {
   return ra => {
     return new Stream(tsplus_module_10.provideEnvironment(() => r)(ra.channel));
@@ -1803,86 +1587,71 @@ function provideEnvironment_1(r, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream provideLayer
  */
-
-
 function provideLayer_1(layer, __tsplusTrace) {
   return self => {
-    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(r => tsplus_module_10.provideEnvironment(() => r)(self.channel), __tsplusTrace)(tsplus_module_54.build(layer, __tsplusTrace))));
+    return new Stream(tsplus_module_10.unwrapScoped(() => tsplus_module_1.map(r => tsplus_module_10.provideEnvironment(() => r)(self.channel), __tsplusTrace)(tsplus_module_60.build(layer, __tsplusTrace))));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream provideSomeLayer
  */
-
-
 export function provideSomeLayer(layer, __tsplusTrace) {
   return self => {
     // @ts-expect-error
-    return provideLayer_1(tsplus_module_55.and(layer, __tsplusTrace)(tsplus_module_55.environment(__tsplusTrace)), __tsplusTrace)(self);
+    return provideLayer_1(tsplus_module_61.and(layer, __tsplusTrace)(tsplus_module_61.environment(__tsplusTrace)), __tsplusTrace)(self);
   };
 }
-
 class Rechunker {
   constructor(n) {
     this.n = n;
     this.builder = [];
     this.pos = 0;
   }
-
   write(elem) {
     this.builder.push(elem);
     this.pos += 1;
-
     if (this.pos === this.n) {
       const result = this.builder;
       this.builder = [];
       this.pos = 0;
-      return tsplus_module_16.from(result);
+      return tsplus_module_19.from(result);
     }
-
     return null;
   }
-
   emitOfNotEmpty() {
     if (this.pos !== 0) {
-      return tsplus_module_10.writeNow(tsplus_module_16.from(this.builder));
+      return tsplus_module_10.writeNow(tsplus_module_19.from(this.builder));
     } else {
       return tsplus_module_10.unit;
     }
   }
-
   get isEmpty() {
     return this.pos === 0;
   }
-
 }
-
 function rechunkProcess(rechunker, target, __tsplusTrace) {
   return tsplus_module_10.readWithCause(chunk => {
     if (chunk.length === target && rechunker.isEmpty) {
-      return tsplus_module_11.apSecond(rechunkProcess(rechunker, target, __tsplusTrace))(tsplus_module_10.writeNow(chunk));
+      return tsplus_module_11.zipRight(rechunkProcess(rechunker, target, __tsplusTrace))(tsplus_module_10.writeNow(chunk));
     } else if (chunk.length > 0) {
       const chunks = [];
       let result = null;
       let i = 0;
-
       while (i < chunk.length) {
         while (i < chunk.length && result === null) {
           result = rechunker.write(tsplus_module_12.unsafeGet(i)(chunk));
           i += 1;
         }
-
         if (result !== null) {
           chunks.push(result);
           result = null;
         }
       }
-
-      return tsplus_module_11.apSecond(rechunkProcess(rechunker, target, __tsplusTrace))(tsplus_module_10.writeAll(chunks));
+      return tsplus_module_11.zipRight(rechunkProcess(rechunker, target, __tsplusTrace))(tsplus_module_10.writeAll(chunks));
     } else {
       return rechunkProcess(rechunker, target, __tsplusTrace);
     }
-  }, cause => tsplus_module_11.apSecond(tsplus_module_11.failCauseNow(cause))(rechunker.emitOfNotEmpty()), () => rechunker.emitOfNotEmpty());
+  }, cause => tsplus_module_11.zipRight(tsplus_module_11.failCauseNow(cause))(rechunker.emitOfNotEmpty()), () => rechunker.emitOfNotEmpty());
 }
 /**
  * Re-chunks the elements of the stream into chunks of
@@ -1891,8 +1660,6 @@ function rechunkProcess(rechunker, target, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream rechunk
  */
-
-
 export function rechunk(n, __tsplusTrace) {
   return stream => {
     return new Stream(tsplus_module_10.pipeTo(rechunkProcess(new Rechunker(n), n, __tsplusTrace))(stream.channel));
@@ -1903,16 +1670,14 @@ export function rechunk(n, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps repeatValue
  */
-
 export function repeatValue(a, __tsplusTrace) {
-  return new Stream(tsplus_module_10.repeated(tsplus_module_10.writeNow(tsplus_module_16.single(a))));
+  return new Stream(tsplus_module_10.repeated(tsplus_module_10.writeNow(tsplus_module_19.single(a))));
 }
 /**
  * Creates a stream from an effect producing a value of type `A` which repeats forever.
  *
  * @tsplus static fncts.io.StreamOps repeatIO
  */
-
 export function repeatIO(fa, __tsplusTrace) {
   return repeatIOMaybe_1(tsplus_module_1.mapError(tsplus_module_3.just, __tsplusTrace)(fa), __tsplusTrace);
 }
@@ -1921,17 +1686,14 @@ export function repeatIO(fa, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps repeatIOMaybe
  */
-
 function repeatIOMaybe_1(fa, __tsplusTrace) {
-  return repeatIOChunkMaybe_1(tsplus_module_1.map(tsplus_module_16.single, __tsplusTrace)(fa), __tsplusTrace);
+  return repeatIOChunkMaybe_1(tsplus_module_1.map(tsplus_module_19.single, __tsplusTrace)(fa), __tsplusTrace);
 }
 /**
  * Creates a stream from an effect producing chunks of `A` values which repeats forever.
  *
  * @tsplus static fncts.io.StreamOps repeatIOChunk
  */
-
-
 export function repeatIOChunk(fa, __tsplusTrace) {
   return repeatIOChunkMaybe_1(tsplus_module_1.mapError(tsplus_module_3.just, __tsplusTrace)(fa), __tsplusTrace);
 }
@@ -1940,20 +1702,17 @@ export function repeatIOChunk(fa, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps repeatIOChunkMaybe
  */
-
 function repeatIOChunkMaybe_1(fa, __tsplusTrace) {
-  return unfoldChunkIO_1(undefined, _ => tsplus_module_1.catchAll(maybeError => tsplus_module_17.match(() => tsplus_module_1.succeedNow(tsplus_module_3.nothing(), __tsplusTrace), tsplus_module_1.failNow)(maybeError), __tsplusTrace)(tsplus_module_1.map(chunk => tsplus_module_3.just(tuple(chunk, undefined)), __tsplusTrace)(fa)), __tsplusTrace);
+  return unfoldChunkIO_1(undefined, _ => tsplus_module_1.catchAll(maybeError => tsplus_module_20.match(() => tsplus_module_1.succeedNow(tsplus_module_3.nothing(), __tsplusTrace), tsplus_module_1.failNow)(maybeError), __tsplusTrace)(tsplus_module_1.map(chunk => tsplus_module_3.just(tuple(chunk, undefined)), __tsplusTrace)(fa)), __tsplusTrace);
 }
 /**
  * Runs the sink on the stream to produce either the sink's result or an error.
  *
  * @tsplus pipeable fncts.io.Stream run
  */
-
-
 function run_1(sink, __tsplusTrace) {
   return stream => {
-    return tsplus_module_56.runDrain(tsplus_module_10.pipeToOrFail(sink.channel)(stream.channel));
+    return tsplus_module_62.runDrain(tsplus_module_10.pipeToOrFail(sink.channel)(stream.channel));
   };
 }
 /**
@@ -1961,27 +1720,23 @@ function run_1(sink, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream runCollect
  */
-
-
 export function runCollect(stream, __tsplusTrace) {
-  return run_1(tsplus_module_42.makeCollectAll(__tsplusTrace), __tsplusTrace)(stream);
+  return run_1(tsplus_module_47.makeCollectAll(__tsplusTrace), __tsplusTrace)(stream);
 }
 /**
  * Runs the stream and collects ignore its elements.
  *
  * @tsplus getter fncts.io.Stream runDrain
  */
-
 export function runDrain(stream, __tsplusTrace) {
-  return run_1(tsplus_module_42.drain, __tsplusTrace)(stream);
+  return run_1(tsplus_module_47.drain, __tsplusTrace)(stream);
 }
 /**
  * @tsplus pipeable fncts.io.Stream runForeachScoped
  */
-
 function runForeachScoped_1(f, __tsplusTrace) {
   return self => {
-    return runScoped_1(tsplus_module_42.makeForeach(f, __tsplusTrace), __tsplusTrace)(self);
+    return runScoped_1(tsplus_module_47.makeForeach(f, __tsplusTrace), __tsplusTrace)(self);
   };
 }
 /**
@@ -1990,12 +1745,10 @@ function runForeachScoped_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream runIntoElementsScoped
  */
-
-
 function runIntoElementsScoped_1(queue, __tsplusTrace) {
   return stream => {
-    const writer = tsplus_module_10.readWith(inp => tsplus_module_11.apSecond(writer)(tsplus_module_12.foldLeft(tsplus_module_10.unit, (channel, a) => tsplus_module_11.apSecond(tsplus_module_10.writeNow(tsplus_module_35.succeed(a)))(channel))(inp)), err => tsplus_module_10.writeNow(tsplus_module_35.fail(tsplus_module_3.just(err))), () => tsplus_module_10.writeNow(tsplus_module_35.fail(tsplus_module_3.nothing())));
-    return tsplus_module_1.asUnit(tsplus_module_13.runScoped(tsplus_module_10.drain(tsplus_module_10.mapOutIO_(exit => queue.offer(exit, __tsplusTrace))(tsplus_module_10.pipeTo(writer)(stream.channel)))), __tsplusTrace);
+    const writer = tsplus_module_10.readWith(inp => tsplus_module_11.zipRight(writer)(tsplus_module_12.foldLeft(tsplus_module_10.unit, (channel, a) => tsplus_module_11.zipRight(tsplus_module_10.writeNow(tsplus_module_40.succeed(a)))(channel))(inp)), err => tsplus_module_10.writeNow(tsplus_module_40.fail(tsplus_module_3.just(err))), () => tsplus_module_10.writeNow(tsplus_module_40.fail(tsplus_module_3.nothing())));
+    return tsplus_module_1.asUnit(tsplus_module_16.runScoped(tsplus_module_10.drain(tsplus_module_10.mapOutIO(exit => tsplus_module_27.offer(exit, __tsplusTrace)(queue))(tsplus_module_10.pipeTo(writer)(stream.channel)))), __tsplusTrace);
   };
 }
 /**
@@ -2004,12 +1757,10 @@ function runIntoElementsScoped_1(queue, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream runIntoQueueScoped
  */
-
-
 function runIntoQueueScoped_1(queue, __tsplusTrace) {
   return stream => {
-    const writer = tsplus_module_10.readWithCause(inp => tsplus_module_11.apSecond(writer)(tsplus_module_10.writeNow(tsplus_module_23.chunk(inp))), cause => tsplus_module_10.writeNow(tsplus_module_23.failCause(cause)), _ => tsplus_module_10.writeNow(tsplus_module_23.end));
-    return tsplus_module_1.asUnit(tsplus_module_13.runScoped(tsplus_module_10.drain(tsplus_module_10.mapOutIO_(take => queue.offer(take, __tsplusTrace))(tsplus_module_10.pipeTo(writer)(stream.channel)))), __tsplusTrace);
+    const writer = tsplus_module_10.readWithCause(inp => tsplus_module_11.zipRight(writer)(tsplus_module_10.writeNow(tsplus_module_26.chunk(inp))), cause => tsplus_module_10.writeNow(tsplus_module_26.failCause(cause)), _ => tsplus_module_10.writeNow(tsplus_module_26.end));
+    return tsplus_module_1.asUnit(tsplus_module_16.runScoped(tsplus_module_10.drain(tsplus_module_10.mapOutIO(take => tsplus_module_27.offer(take, __tsplusTrace)(queue))(tsplus_module_10.pipeTo(writer)(stream.channel)))), __tsplusTrace);
   };
 }
 /**
@@ -2018,8 +1769,6 @@ function runIntoQueueScoped_1(queue, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream runIntoHubScoped
  */
-
-
 function runIntoHubScoped_1(hub, __tsplusTrace) {
   return stream => {
     return runIntoQueueScoped_1(hub, __tsplusTrace)(stream);
@@ -2030,11 +1779,9 @@ function runIntoHubScoped_1(hub, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream runScoped
  */
-
-
 function runScoped_1(sink, __tsplusTrace) {
   return stream => {
-    return tsplus_module_13.runScoped(tsplus_module_10.drain(tsplus_module_10.pipeToOrFail(sink.channel)(stream.channel)));
+    return tsplus_module_16.runScoped(tsplus_module_10.drain(tsplus_module_10.pipeToOrFail(sink.channel)(stream.channel)));
   };
 }
 /**
@@ -2043,8 +1790,6 @@ function runScoped_1(sink, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream scan
  */
-
-
 export function scan(b, f, __tsplusTrace) {
   return sa => {
     return scanIO_1(b, (b, a) => tsplus_module_1.succeedNow(f(b, a), __tsplusTrace), __tsplusTrace)(sa);
@@ -2056,7 +1801,6 @@ export function scan(b, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream scanIO
  */
-
 function scanIO_1(b, f, __tsplusTrace) {
   return sa => {
     return concat_1(mapAccumIO_1(b, (b, a) => tsplus_module_1.map(b => [b, b], __tsplusTrace)(f(b, a)), __tsplusTrace)(sa), __tsplusTrace)(succeedNow_1(b, __tsplusTrace));
@@ -2068,8 +1812,6 @@ function scanIO_1(b, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream scanReduce
  */
-
-
 export function scanReduce(f, __tsplusTrace) {
   return fa => {
     return scanReduceIO_1((b, a) => tsplus_module_1.succeedNow(f(b, a), __tsplusTrace), __tsplusTrace)(fa);
@@ -2081,10 +1823,9 @@ export function scanReduce(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream scanReduceIO
  */
-
 function scanReduceIO_1(f, __tsplusTrace) {
   return fa => {
-    return mapAccumIO_1(tsplus_module_3.nothing(), (s, a) => tsplus_module_17.match(() => tsplus_module_1.succeedNow([a, tsplus_module_3.just(a)], __tsplusTrace), b => tsplus_module_1.map(b => [b, tsplus_module_3.just(b)], __tsplusTrace)(f(b, a)))(s), __tsplusTrace)(fa);
+    return mapAccumIO_1(tsplus_module_3.nothing(), (s, a) => tsplus_module_20.match(() => tsplus_module_1.succeedNow([a, tsplus_module_3.just(a)], __tsplusTrace), b => tsplus_module_1.map(b => [b, tsplus_module_3.just(b)], __tsplusTrace)(f(b, a)))(s), __tsplusTrace)(fa);
   };
 }
 /**
@@ -2092,29 +1833,23 @@ function scanReduceIO_1(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps succeedNow
  */
-
-
 function succeedNow_1(o, __tsplusTrace) {
-  return fromChunkNow_1(tsplus_module_16.single(o), __tsplusTrace);
+  return fromChunkNow_1(tsplus_module_19.single(o), __tsplusTrace);
 }
 /**
  * Creates a single-valued pure stream
  *
  * @tsplus static fncts.io.StreamOps succeed
  */
-
-
 export function succeed(a, __tsplusTrace) {
-  return fromChunk_1(() => tsplus_module_16.single(a()), __tsplusTrace);
+  return fromChunk_1(() => tsplus_module_19.single(a()), __tsplusTrace);
 }
-
 function takeLoop(n, __tsplusTrace) {
   return tsplus_module_10.readWithCause(inp => {
     const taken = tsplus_module_12.take(n)(inp);
     const left = Math.max(n - taken.length, 0);
-
     if (left > 0) {
-      return tsplus_module_11.apSecond(takeLoop(left, __tsplusTrace))(tsplus_module_10.writeNow(taken));
+      return tsplus_module_11.zipRight(takeLoop(left, __tsplusTrace))(tsplus_module_10.writeNow(taken));
     } else {
       return tsplus_module_10.writeNow(taken);
     }
@@ -2125,48 +1860,39 @@ function takeLoop(n, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream take
  */
-
-
 export function take(n, __tsplusTrace) {
   return stream => {
     if (n <= 0) {
       return empty_1;
     }
-
     if (!Number.isInteger(n)) {
-      return halt_1(() => new tsplus_module_57.IllegalArgumentError(`${n} should be an integer`, "Stream.take"), __tsplusTrace);
+      return halt_1(() => new tsplus_module_63.IllegalArgumentError(`${n} should be an integer`, "Stream.take"), __tsplusTrace);
     }
-
     return new Stream(tsplus_module_10.pipeTo(takeLoop(n, __tsplusTrace))(stream.channel));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream takeUntilIO
  */
-
 export function takeUntilIO(f, __tsplusTrace) {
   return ma => {
-    return new Stream(tsplus_module_10.pipeTo(takeUntilIOLoop(tsplus_module_34.empty()[Symbol.iterator](), f, __tsplusTrace))(ma.channel));
+    return new Stream(tsplus_module_10.pipeTo(takeUntilIOLoop(tsplus_module_39.empty()[Symbol.iterator](), f, __tsplusTrace))(ma.channel));
   };
 }
-
 function takeUntilIOLoop(iterator, f, __tsplusTrace) {
   const next = iterator.next();
-
   if (next.done) {
     return tsplus_module_10.readWithCause(elem => takeUntilIOLoop(elem[Symbol.iterator](), f, __tsplusTrace), tsplus_module_11.failCauseNow, tsplus_module_11.succeedNow);
   } else {
-    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => b ? tsplus_module_10.writeNow(tsplus_module_16.single(next.value)) : tsplus_module_11.apSecond(takeUntilIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_16.single(next.value))), __tsplusTrace)(f(next.value)));
+    return tsplus_module_10.unwrap(() => tsplus_module_1.map(b => b ? tsplus_module_10.writeNow(tsplus_module_19.single(next.value)) : tsplus_module_11.zipRight(takeUntilIOLoop(iterator, f, __tsplusTrace))(tsplus_module_10.writeNow(tsplus_module_19.single(next.value))), __tsplusTrace)(f(next.value)));
   }
 }
-
 function takeUntilLoop(p, __tsplusTrace) {
   return tsplus_module_10.readWith(chunk => {
-    const taken = tsplus_module_12.takeWhile(tsplus_module_43.invert(p))(chunk);
+    const taken = tsplus_module_12.takeWhile(tsplus_module_48.invert(p))(chunk);
     const last = tsplus_module_12.take(1)(tsplus_module_12.drop(taken.length)(chunk));
-
     if (tsplus_module_12.isEmpty(last)) {
-      return tsplus_module_11.apSecond(takeUntilLoop(p, __tsplusTrace))(tsplus_module_10.writeNow(taken));
+      return tsplus_module_11.zipRight(takeUntilLoop(p, __tsplusTrace))(tsplus_module_10.writeNow(taken));
     } else {
       return tsplus_module_10.writeNow(tsplus_module_12.concat(last)(taken));
     }
@@ -2178,8 +1904,6 @@ function takeUntilLoop(p, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream takeUntil
  */
-
-
 export function takeUntil(p, __tsplusTrace) {
   return fa => {
     return new Stream(tsplus_module_10.pipeTo(takeUntilLoop(p, __tsplusTrace))(fa.channel));
@@ -2188,7 +1912,6 @@ export function takeUntil(p, __tsplusTrace) {
 /**
  * @tsplus pipeable fncts.io.Stream tap
  */
-
 export function tap(f, __tsplusTrace) {
   return ma => {
     return mapIO_1(a => tsplus_module_1.as(() => a, __tsplusTrace)(f(a)), __tsplusTrace)(ma);
@@ -2202,25 +1925,21 @@ export function tap(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream throttleEnforce
  */
-
 export function throttleEnforce(costFn, units, duration, burst = 0, __tsplusTrace) {
   return sa => {
     return throttleEnforceIO_1(chunk => tsplus_module_1.succeedNow(costFn(chunk), __tsplusTrace), units, duration, burst, __tsplusTrace)(sa);
   };
 }
-
 function throttleEnforceIOLoop(costFn, units, duration, burst, tokens, timestamp, __tsplusTrace) {
-  return tsplus_module_10.readWith(inp => tsplus_module_10.unwrap(() => tsplus_module_1.zipWith(tsplus_module_37.currentTime, (weight, current) => {
+  return tsplus_module_10.readWith(inp => tsplus_module_10.unwrap(() => tsplus_module_1.zipWith(tsplus_module_42.currentTime, (weight, current) => {
     const elapsed = current - timestamp;
     const cycles = elapsed / duration;
-
     const available = (() => {
       const sum = tokens + cycles * units;
       const max = units + burst < 0 ? Number.MAX_SAFE_INTEGER : units + burst;
       return sum < 0 ? max : Math.min(sum, max);
     })();
-
-    return weight <= available ? tsplus_module_11.apSecond(throttleEnforceIOLoop(costFn, units, duration, burst, available - weight, current, __tsplusTrace))(tsplus_module_10.writeNow(inp)) : throttleEnforceIOLoop(costFn, units, duration, burst, available - weight, current, __tsplusTrace);
+    return weight <= available ? tsplus_module_11.zipRight(throttleEnforceIOLoop(costFn, units, duration, burst, available - weight, current, __tsplusTrace))(tsplus_module_10.writeNow(inp)) : throttleEnforceIOLoop(costFn, units, duration, burst, available - weight, current, __tsplusTrace);
   }, __tsplusTrace)(costFn(inp))), tsplus_module_10.failNow, () => tsplus_module_10.unit);
 }
 /**
@@ -2231,11 +1950,9 @@ function throttleEnforceIOLoop(costFn, units, duration, burst, tokens, timestamp
  *
  * @tsplus pipeable fncts.io.Stream throttleEnforceIO
  */
-
-
 function throttleEnforceIO_1(costFn, units, duration, burst = 0, __tsplusTrace) {
   return sa => {
-    return new Stream(tsplus_module_11.flatMap(current => tsplus_module_10.pipeTo(throttleEnforceIOLoop(costFn, units, duration, burst, units, current, __tsplusTrace))(sa.channel))(tsplus_module_10.fromIO(() => tsplus_module_37.currentTime)));
+    return new Stream(tsplus_module_11.flatMap(current => tsplus_module_10.pipeTo(throttleEnforceIOLoop(costFn, units, duration, burst, units, current, __tsplusTrace))(sa.channel))(tsplus_module_10.fromIO(() => tsplus_module_42.currentTime)));
   };
 }
 /**
@@ -2244,11 +1961,9 @@ function throttleEnforceIO_1(costFn, units, duration, burst = 0, __tsplusTrace)
  *
  * @tsplus pipeable fncts.io.Stream toHub
  */
-
-
 function toHub_1(capacity, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.flatMap(hub => tsplus_module_1.map(() => hub, __tsplusTrace)(tsplus_module_1.fork(runIntoHubScoped_1(hub, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_29.makeBounded(capacity, __tsplusTrace), _ => _.shutdown, __tsplusTrace));
+    return tsplus_module_1.flatMap(hub => tsplus_module_1.map(() => hub, __tsplusTrace)(tsplus_module_32.fork(runIntoHubScoped_1(hub, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_33.makeBounded(capacity, __tsplusTrace), _ => tsplus_module_33.shutdown(_, __tsplusTrace), __tsplusTrace));
   };
 }
 /**
@@ -2256,10 +1971,8 @@ function toHub_1(capacity, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream toPull
  */
-
-
 function toPull_1(stream, __tsplusTrace) {
-  return tsplus_module_1.map(io => tsplus_module_1.flatMap(r => tsplus_module_4.match(() => tsplus_module_1.failNow(tsplus_module_3.nothing(), __tsplusTrace), tsplus_module_1.succeedNow)(r), __tsplusTrace)(tsplus_module_1.mapError(tsplus_module_3.just, __tsplusTrace)(io)), __tsplusTrace)(tsplus_module_58.toPull(stream.channel));
+  return tsplus_module_1.map(io => tsplus_module_1.flatMap(r => tsplus_module_4.match(() => tsplus_module_1.failNow(tsplus_module_3.nothing(), __tsplusTrace), tsplus_module_1.succeedNow)(r), __tsplusTrace)(tsplus_module_1.mapError(tsplus_module_3.just, __tsplusTrace)(io)), __tsplusTrace)(tsplus_module_64.toPull(stream.channel));
 }
 /**
  * Converts the stream to a managed queue of chunks. After the managed queue is used,
@@ -2267,40 +1980,33 @@ function toPull_1(stream, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream toQueue
  */
-
-
 function toQueue_1(capacity = 2, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_1.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeBounded(capacity, __tsplusTrace), _ => _.shutdown, __tsplusTrace));
+    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_32.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeBounded(capacity, __tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream toQueueDropping
  */
-
-
 export function toQueueDropping(capacity = 2, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_1.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeDropping(capacity, __tsplusTrace), _ => _.shutdown, __tsplusTrace));
+    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_32.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeDropping(capacity, __tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream toQueueOfElements
  */
-
 function toQueueOfElements_1(capacity = 2, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_1.fork(runIntoElementsScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeBounded(capacity, __tsplusTrace), _ => _.shutdown, __tsplusTrace));
+    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_32.fork(runIntoElementsScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeBounded(capacity, __tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace));
   };
 }
 /**
  * @tsplus pipeable fncts.io.Stream toQueueSliding
  */
-
-
 export function toQueueSliding(capacity = 2, __tsplusTrace) {
   return stream => {
-    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_1.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeSliding(capacity, __tsplusTrace), _ => _.shutdown, __tsplusTrace));
+    return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_32.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeSliding(capacity, __tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace));
   };
 }
 /**
@@ -2309,21 +2015,17 @@ export function toQueueSliding(capacity = 2, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Stream toQueueUnbounded
  */
-
 function toQueueUnbounded_1(stream, __tsplusTrace) {
-  return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_1.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_26.acquireRelease(() => tsplus_module_25.makeUnbounded(__tsplusTrace), _ => _.shutdown, __tsplusTrace));
+  return tsplus_module_1.flatMap(queue => tsplus_module_1.map(() => queue, __tsplusTrace)(tsplus_module_32.fork(runIntoQueueScoped_1(queue, __tsplusTrace)(stream), __tsplusTrace)), __tsplusTrace)(tsplus_module_30.acquireRelease(() => tsplus_module_29.makeUnbounded(__tsplusTrace), _ => tsplus_module_27.shutdown(_, __tsplusTrace), __tsplusTrace));
 }
-
 function unfoldChunkIOLoop(s, f, __tsplusTrace) {
-  return tsplus_module_10.unwrap(() => tsplus_module_1.map(m => tsplus_module_17.match(() => tsplus_module_10.unit, ([as, s]) => tsplus_module_11.flatMap(() => unfoldChunkIOLoop(s, f, __tsplusTrace))(tsplus_module_10.writeNow(as)))(m), __tsplusTrace)(f(s)));
+  return tsplus_module_10.unwrap(() => tsplus_module_1.map(m => tsplus_module_20.match(() => tsplus_module_10.unit, ([as, s]) => tsplus_module_11.flatMap(() => unfoldChunkIOLoop(s, f, __tsplusTrace))(tsplus_module_10.writeNow(as)))(m), __tsplusTrace)(f(s)));
 }
 /**
  * Creates a stream by effectfully peeling off the "layers" of a value of type `S`
  *
  * @tsplus static fncts.io.StreamOps unfoldChunkIO
  */
-
-
 function unfoldChunkIO_1(s, f, __tsplusTrace) {
   return new Stream(unfoldChunkIOLoop(s, f, __tsplusTrace));
 }
@@ -2332,37 +2034,29 @@ function unfoldChunkIO_1(s, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps unfoldIO
  */
-
-
 function unfoldIO_1(s, f, __tsplusTrace) {
-  return unfoldChunkIO_1(s, _ => tsplus_module_1.map(m => tsplus_module_33.map(([a, s]) => tuple(tsplus_module_16.single(a), s))(m), __tsplusTrace)(f(_)), __tsplusTrace);
+  return unfoldChunkIO_1(s, _ => tsplus_module_1.map(m => tsplus_module_38.map(([a, s]) => tuple(tsplus_module_19.single(a), s))(m), __tsplusTrace)(f(_)), __tsplusTrace);
 }
-
 function unfoldChunkLoop(s, f, __tsplusTrace) {
-  return tsplus_module_17.match(() => tsplus_module_10.unit, ([as, s]) => tsplus_module_11.flatMap(() => unfoldChunkLoop(s, f, __tsplusTrace))(tsplus_module_10.writeNow(as)))(f(s));
+  return tsplus_module_20.match(() => tsplus_module_10.unit, ([as, s]) => tsplus_module_11.flatMap(() => unfoldChunkLoop(s, f, __tsplusTrace))(tsplus_module_10.writeNow(as)))(f(s));
 }
 /**
  * @tsplus static fncts.io.StreamOps unfoldChunk
  */
-
-
 function unfoldChunk_1(s, f, __tsplusTrace) {
   return new Stream(tsplus_module_10.defer(() => unfoldChunkLoop(s, f, __tsplusTrace)));
 }
 /**
  * @tsplus static fncts.io.StreamOps unfold
  */
-
-
 export function unfold(s, f, __tsplusTrace) {
-  return unfoldChunk_1(s, s => tsplus_module_33.map(([a, s]) => tuple(tsplus_module_16.single(a), s))(f(s)), __tsplusTrace);
+  return unfoldChunk_1(s, s => tsplus_module_38.map(([a, s]) => tuple(tsplus_module_19.single(a), s))(f(s)), __tsplusTrace);
 }
 /**
  * Creates a stream produced from an IO
  *
  * @tsplus static fncts.io.StreamOps unwrap
  */
-
 function unwrap_1(stream, __tsplusTrace) {
   return flatten_1(fromIO_1(stream, __tsplusTrace), __tsplusTrace);
 }
@@ -2371,16 +2065,12 @@ function unwrap_1(stream, __tsplusTrace) {
  *
  * @tsplus static fncts.io.StreamOps unwrapScoped
  */
-
-
 function unwrapScoped_1(stream, __tsplusTrace) {
   return flatten_1(scoped_1(() => stream, __tsplusTrace), __tsplusTrace);
 }
 /**
  * @tsplus getter fncts.io.Stream zipWithIndex
  */
-
-
 export function zipWithIndex_(self, __tsplusTrace) {
   return mapAccum_1(0, (index, a) => [index + 1, [a, index]], __tsplusTrace)(self);
 }
@@ -2395,14 +2085,12 @@ export function zipWithIndex_(self, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Stream zipWithLatest
  */
-
 export function zipWithLatest(fb, f, __tsplusTrace) {
   return fa => {
     function pullNonEmpty(pull, __tsplusTrace) {
       return tsplus_module_1.flatMap(chunk => tsplus_module_12.isNonEmpty(chunk) ? pullNonEmpty(pull, __tsplusTrace) : tsplus_module_1.succeedNow(chunk, __tsplusTrace), __tsplusTrace)(pull);
     }
-
-    return fromPull_1(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => toPull_1(flatMap_1(([l, r, leftFirst]) => flatMap_1(latest => concat_1(flatMap_1(fromChunkNow_1, __tsplusTrace)(mapIO_1(ab => tsplus_module_4.match(leftChunk => latest.modify(([_, rightLatest]) => tuple(tsplus_module_12.map(a => f(a, rightLatest))(leftChunk), tuple(tsplus_module_12.unsafeGet(leftChunk.length - 1)(leftChunk), rightLatest)), __tsplusTrace), rightChunk => latest.modify(([leftLatest, _]) => tuple(tsplus_module_12.map(b => f(leftLatest, b))(rightChunk), tuple(leftLatest, tsplus_module_12.unsafeGet(rightChunk.length - 1)(rightChunk))), __tsplusTrace))(ab), __tsplusTrace)(mergeEither_1(repeatIOMaybe_1(right, __tsplusTrace), __tsplusTrace)(repeatIOMaybe_1(left, __tsplusTrace)))), __tsplusTrace)(fromChunk_1(() => leftFirst ? tsplus_module_12.map(b => f(tsplus_module_12.unsafeGet(l.length - 1)(l), b))(r) : tsplus_module_12.map(a => f(a, tsplus_module_12.unsafeGet(r.length - 1)(r)))(l), __tsplusTrace)), __tsplusTrace)(fromIO_1(tsplus_module_6.make(() => tuple(tsplus_module_12.unsafeGet(l.length - 1)(l), tsplus_module_12.unsafeGet(r.length - 1)(r)), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(fromIOMaybe_1(tsplus_module_21.raceWith(() => right, (leftDone, rightFiber) => tsplus_module_1.zipWith(tsplus_module_19.join(rightFiber, __tsplusTrace), (l, r) => tuple(l, r, true), __tsplusTrace)(tsplus_module_1.fromExitNow(leftDone, __tsplusTrace)), (rightDone, leftFiber) => tsplus_module_1.zipWith(tsplus_module_19.join(leftFiber, __tsplusTrace), (r, l) => tuple(l, r, false), __tsplusTrace)(tsplus_module_1.fromExitNow(rightDone, __tsplusTrace)), __tsplusTrace)(left), __tsplusTrace)), __tsplusTrace), __tsplusTrace)(tsplus_module_1.map(pullNonEmpty, __tsplusTrace)(toPull_1(fb, __tsplusTrace))), __tsplusTrace)(tsplus_module_1.map(pullNonEmpty, __tsplusTrace)(toPull_1(fa, __tsplusTrace))), __tsplusTrace);
+    return fromPull_1(tsplus_module_1.flatMap(left => tsplus_module_1.flatMap(right => toPull_1(flatMap_1(([l, r, leftFirst]) => flatMap_1(latest => concat_1(flatMap_1(fromChunkNow_1, __tsplusTrace)(mapIO_1(ab => tsplus_module_4.match(leftChunk => tsplus_module_15.modify(([_, rightLatest]) => tuple(tsplus_module_12.map(a => f(a, rightLatest))(leftChunk), tuple(tsplus_module_12.unsafeGet(leftChunk.length - 1)(leftChunk), rightLatest)), __tsplusTrace)(latest), rightChunk => tsplus_module_15.modify(([leftLatest, _]) => tuple(tsplus_module_12.map(b => f(leftLatest, b))(rightChunk), tuple(leftLatest, tsplus_module_12.unsafeGet(rightChunk.length - 1)(rightChunk))), __tsplusTrace)(latest))(ab), __tsplusTrace)(mergeEither_1(repeatIOMaybe_1(right, __tsplusTrace), __tsplusTrace)(repeatIOMaybe_1(left, __tsplusTrace)))), __tsplusTrace)(fromChunk_1(() => leftFirst ? tsplus_module_12.map(b => f(tsplus_module_12.unsafeGet(l.length - 1)(l), b))(r) : tsplus_module_12.map(a => f(a, tsplus_module_12.unsafeGet(r.length - 1)(r)))(l), __tsplusTrace)), __tsplusTrace)(fromIO_1(tsplus_module_6.make(() => tuple(tsplus_module_12.unsafeGet(l.length - 1)(l), tsplus_module_12.unsafeGet(r.length - 1)(r)), __tsplusTrace), __tsplusTrace)), __tsplusTrace)(fromIOMaybe_1(tsplus_module_24.raceWith(() => right, (leftDone, rightFiber) => tsplus_module_1.zipWith(tsplus_module_22.join(rightFiber, __tsplusTrace), (l, r) => tuple(l, r, true), __tsplusTrace)(tsplus_module_1.fromExitNow(leftDone, __tsplusTrace)), (rightDone, leftFiber) => tsplus_module_1.zipWith(tsplus_module_22.join(leftFiber, __tsplusTrace), (r, l) => tuple(l, r, false), __tsplusTrace)(tsplus_module_1.fromExitNow(rightDone, __tsplusTrace)), __tsplusTrace)(left), __tsplusTrace)), __tsplusTrace), __tsplusTrace)(tsplus_module_1.map(pullNonEmpty, __tsplusTrace)(toPull_1(fb, __tsplusTrace))), __tsplusTrace)(tsplus_module_1.map(pullNonEmpty, __tsplusTrace)(toPull_1(fa, __tsplusTrace))), __tsplusTrace);
   };
 }
 //# sourceMappingURL=api.mjs.map