diff --git a/manifest/main.ml b/manifest/main.ml
index dcddfdaf6f941aff482cae0d36eb0349431a47fb..6cef99aa04db10c96db1f6b0020b1b52b1557e4c 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3257,25 +3257,6 @@ end = struct
       in
       ()
 
-    let disabled_warnings_to_string l =
-      let int_ranges l =
-        List.sort_uniq compare l
-        |> List.fold_left
-             (fun acc x ->
-               match acc with
-               | [] -> [(x, x)]
-               | (l, u) :: acc when succ u = x -> (l, x) :: acc
-               | _ -> (x, x) :: acc)
-             []
-        |> List.rev
-      in
-      let range_to_flag (x, y) =
-        if x = y then sf "-%d" x
-        else if x + 1 = y then sf "-%d-%d" x y
-        else sf "-%d..%d" x y
-      in
-      List.map range_to_flag (int_ranges l) |> String.concat ""
-
     let make ~name =
       let name_underscore = Name.name_underscore name in
       let name_dash = Name.name_dash name in
@@ -3310,26 +3291,18 @@ end = struct
         in
         Dune.V s_expr
       in
-      let warnings =
-        let disabled_by_default = [4; 40; 41; 42; 44; 45; 48; 70] in
-        let disabled_warnings =
-          match number with
-          (* [Other] and [Alpha] protocols can be edited and should be
-             fixed whenever a warning that we care about triggers. We
-             only want to disable a limited set of warnings *)
-          | Other | Alpha -> disabled_by_default
-          (* [V _] protocols can't be edited to accommodate warnings, we need to disable warnings instead. *)
-          | V _ as number ->
-              let disabled_extra =
-                if N.(number >= 014) then []
-                else if N.(number >= 011) then [51]
-                else [6; 7; 9; 16; 29; 32; 51; 60; 67; 68]
-              in
-              disabled_by_default @ disabled_extra
-        in
-        sf "+a%s" (disabled_warnings_to_string disabled_warnings)
+      let disable_warnings =
+        match number with
+        (* [Other] and [Alpha] protocols can be edited and should be
+           fixed whenever a warning that we care about triggers. We
+           only want to disable a limited set of warnings *)
+        | Other | Alpha -> []
+        (* [V _] protocols can't be edited to accomodate warnings, we need to disable warnings instead. *)
+        | V _ as number ->
+            if N.(number >= 014) then []
+            else if N.(number >= 011) then [51]
+            else [6; 7; 9; 16; 29; 32; 51; 60; 67; 68]
       in
-      let warn_error = "+a" in
       let environment =
         public_lib
           (sf "tezos-protocol-%s.environment" name_dash)
@@ -3371,8 +3344,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
             (Flags.standard
                ~nopervasives:true
                ~nostdlib:true
-               ~warnings
-               ~warn_error
+               ~disable_warnings
                ())
           ~deps:[environment |> open_ ~m:"Environment"]
           ~opens:["Pervasives"; "Error_monad"]
@@ -3394,7 +3366,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
                   name_underscore
             | Alpha | V _ -> "Tezos/Protocol: economic-protocol definition")
           ~modules:["Protocol"]
-          ~flags:(Flags.no_standard ~nopervasives:true ~warn_error ~warnings ())
+          ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ())
           ~deps:
             [
               tezos_protocol_environment;
@@ -3470,7 +3442,7 @@ include Tezos_raw_protocol_%s.Main
             (* The instrumentation is removed as it can lead to a stack overflow *)
             (* https://gitlab.com/tezos/tezos/-/issues/1927 *)
           ~bisect_ppx:false
-          ~flags:(Flags.no_standard ~nopervasives:true ~warn_error ~warnings ())
+          ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ())
           ~opam_only_deps:[tezos_protocol_compiler_tezos_protocol_packer]
           ~deps:
             [
@@ -3523,7 +3495,7 @@ include Tezos_raw_protocol_%s.Main
                  `tezos-node`")
           ~modules:["Registerer"]
           ~linkall:true
-          ~flags:(Flags.standard ~warnings ~warn_error ())
+          ~flags:(Flags.standard ~disable_warnings ())
           ~deps:[main; tezos_protocol_updater; tezos_protocol_environment]
           ~dune:
             Dune.
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 47eab1d6fcd7b52698c94f0cc017da3db6c7ff09..32a64b6095b80f64496f52d1e913a828ec82c795 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -721,37 +721,47 @@ end
 module Flags = struct
   type t = {standard : bool; rest : Dune.s_expr list}
 
-  type maker =
-    ?nopervasives:bool ->
-    ?nostdlib:bool ->
-    ?opaque:bool ->
-    ?warnings:string ->
-    ?warn_error:string ->
-    unit ->
-    t
-
-  let if_true b name = if b then Dune.S name else Dune.E
-
-  let if_some o name = match o with None -> Dune.E | Some x -> H [S name; S x]
+  let if_true b name = if b then Some (Dune.S name) else None
+
+  let disable_warnings_to_string ws =
+    let int_ranges l =
+      List.sort_uniq compare l
+      |> List.fold_left
+           (fun acc x ->
+             match acc with
+             | [] -> [(x, x)]
+             | (l, u) :: acc when succ u = x -> (l, x) :: acc
+             | _ -> (x, x) :: acc)
+           []
+      |> List.rev
+    in
+    let range_to_flag (x, y) =
+      if x = y then Printf.sprintf "-%d" x
+      else if x + 1 = y then Printf.sprintf "-%d-%d" x y
+      else Printf.sprintf "-%d..%d" x y
+    in
+    List.map range_to_flag (int_ranges ws) |> String.concat ""
 
-  let make ~standard ?(nopervasives = false) ?(nostdlib = false)
-      ?(opaque = false) ?warnings ?warn_error () =
+  let standard ?disable_warnings ?(nopervasives = false) ?(nostdlib = false)
+      ?(opaque = false) () =
     {
-      standard;
+      standard = true;
       rest =
-        [
-          if_some warnings "-w";
-          if_some warn_error "-warn-error";
-          if_true nostdlib "-nostdlib";
-          if_true nopervasives "-nopervasives";
-          if_true opaque "-opaque";
-        ];
+        List.filter_map
+          (fun x -> x)
+          [
+            (match disable_warnings with
+            | None | Some Stdlib.List.[] -> None
+            | Some l ->
+                if List.exists (fun x -> x <= 0) l then
+                  invalid_arg "Warning number must be positive" ;
+                Some Dune.(H [S "-w"; S (disable_warnings_to_string l)]));
+            if_true nostdlib "-nostdlib";
+            if_true nopervasives "-nopervasives";
+            if_true opaque "-opaque";
+          ];
     }
 
-  let standard = make ~standard:true
-
-  let no_standard = make ~standard:false
-
   let include_ f = {standard = false; rest = Dune.[S ":include"; S f]}
 end
 
@@ -1717,7 +1727,7 @@ let generate_dune (internal : Target.internal) =
   in
   let flags =
     match (internal.flags, open_flags) with
-    | None, [] -> None
+    | None, [] | Some {standard = true; rest = []}, [] -> None
     | flags, _ ->
         let flags =
           match flags with None -> Flags.standard () | Some flags -> flags
diff --git a/manifest/manifest.mli b/manifest/manifest.mli
index 2d479e8167912bf1d3cb5e15786727ef7bed43c4..2de00cfa22f77d4f4ddc17097f18d51a8c13b00e 100644
--- a/manifest/manifest.mli
+++ b/manifest/manifest.mli
@@ -460,33 +460,24 @@ module Flags : sig
   (** OCaml flags *)
   type t
 
-  (** Functions that build OCaml flags.
+  (** Extend standard flags with custom ones.
+
+      - [disable_warnings]: disable additional warnings
 
       - [nopervasives]: if [true], add [-nopervasives] to the list of flags.
 
       - [nostdlib]: if [true], add [-nostdlib] to the list of flags.
 
       - [opaque]: if [true], add [-opaque] to the list of flags.
-
-      - [warnings]: the argument passed to the -w flag when building.
-
-      - [warn_error]: the argument passed to the -warn-error flag when building.
    *)
-  type maker =
+  val standard :
+    ?disable_warnings:int list ->
     ?nopervasives:bool ->
     ?nostdlib:bool ->
     ?opaque:bool ->
-    ?warnings:string ->
-    ?warn_error:string ->
     unit ->
     t
 
-  (** Extend standard flags with custom ones. *)
-  val standard : maker
-
-  (** Override standard flags with custom ones. *)
-  val no_standard : maker
-
   (** [include_ file] will use the flags defined in the file [file]. *)
   val include_ : string -> t
 end
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index ed6adb17ff06c56afb685a8e6561c05e16c08afc..e8aa538f2a6d94b757ea203cbd95b15dcf09cdeb 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_000_Ps9mPmXa.Environment
@@ -44,8 +43,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-000-Ps9mPmXa.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -78,8 +77,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-000-Ps9mPmXa.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -106,8 +105,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index ee20955f79e43409eb410871eab4e7e9c9388fdd..db6cb1a285aa72ac707c8ff639d2b7a848cb4e4d 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_001_PtCJ7pwo.Environment
@@ -111,8 +110,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-001-PtCJ7pwo.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -276,8 +275,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-001-PtCJ7pwo.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -369,8 +368,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index be4f00bd7ba0ea1c496e41416bf3a67068556382..0f6105b4d5abbfe4a1a2b40072d5391c80f976f2 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_002_PsYLVpVv.Environment
@@ -111,8 +110,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-002-PsYLVpVv.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -276,8 +275,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-002-PsYLVpVv.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -369,8 +368,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index 368fc8f28fae8be90b2bdc630f2009ea2f3615a6..9d219b0abbb77a481b84ce634b201714d28a6ff9 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_003_PsddFKi3.Environment
@@ -112,8 +111,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-003-PsddFKi3.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -279,8 +278,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-003-PsddFKi3.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -373,8 +372,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index 0dd9b015298c6ba2c59624d483442ed929b9a4b5..e7e22d0ce8e7b089507ed80c0f7d261c2be04062 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_004_Pt24m4xi.Environment
@@ -112,8 +111,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-004-Pt24m4xi.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -279,8 +278,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-004-Pt24m4xi.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -373,8 +372,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index 6e3c40b05969214bfec8584734d0d47adfc84a61..29215af4ef803e7a2f5946b69a40379b0615ccd6 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_005_PsBABY5H.Environment
@@ -113,8 +112,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-005-PsBABY5H.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -282,8 +281,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-005-PsBABY5H.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -377,8 +376,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index 062bb6e61ad465a02f0d82c8de92d0e3f9cd0c8e..7f45cb4b9b4ba82ff02defa1eff8431da1005bd8 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_005_PsBabyM1.Environment
@@ -113,8 +112,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-005-PsBabyM1.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -282,8 +281,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-005-PsBabyM1.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -377,8 +376,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index f93585fecb851e147c596ba2537f282df10f0cc2..cb8fd82bb8c8c92acec7cac355c2276d791bba4e 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_006_PsCARTHA.Environment
@@ -113,8 +112,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-006-PsCARTHA.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -282,8 +281,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-006-PsCARTHA.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -377,8 +376,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index 0c35ec7ec487213769e6e02be6280cd119685529..dbedcc9f621d884fe650c61e8c1a22fd0eb036f4 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_007_PsDELPH1.Environment
@@ -115,8 +114,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-007-PsDELPH1.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -288,8 +287,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-007-PsDELPH1.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -385,8 +384,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index 6ca589a80bfe9e644cd411dccfe818148240ecc2..4c03e1a4d0a69d6feb51b96377243a8082a02e50 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_008_PtEdo2Zk.Environment
@@ -120,8 +119,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-008-PtEdo2Zk.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -303,8 +302,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-008-PtEdo2Zk.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -405,8 +404,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index cd699728bef71f6a8d79219f9550a28cce0d41ca..fb4a6d5a0aa63bab4d897116f1113d5a0a310655 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_008_PtEdoTez.Environment
@@ -120,8 +119,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-008-PtEdoTez.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -303,8 +302,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-008-PtEdoTez.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -405,8 +404,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index f845acd605736a781785805d9ad9ab48d78ff8b2..cf8c3e9eea134ae6bb84c4d83eb3621c3cd6922c 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_009_PsFLoren.Environment
@@ -123,8 +122,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-009-PsFLoren.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -312,8 +311,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-009-PsFLoren.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -417,8 +416,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index 89ef9afc84bf918345b98306f8cd984bc1963f18..f99566fd1f108fcd31c0b372fc502212f2c02ae8 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  -w -6-7-9-16-29-32-51-60-67-68
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_010_PtGRANAD.Environment
@@ -128,8 +127,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-010-PtGRANAD.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Protocol))
 
@@ -327,8 +326,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-010-PtGRANAD.raw)
  (flags
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a
+  (:standard)
+  -w -6-7-9-16-29-32-51-60-67-68
   -nopervasives)
  (modules Functor))
 
