diff --git a/qtest/jbuild b/qtest/jbuild
index 05351c29..a321fb6a 100644
--- a/qtest/jbuild
+++ b/qtest/jbuild
@@ -16,6 +16,7 @@
   ((name run_qtest)
    (modes (native))
    (modules (run_qtest))
+   (flags (:standard -nolabels))
    (libraries (sequence gen qcheck containers containers.unix
                containers.data containers.thread containers.iter
                containers.sexp uutf))
diff --git a/src/core/CCArray.ml b/src/core/CCArray.ml
index 4fa0a86f..a075efa9 100644
--- a/src/core/CCArray.ml
+++ b/src/core/CCArray.ml
@@ -686,6 +686,6 @@ let sort_generic (type arr)(type elt)
 (*$Q & ~count:300
   arr_arbitrary (fun a -> \
     let a1 = Array.copy a and a2 = Array.copy a in \
-    Array.sort CCInt.compare a1; sort_generic ~cmp:CCInt.compare (module IA) a2; \
+    Array.sort CCInt.compare a1; sort_generic (module IA) ~cmp:CCInt.compare a2; \
     a1 = a2 )
 *)
diff --git a/src/core/CCFormat.ml b/src/core/CCFormat.ml
index a9359cb6..dbc2447d 100644
--- a/src/core/CCFormat.ml
+++ b/src/core/CCFormat.ml
@@ -394,7 +394,7 @@ let ksprintf ?margin ~f fmt =
 
 (*$= & ~printer:CCFormat.(to_string (opt string))
   (Some "hello world") \
-    (ksprintf "hello %a" CCFormat.string "world" ~f:(fun s -> Some s))
+    (ksprintf ~f:(fun s -> Some s) "hello %a" CCFormat.string "world")
 *)
 
 module Dump = struct
diff --git a/src/core/CCHashtbl.ml b/src/core/CCHashtbl.ml
index e5c67d62..e092b912 100644
--- a/src/core/CCHashtbl.ml
+++ b/src/core/CCHashtbl.ml
@@ -95,12 +95,12 @@ module Poly = struct
 
   (*$R
     let tbl = Hashtbl.create 32 in
-    update tbl ~k:1 ~f:(fun _ _ -> Some "1");
+    update tbl ~f:(fun _ _ -> Some "1") ~k:1;
     assert_equal (Some "1") (get tbl 1);
-    update tbl ~k:2 ~f:(fun _ v->match v with Some _ -> assert false | None -> Some "2");
+    update tbl ~f:(fun _ v->match v with Some _ -> assert false | None -> Some "2") ~k:2;
     assert_equal (Some "2") (get tbl 2);
     assert_equal 2 (Hashtbl.length tbl);
-    update tbl ~k:1 ~f:(fun _ _ -> None);
+    update tbl ~f:(fun _ _ -> None) ~k:1;
     assert_equal None (get tbl 1);
   *)
 
@@ -113,13 +113,13 @@ module Poly = struct
 
   (*$R
     let tbl = Hashtbl.create 32 in
-    let v1 = get_or_add tbl ~k:1 ~f:(fun _ -> "1") in
+    let v1 = get_or_add tbl ~f:(fun _ -> "1") ~k:1 in
     assert_equal "1" v1;
     assert_equal (Some "1") (get tbl 1);
-    let v2 = get_or_add tbl ~k:2 ~f:(fun _ ->"2") in
+    let v2 = get_or_add tbl ~f:(fun _ ->"2") ~k:2 in
     assert_equal "2" v2;
     assert_equal (Some "2") (get tbl 2);
-    assert_equal "2" (get_or_add tbl ~k:2 ~f:(fun _ -> assert false));
+    assert_equal "2" (get_or_add tbl ~f:(fun _ -> assert false) ~k:2);
     assert_equal 2 (Hashtbl.length tbl);
     ()
   *)
diff --git a/src/core/CCList.ml b/src/core/CCList.ml
index 30ef12a1..aba63af2 100644
--- a/src/core/CCList.ml
+++ b/src/core/CCList.ml
@@ -779,10 +779,10 @@ let sublists_of_len ?(last=fun _ -> None) ?offset n l =
   [[1;2;3]] (subs 3 [1;2;3;4])
   [[1;2]; [3;4]; [5;6]] (subs 2 [1;2;3;4;5;6])
   [] (subs 3 [1;2])
-  [[1;2];[3;4]] (subs 2 ~offset:2 [1;2;3;4])
-  [[1;2];[2;3]] (subs 2 ~offset:1 [1;2;3])
-  [[1;2];[4;5]] (subs 2 ~offset:3 [1;2;3;4;5;6])
-  [[1;2;3];[4]] (subs 3 ~last:CCOpt.return [1;2;3;4])
+  [[1;2];[3;4]] (subs ~offset:2 2 [1;2;3;4])
+  [[1;2];[2;3]] (subs ~offset:1 2 [1;2;3])
+  [[1;2];[4;5]] (subs ~offset:3 2 [1;2;3;4;5;6])
+  [[1;2;3];[4]] (subs ~last:CCOpt.return 3 [1;2;3;4])
   [[1;2]; [3;4]] (subs 2 [1;2;3;4;5])
 *)
 
