diff --git a/tests/static-analysis/A.php b/tests/static-analysis/A.php
index c004039..bcea5a9 100644
--- a/tests/static-analysis/A.php
+++ b/tests/static-analysis/A.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\A as Combinator;
 
 /**
- * @param callable $f
+ * @param callable (int) : string $f
  * @param mixed $x
  *
- * @return mixed
+ * @return string
  */
 function test(callable $f, $x)
 {
diff --git a/tests/static-analysis/B.php b/tests/static-analysis/B.php
index 283146d..76b301e 100644
--- a/tests/static-analysis/B.php
+++ b/tests/static-analysis/B.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\B as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
- * @param mixed $x
+ * @param callable(int) : int $f
+ * @param callable(int) : int $g
+ * @param int $x
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/C.php b/tests/static-analysis/C.php
index 1504d7c..1d3d87c 100644
--- a/tests/static-analysis/C.php
+++ b/tests/static-analysis/C.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\C as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
- * @param mixed $y
+ * @param callable(int) : int $f
+ * @param int $x
+ * @param int $y
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/D.php b/tests/static-analysis/D.php
index bd9ecd1..cf8a450 100644
--- a/tests/static-analysis/D.php
+++ b/tests/static-analysis/D.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\D as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
- * @param callable $g
- * @param mixed $y
+ * @param callable(int) : int $f
+ * @param int $x
+ * @param callable(int) : int $g
+ * @param int $y
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/E.php b/tests/static-analysis/E.php
index 42c5810..6071859 100644
--- a/tests/static-analysis/E.php
+++ b/tests/static-analysis/E.php
@@ -7,11 +7,11 @@
 use loophp\combinator\Combinator\E as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
- * @param callable $g
- * @param mixed $y
- * @param mixed $z
+ * @param callable(int) : int $f
+ * @param int $x
+ * @param callable(int) : int $g
+ * @param int $y
+ * @param int $z
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/F.php b/tests/static-analysis/F.php
index 13830f7..2deb1c7 100644
--- a/tests/static-analysis/F.php
+++ b/tests/static-analysis/F.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\F as Combinator;
 
 /**
- * @param mixed $x
- * @param mixed $y
- * @param callable $f
+ * @param int $x
+ * @param int $y
+ * @param callable(int) : int $f
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/G.php b/tests/static-analysis/G.php
index 058b9dc..06000b1 100644
--- a/tests/static-analysis/G.php
+++ b/tests/static-analysis/G.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\G as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
- * @param mixed $x
- * @param mixed $y
+ * @param callable(int) : callable $f
+ * @param callable(int) : int $g
+ * @param int $x
+ * @param int $y
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/H.php b/tests/static-analysis/H.php
index be60e96..f90a122 100644
--- a/tests/static-analysis/H.php
+++ b/tests/static-analysis/H.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\H as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
- * @param mixed $y
+ * @param callable(int) : callable $f
+ * @param int $x
+ * @param int $y
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/I.php b/tests/static-analysis/I.php
index 75380a6..0b531e4 100644
--- a/tests/static-analysis/I.php
+++ b/tests/static-analysis/I.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\I as Combinator;
 
 /**
- * @param mixed $x
+ * @param int $x
  *
- * @return mixed
+ * @return int
  */
 function test($x)
 {
diff --git a/tests/static-analysis/J.php b/tests/static-analysis/J.php
index 3e8ebcf..d55c821 100644
--- a/tests/static-analysis/J.php
+++ b/tests/static-analysis/J.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\J as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
- * @param mixed $y
- * @param mixed $z
+ * @param callable(int) : callable $f
+ * @param int $x
+ * @param int $y
+ * @param int $z
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/K.php b/tests/static-analysis/K.php
index 540bb01..9808f5e 100644
--- a/tests/static-analysis/K.php
+++ b/tests/static-analysis/K.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\K as Combinator;
 
 /**
- * @param mixed $x
- * @param mixed $y
+ * @param int $x
+ * @param int $y
  *
- * @return mixed
+ * @return int
  */
 function test($x, $y)
 {
diff --git a/tests/static-analysis/L.php b/tests/static-analysis/L.php
index 462880c..3d29358 100644
--- a/tests/static-analysis/L.php
+++ b/tests/static-analysis/L.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\L as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
+ * @param callable(int) : int $f
+ * @param callable(int) : int $g
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, callable $g)
 {
diff --git a/tests/static-analysis/M.php b/tests/static-analysis/M.php
index f1d289a..9315abe 100644
--- a/tests/static-analysis/M.php
+++ b/tests/static-analysis/M.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\M as Combinator;
 
 /**
- * @param callable $f
+ * @param callable(int) : int $f
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f)
 {
diff --git a/tests/static-analysis/O.php b/tests/static-analysis/O.php
index 412b3f6..63b9e80 100644
--- a/tests/static-analysis/O.php
+++ b/tests/static-analysis/O.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\O as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
+ * @param callable(int) : int $f
+ * @param callable(int) : int $g
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, callable $g)
 {
diff --git a/tests/static-analysis/Psi.php b/tests/static-analysis/Psi.php
index f1e25f3..b2a92f0 100644
--- a/tests/static-analysis/Psi.php
+++ b/tests/static-analysis/Psi.php
@@ -7,12 +7,12 @@
 use loophp\combinator\Combinator\Psi as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
- * @param mixed $x
- * @param mixed $y
+ * @param callable(int) : int $f
+ * @param callable(int) : int $g
+ * @param int $x
+ * @param int $y
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, callable $g, $x, $y)
 {
diff --git a/tests/static-analysis/Q.php b/tests/static-analysis/Q.php
index 9dd8598..1dcc4dd 100644
--- a/tests/static-analysis/Q.php
+++ b/tests/static-analysis/Q.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\Q as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
- * @param mixed $x
+ * @param callable(int) : callable $f
+ * @param callable(int) : callable $g
+ * @param int $x
  *
  * @return mixed
  */
diff --git a/tests/static-analysis/R.php b/tests/static-analysis/R.php
index 65a005e..83b3880 100644
--- a/tests/static-analysis/R.php
+++ b/tests/static-analysis/R.php
@@ -7,11 +7,11 @@
 use loophp\combinator\Combinator\R as Combinator;
 
 /**
- * @param mixed $x
- * @param callable $f
- * @param mixed $y
+ * @param int $x
+ * @param callable(int) : callable $f
+ * @param int $y
  *
- * @return mixed
+ * @return int
  */
 function test($x, callable $f, $y)
 {
diff --git a/tests/static-analysis/S.php b/tests/static-analysis/S.php
index df0db21..417c134 100644
--- a/tests/static-analysis/S.php
+++ b/tests/static-analysis/S.php
@@ -7,11 +7,11 @@
 use loophp\combinator\Combinator\S as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
- * @param mixed $x
+ * @param callable(int) : callable $f
+ * @param callable(int) : int $g
+ * @param int $x
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, callable $g, $x)
 {
diff --git a/tests/static-analysis/T.php b/tests/static-analysis/T.php
index d443028..3c3c22c 100644
--- a/tests/static-analysis/T.php
+++ b/tests/static-analysis/T.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\T as Combinator;
 
 /**
- * @param mixed $x
- * @param callable $f
+ * @param int $x
+ * @param callable(int) : int $f
  *
- * @return mixed
+ * @return int
  */
 function test($x, callable $f)
 {
diff --git a/tests/static-analysis/U.php b/tests/static-analysis/U.php
index 85c316a..b07444d 100644
--- a/tests/static-analysis/U.php
+++ b/tests/static-analysis/U.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\U as Combinator;
 
 /**
- * @param callable $f
- * @param callable $g
+ * @param callable(int) : int $f
+ * @param callable(int) : int $g
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, callable $g)
 {
diff --git a/tests/static-analysis/V.php b/tests/static-analysis/V.php
index 7d48a92..755bad6 100644
--- a/tests/static-analysis/V.php
+++ b/tests/static-analysis/V.php
@@ -7,11 +7,11 @@
 use loophp\combinator\Combinator\V as Combinator;
 
 /**
- * @param mixed $x
- * @param mixed $y
- * @param callable $f
+ * @param int $x
+ * @param int $y
+ * @param callable(int) : callable $f
  *
- * @return mixed
+ * @return int
  */
 function test($x, $y, callable $f)
 {
diff --git a/tests/static-analysis/W.php b/tests/static-analysis/W.php
index 456e507..10a65f8 100644
--- a/tests/static-analysis/W.php
+++ b/tests/static-analysis/W.php
@@ -7,10 +7,10 @@
 use loophp\combinator\Combinator\W as Combinator;
 
 /**
- * @param callable $f
- * @param mixed $x
+ * @param callable(int) : callable $f
+ * @param int $x
  *
- * @return mixed
+ * @return int
  */
 function test(callable $f, $x)
 {
diff --git a/tests/static-analysis/Y.php b/tests/static-analysis/Y.php
index 1137928..66e0f3f 100644
--- a/tests/static-analysis/Y.php
+++ b/tests/static-analysis/Y.php
@@ -7,9 +7,9 @@
 use loophp\combinator\Combinator\Y as Combinator;
 
 /**
- * @param callable $f
+ * @param callable(int) : callable $f
  *
- * @return mixed
+ * @return callable
  */
 function test(callable $f)
 {