@@ -437,8 +436,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
-  -warn-error +a)
+  -w -6-7-9-16-29-32-51-60-67-68)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index a877091933d71001aa0bd8a15b180558f8ffcf8a..8aa83538d5697c41d511bf65c18661844dfd0db9 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  -w -51
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_011_PtHangz2.Environment
@@ -141,8 +140,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Protocol))
 
@@ -366,8 +365,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Functor))
 
@@ -489,8 +488,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a)
+  -w -51)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index cf583aba6a103b0b7184605edf9e3ac528fc8baf..0ad6bd4c9d1b7314d63e786c4dd38dc0f81e2b13 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  -w -51
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_012_Psithaca.Environment
@@ -158,8 +157,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Protocol))
 
@@ -417,8 +416,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Functor))
 
@@ -557,8 +556,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a)
+  -w -51)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index 668dac8b6665f4d53708541ad3e25d461ce70418..b7b598c60bf7f7dc78477d80e23d94d75c7ba710 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -26,8 +26,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  -w -51
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_013_PtJakart.Environment
@@ -223,8 +222,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Protocol))
 
@@ -614,8 +613,8 @@
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
  (flags
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a
+  (:standard)
+  -w -51
   -nopervasives)
  (modules Functor))
 
@@ -820,8 +819,7 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-51-70
-  -warn-error +a)
+  -w -51)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index 66f2ede09ba7f7af05f735bea4c02364bbbce4a7..2fbd4b52fc8e21c68dee319bf559d0abc87ae0d8 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -26,8 +26,6 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_alpha.Environment
@@ -242,8 +240,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Protocol))
 
