diff --git a/packages/effect-lens-next/src/Lens.ts b/packages/effect-lens-next/src/Lens.ts
index 16baaf8..c7ee35a 100644
--- a/packages/effect-lens-next/src/Lens.ts
+++ b/packages/effect-lens-next/src/Lens.ts
@@ -599,16 +599,16 @@ export const mapError: {
  * Applies to `get` and `changes` while leaving `modify` unchanged.
  */
 export const tapErrorRead: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER | E2, EW, RR | R2, RW>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER | E2, EW, RR | R2, RW>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER | E2, EW, RR | R2, RW> => derive(self, {
     resolve: Effect.tapError(f),
     mapStream: Stream.tapError(f),
@@ -622,16 +622,16 @@ export const tapErrorRead: {
  * user-supplied callback unchanged.
  */
 export const tapErrorWrite: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER, EW | E2, RR, RW | R2>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER, EW | E2, RR, RW | R2>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER, EW | E2, RR, RW | R2> => derive(self, {
     resolve: parent => Effect.map(parent, resolved => ({
         value: resolved.value,
@@ -651,24 +651,24 @@ export const tapErrorWrite: {
  * failures from the user-supplied callback unchanged.
  */
 export const tapError: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER | E2, EW | E2, RR | R2, RW | R2>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER | E2, EW | E2, RR | R2, RW | R2>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER | E2, EW | E2, RR | R2, RW | R2> => derive(self, {
     resolve: parent => Effect.map(
-        Effect.tapError(parent, (error: ER) => f(error)),
+        Effect.tapError(parent, f),
         resolved => ({
             value: resolved.value,
             commit: next => Effect.flatMap(
                 next,
-                value => Effect.tapError(resolved.commit(Effect.succeed(value)), e => f(e)),
+                value => Effect.tapError(resolved.commit(Effect.succeed(value)), f),
             ),
         }),
     ),
diff --git a/packages/effect-lens/src/Lens.ts b/packages/effect-lens/src/Lens.ts
index 3b6fcbc..2b2d06a 100644
--- a/packages/effect-lens/src/Lens.ts
+++ b/packages/effect-lens/src/Lens.ts
@@ -579,16 +579,16 @@ export const mapError: {
  * Applies to `get` and `changes` while leaving `modify` unchanged.
  */
 export const tapErrorRead: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER | E2, EW, RR | R2, RW>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER | E2, EW, RR | R2, RW>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<ER>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<ER>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER | E2, EW, RR | R2, RW> => derive(self, {
     resolve: Effect.tapError(f),
     mapStream: Stream.tapError(f),
@@ -602,16 +602,16 @@ export const tapErrorRead: {
  * user-supplied callback unchanged.
  */
 export const tapErrorWrite: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER, EW | E2, RR, RW | R2>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER, EW | E2, RR, RW | R2>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<EW>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<EW>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER, EW | E2, RR, RW | R2> => derive(self, {
     resolve: parent => Effect.map(parent, resolved => ({
         value: resolved.value,
@@ -631,16 +631,16 @@ export const tapErrorWrite: {
  * failures from the user-supplied callback unchanged.
  */
 export const tapError: {
-    <A, ER, EW, RR, RW, E2, R2>(
-        f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+    <A, ER, EW, RR, RW, B, E2, R2>(
+        f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
     ): (self: Lens<A, ER, EW, RR, RW>) => Lens<A, ER | E2, EW | E2, RR | R2, RW | R2>
-    <A, ER, EW, RR, RW, E2, R2>(
+    <A, ER, EW, RR, RW, B, E2, R2>(
         self: Lens<A, ER, EW, RR, RW>,
-        f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+        f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
     ): Lens<A, ER | E2, EW | E2, RR | R2, RW | R2>
-} = Function.dual(2, <A, ER, EW, RR, RW, E2, R2>(
+} = Function.dual(2, <A, ER, EW, RR, RW, B, E2, R2>(
     self: Lens<A, ER, EW, RR, RW>,
-    f: (error: NoInfer<ER | EW>) => Effect.Effect<unknown, E2, R2>,
+    f: (error: NoInfer<ER | EW>) => Effect.Effect<B, E2, R2>,
 ): Lens<A, ER | E2, EW | E2, RR | R2, RW | R2> => derive(self, {
     resolve: parent => Effect.map(
         Effect.tapError(parent, f),