@@ -1374,14 +1374,14 @@ module Assoc = struct
           | Some y' -> (x,y') :: rest)
   (*$=
     [1,"1"; 2,"22"] \
-      (Assoc.update ~eq:CCInt.equal 2 [1,"1"; 2,"2"] \
-        ~f:(function Some "2" -> Some "22" | _ -> assert false) |> lsort)
+      (Assoc.update ~eq:CCInt.equal \
+        ~f:(function Some "2" -> Some "22" | _ -> assert false) 2 [1,"1"; 2,"2"] |> lsort)
     [1,"1"; 3,"3"] \
-      (Assoc.update ~eq:CCInt.equal 2 [1,"1"; 2,"2"; 3,"3"] \
-        ~f:(function Some "2" -> None | _ -> assert false) |> lsort)
+      (Assoc.update ~eq:CCInt.equal \
+        ~f:(function Some "2" -> None | _ -> assert false) 2 [1,"1"; 2,"2"; 3,"3"] |> lsort)
     [1,"1"; 2,"2"; 3,"3"] \
-      (Assoc.update ~eq:CCInt.equal 3 [1,"1"; 2,"2"] \
-        ~f:(function None -> Some "3" | _ -> assert false) |> lsort)
+      (Assoc.update ~eq:CCInt.equal \
+        ~f:(function None -> Some "3" | _ -> assert false) 3 [1,"1"; 2,"2"] |> lsort)
   *)
 
   let remove ~eq x l =
diff --git a/src/core/CCString.ml b/src/core/CCString.ml
index 47879c71..e073f781 100644
--- a/src/core/CCString.ml
+++ b/src/core/CCString.ml
@@ -285,7 +285,7 @@ let find ?(start=0) ~sub =
   1 (find ~sub:"bc" "abcd")
   ~-1 (find ~sub:"bc" "abd")
   1 (find ~sub:"a" "_a_a_a_")
-  6 (find ~sub:"a" ~start:5 "a1a234a")
+  6 (find ~start:5 ~sub:"a" "a1a234a")
 *)
 
 (*$Q & ~count:10_000
diff --git a/src/data/CCGraph.ml b/src/data/CCGraph.ml
index 63c889fb..81622ae6 100644
--- a/src/data/CCGraph.ml
+++ b/src/data/CCGraph.ml
@@ -341,14 +341,14 @@ let topo_sort ~eq ?rev ~tbl ~graph seq =
 
 (*$T
   let tbl = mk_table ~eq:CCInt.equal 128 in \
-  let l = topo_sort ~tbl ~eq:CCInt.equal ~graph:divisors_graph (Seq.return 42) in \
+  let l = topo_sort ~eq:CCInt.equal ~tbl ~graph:divisors_graph (Seq.return 42) in \
   List.for_all (fun (i,j) -> \
     let idx_i = CCList.find_idx ((=)i) l |> CCOpt.get_exn |> fst in \
     let idx_j = CCList.find_idx ((=)j) l |> CCOpt.get_exn |> fst in \
     idx_i < idx_j) \
     [ 42, 21; 14, 2; 3, 1; 21, 7; 42, 3]
   let tbl = mk_table ~eq:CCInt.equal 128 in \
-  let l = topo_sort ~tbl ~eq:CCInt.equal ~rev:true ~graph:divisors_graph (Seq.return 42) in \
+  let l = topo_sort ~eq:CCInt.equal ~rev:true ~tbl ~graph:divisors_graph (Seq.return 42) in \
   List.for_all (fun (i,j) -> \
     let idx_i = CCList.find_idx ((=)i) l |> CCOpt.get_exn |> fst in \
     let idx_j = CCList.find_idx ((=)j) l |> CCOpt.get_exn |> fst in \
diff --git a/src/data/CCMixtbl.ml b/src/data/CCMixtbl.ml
index e697a72e..ff3a77de 100644
--- a/src/data/CCMixtbl.ml
+++ b/src/data/CCMixtbl.ml
@@ -163,8 +163,8 @@ let bindings tbl yield =
   set ~inj:inj_int tbl "bar" 2;
   set ~inj:inj_str tbl "baaz" "hello";
   set ~inj:inj_str tbl "str" "rts";
-  let l_int = bindings_of tbl ~inj:inj_int |> Sequence.to_list in
+  let l_int = bindings_of ~inj:inj_int tbl |> Sequence.to_list in
   OUnit.assert_equal ["bar", 2; "foo", 1] (List.sort compare l_int);
-  let l_str = bindings_of tbl ~inj:inj_str |> Sequence.to_list in
+  let l_str = bindings_of ~inj:inj_str tbl |> Sequence.to_list in
   OUnit.assert_equal ["baaz", "hello"; "str", "rts"] (List.sort compare l_str);
 *)