@@ -673,8 +670,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Functor))
 
@@ -897,10 +893,6 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags
-  (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index 7db2c5c724ff12b5854a8445e272fa6877a628e2..b363b6cd444fd7f0e7502b2adc68249c8b8a7a08 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -26,8 +26,6 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_demo_counter.Environment
@@ -53,8 +51,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Protocol))
 
@@ -102,8 +99,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Functor))
 
@@ -135,10 +131,6 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags
-  (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index df7a83ac13eea089b8fbc4caf10452e739b0a1d3..025f7be86221badf094fd6af08f19a5928d08a4c 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -26,8 +26,6 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_demo_noops.Environment
@@ -44,8 +42,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Protocol))
 
@@ -74,8 +71,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Functor))
 
@@ -98,10 +94,6 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags
-  (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index c66c80f8a265d119073c6d829c94c8d4e9046898..fda7cba3820deed3b5626c6eded4d34ab185df4d 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -26,8 +26,6 @@
  (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
   -nostdlib
   -nopervasives
   -open Tezos_protocol_environment_genesis.Environment
@@ -44,8 +42,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Protocol))
 
@@ -78,8 +75,7 @@
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
  (flags
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a
+  (:standard)
   -nopervasives)
  (modules Functor))
 
@@ -104,10 +100,6 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags
-  (:standard)
-  -w +a-4-40..42-44-45-48-70
-  -warn-error +a)
  (modules Registerer))
 
 (rule