diff --git a/manifest/main.ml b/manifest/main.ml
index 857b7d47d5b9496bcf8e40a2d640bc54775f972a..4b8bc8710b997d79edc20126c2c2b33401fd341b 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -1628,8 +1628,7 @@ let tezos_protocol_environment_sigs =
     ~path:"src/lib_protocol_environment/sigs"
     ~ocaml:V.(at_least "4.12")
     ~deps:[tezos_protocol_environment_sigs_stdlib_compat]
-    ~nopervasives:true
-    ~nostdlib:true
+    ~flags:(Flags.standard ~nopervasives:true ~nostdlib:true ())
     ~modules:["V0"; "V1"; "V2"; "V3"; "V4"; "V5"; "V6"]
     ~dune:
       Dune.
@@ -1778,7 +1777,7 @@ let tezos_protocol_compiler_registerer =
     ~deps:
       [tezos_base |> open_ ~m:"TzPervasives"; tezos_protocol_environment_sigs]
     ~modules:["Registerer"]
-    ~opaque:true
+    ~flags:(Flags.standard ~opaque:true ())
     ~dune:
       Dune.
         [
@@ -3229,10 +3228,13 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
           ~opam:(sf "tezos-protocol-%s" name_dash)
           ~linkall:true
           ~modules:tezos_protocol.modules
-          ~warnings
-          ~warn_error
-          ~nopervasives:true
-          ~nostdlib:true
+          ~flags:
+            (Flags.standard
+               ~nopervasives:true
+               ~nostdlib:true
+               ~warnings
+               ~warn_error
+               ())
           ~deps:[environment |> open_ ~m:"Environment"]
           ~opens:["Pervasives"; "Error_monad"]
       in
@@ -3253,10 +3255,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end
                   name_underscore
             | Alpha | V _ -> "Tezos/Protocol: economic-protocol definition")
           ~modules:["Protocol"]
-          ~warnings
-          ~warn_error
-          ~nopervasives:true
-          ~flags_nostandard:true
+          ~flags:(Flags.no_standard ~nopervasives:true ~warn_error ~warnings ())
           ~deps:
             [
               tezos_protocol_environment;
@@ -3346,10 +3345,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
-          ~warnings
-          ~warn_error
-          ~nopervasives:true
-          ~flags_nostandard:true
+          ~flags:(Flags.no_standard ~nopervasives:true ~warn_error ~warnings ())
           ~opam_only_deps:[tezos_protocol_compiler_tezos_protocol_packer]
           ~deps:
             [
@@ -3402,8 +3398,7 @@ include Tezos_raw_protocol_%s.Main
                  `tezos-node`")
           ~modules:["Registerer"]
           ~linkall:true
-          ~warnings
-          ~warn_error
+          ~flags:(Flags.standard ~warnings ~warn_error ())
           ~deps:[main; tezos_protocol_updater; tezos_protocol_environment]
           ~dune:
             Dune.
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 13ecd42dab15167aeec7d232fea6d0fdc0bf0a9c..da6b385bbd9bbcf57673ca85fa8f7d609b6e8782 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -705,6 +705,43 @@ module Opam = struct
     Option.iter (pp_line "description: %a" pp_string) description
 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 make ~standard ?(nopervasives = false) ?(nostdlib = false)
+      ?(opaque = false) ?warnings ?warn_error () =
+    {
+      standard;
+      rest =
+        [
+          if_some warnings "-w";
+          if_some warn_error "-warn-error";
+          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
+
 module Env : sig
   (* See manifest.mli for documentation *)
 
@@ -836,7 +873,7 @@ module Target = struct
     conflicts : t list;
     deps : t list;
     dune : Dune.s_expr;
-    flags_nostandard : bool;
+    flags : Flags.t option;
     foreign_stubs : Dune.foreign_stubs option;
     inline_tests : bool;
     js_compatible : bool;
@@ -847,11 +884,8 @@ module Target = struct
     modes : Dune.mode list option;
     modules : modules;
     modules_without_implementation : string list;
-    nopervasives : bool;
-    nostdlib : bool;
     ocaml : Version.constraints option;
     opam : string option;
-    opaque : bool;
     opens : string list;
     path : string;
     preprocess : preprocessor list;
@@ -863,8 +897,6 @@ module Target = struct
     static_cclibs : string list;
     synopsis : string option;
     description : string option;
-    warnings : string option;
-    warn_error : string option;
     wrapped : bool;
     npm_deps : Npm.t list;
     cram : bool;
@@ -989,7 +1021,7 @@ module Target = struct
     ?conflicts:t option list ->
     ?deps:t option list ->
     ?dune:Dune.s_expr ->
-    ?flags_nostandard:bool ->
+    ?flags:Flags.t ->
     ?foreign_stubs:Dune.foreign_stubs ->
     ?inline_tests:inline_tests ->
     ?js_compatible:bool ->
@@ -1000,11 +1032,8 @@ module Target = struct
     ?modules:string list ->
     ?modules_without_implementation:string list ->
     ?npm_deps:Npm.t list ->
-    ?nopervasives:bool ->
-    ?nostdlib:bool ->
     ?ocaml:Version.constraints ->
     ?opam:string ->
-    ?opaque:bool ->
     ?opens:string list ->
     ?preprocess:preprocessor list ->
     ?preprocessor_deps:preprocessor_dep list ->
@@ -1016,8 +1045,6 @@ module Target = struct
     ?synopsis:string ->
     ?description:string ->
     ?time_measurement_ppx:bool ->
-    ?warnings:string ->
-    ?warn_error:string ->
     ?wrapped:bool ->
     ?cram:bool ->
     ?license:string ->
@@ -1061,15 +1088,14 @@ module Target = struct
 
   let internal make_kind ?all_modules_except ?bisect_ppx ?c_library_flags
       ?(conflicts = []) ?(dep_files = []) ?(dep_globs = []) ?(deps = [])
-      ?(dune = Dune.[]) ?(flags_nostandard = false) ?foreign_stubs ?inline_tests
-      ?js_compatible ?js_of_ocaml ?documentation ?(linkall = false) ?modes
-      ?modules ?(modules_without_implementation = []) ?(npm_deps = [])
-      ?(nopervasives = false) ?(nostdlib = false) ?ocaml ?opam ?(opaque = false)
+      ?(dune = Dune.[]) ?flags ?foreign_stubs ?inline_tests ?js_compatible
+      ?js_of_ocaml ?documentation ?(linkall = false) ?modes ?modules
+      ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml ?opam
       ?(opens = []) ?(preprocess = []) ?(preprocessor_deps = [])
       ?(private_modules = []) ?(opam_only_deps = []) ?release ?static
       ?static_cclibs ?synopsis ?description ?(time_measurement_ppx = false)
-      ?warnings ?warn_error ?(wrapped = true) ?(cram = false) ?license
-      ?(extra_authors = []) ~path names =
+      ?(wrapped = true) ?(cram = false) ?license ?(extra_authors = []) ~path
+      names =
     let conflicts = List.filter_map Fun.id conflicts in
     let deps = List.filter_map Fun.id deps in
     let opam_only_deps = List.filter_map Fun.id opam_only_deps in
@@ -1282,7 +1308,7 @@ module Target = struct
         conflicts;
         deps;
         dune;
-        flags_nostandard;
+        flags;
         foreign_stubs;
         inline_tests;
         js_compatible;
@@ -1293,11 +1319,8 @@ module Target = struct
         modes;
         modules;
         modules_without_implementation;
-        nopervasives;
-        nostdlib;
         ocaml;
         opam;
-        opaque;
         opens;
         path;
         preprocess;
@@ -1310,8 +1333,6 @@ module Target = struct
         synopsis;
         description;
         npm_deps;
-        warnings;
-        warn_error;
         wrapped;
         cram;
         license;
@@ -1578,7 +1599,6 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) =
     let libraries = List.map get_library internal.deps |> Dune.of_list in
     (libraries, List.rev !empty_files_to_create)
   in
-  let cons_if p x xs = if p then x :: xs else xs in
   let is_lib =
     match internal.kind with
     | Public_library _ | Private_library _ -> true
@@ -1593,44 +1613,31 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) =
       Some Dune.[S ":standard"; S "-linkall"]
     else None
   in
-  let flags =
-    internal.opens
-    |> List.map (fun m -> Dune.(H [S "-open"; S m]))
-    |> cons_if internal.nopervasives (Dune.S "-nopervasives")
-    |> cons_if internal.nostdlib (Dune.S "-nostdlib")
-    |> cons_if internal.opaque (Dune.S "-opaque")
+  let open_flags : Dune.s_expr list =
+    internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m]))
   in
-  let flags =
+  let minus_flags : Dune.s_expr =
     if dune_file_has_static_profile && not internal.static then
       (* Disable static compilation for this particular target
          (the static profile is global for the dune file).
          This must be at the end of the flag list. *)
-      flags @ [Dune.(H [S "\\"; S "-ccopt"; S "-static"])]
-    else flags
-  in
-  let flags =
-    match internal.warn_error with
-    | None -> flags
-    | Some w -> Dune.[H [S "-warn-error"; S w]] @ flags
-  in
-  let flags =
-    match internal.warnings with
-    | None -> flags
-    | Some w -> Dune.[H [S "-w"; S w]] @ flags
+      Dune.(H [S "\\"; S "-ccopt"; S "-static"])
+    else Dune.E
   in
   let flags =
-    match flags with
-    | [] -> None
-    | _ :: _ ->
-        Some
-          Dune.
-            [
-              V
-                (of_list
-                   ((if internal.flags_nostandard then []
-                    else [Dune.S ":standard"])
-                   @ flags));
-            ]
+    match (internal.flags, minus_flags, open_flags) with
+    | None, Dune.E, [] -> None
+    | flags, _, _ ->
+        let flags =
+          match flags with None -> Flags.standard () | Some flags -> flags
+        in
+        let flags =
+          match (flags.standard, minus_flags) with
+          | false, _ -> flags.rest
+          | true, E -> Dune.[S ":standard"] :: flags.rest
+          | true, minus_flags -> Dune.[S ":standard"; minus_flags] :: flags.rest
+        in
+        Some Dune.(V [V (of_list flags); V (of_list open_flags)])
   in
 
   let preprocess =
diff --git a/manifest/manifest.mli b/manifest/manifest.mli
index b040417d5e9112858f3b6758a344c7eba956241c..9f8a731764d1eb567c859f26803f23c9c65fe458 100644
--- a/manifest/manifest.mli
+++ b/manifest/manifest.mli
@@ -451,6 +451,46 @@ module Npm : sig
   val make : string -> Version.constraints -> t
 end
 
+module Flags : sig
+  (** OCaml flags
+
+      This module is used to construct flags to be passed to the OCaml compiler (in the [(flags ...)] stanza)
+  *)
+
+  (** OCaml flags *)
+  type t
+
+  (** Functions that build OCaml flags.
+
+      - [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 =
+    ?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
+
 (** Preprocessors. *)
 type preprocessor
 
@@ -499,8 +539,8 @@ val inline_tests_backend : target -> inline_tests
     - [dune]: added to the [dune] file after this target.
       A typical use is to add [rule] or [install] stanzas.
 
-    - [flags_nostandard]: if true, then omits the :standard flags in a [(flags ...)].
-      Default value is [false].
+    - [flags]: specifies a [(flags ...)] stanza.
+      Those flags are passed to the OCaml compiler when compiling and linking OCaml units.
 
     - [foreign_stubs]: specifies a [(foreign_stubs)] stanza for the [dune] target.
 
@@ -537,12 +577,6 @@ val inline_tests_backend : target -> inline_tests
 
     - [npm]: npm dependencies used when targeting JavaScript.
 
-    - [nopervasives]: if [true], add [-nopervasives] to the list of flags to
-      be passed to the OCaml compiler (in the [(flags ...)] stanza).
-
-    - [nostdlib]: if [true], add [-nostdlib] to the list of flags to
-      be passed to the OCaml compiler (in the [(flags ...)] stanza).
-
     - [ocaml]: constraints for the version of the [ocaml] opam package,
       i.e. on the version of the OCaml compiler.
 
@@ -554,9 +588,6 @@ val inline_tests_backend : target -> inline_tests
       For private libraries, private executables and tests, you must specify
       this argument (you can explicitely set it to [""] to generate no [.opam] file).
 
-    - [opaque]: if [true], add [-opaque] to the list of flags to be passed
-      to the OCaml compiler (in the [(flags ...)] stanza).
-
     - [opens]: list of module names to open when compiling.
       They are passed as [-open] flags to the OCaml compiler (in the [(flags ...)] stanza).
 
@@ -590,10 +621,6 @@ val inline_tests_backend : target -> inline_tests
 
     - [description]: long description for the [.opam] file.
 
-    - [warnings]: the argument passed to the -w flag when building.
-
-    - [warn_error]: the argument passed to the -warn-error flag when building.
-
     - [wrapped]: if [false], add the [(wrapped false)] stanza in the [dune] file.
       This causes the library to not come with a toplevel module with aliases to
       all other modules. Not recommended (according to the dune documentation).
@@ -611,7 +638,7 @@ type 'a maker =
   ?conflicts:target list ->
   ?deps:target list ->
   ?dune:Dune.s_expr ->
-  ?flags_nostandard:bool ->
+  ?flags:Flags.t ->
   ?foreign_stubs:Dune.foreign_stubs ->
   ?inline_tests:inline_tests ->
   ?js_compatible:bool ->
@@ -622,11 +649,8 @@ type 'a maker =
   ?modules:string list ->
   ?modules_without_implementation:string list ->
   ?npm_deps:Npm.t list ->
-  ?nopervasives:bool ->
-  ?nostdlib:bool ->
   ?ocaml:Version.constraints ->
   ?opam:string ->
-  ?opaque:bool ->
   ?opens:string list ->
   ?preprocess:preprocessor list ->
   ?preprocessor_deps:preprocessor_dep list ->
@@ -638,8 +662,6 @@ type 'a maker =
   ?synopsis:string ->
   ?description:string ->
   ?time_measurement_ppx:bool ->
-  ?warnings:string ->
-  ?warn_error:string ->
   ?wrapped:bool ->
   ?cram:bool ->
   ?license:string ->
diff --git a/src/bin_client/dune b/src/bin_client/dune
index 369556ed6654182d06b1f1822af6c9188b167655..aef241b0731da2373ce3048c47369abfe9393afd 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -94,15 +94,15 @@
    (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_rpc_http_client
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_commands
-   -open Tezos_mockup_commands
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc_http_client
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_commands
+  -open Tezos_mockup_commands
+  -open Tezos_client_base_unix))
 
 (rule
  (action
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index 4a02bcfbdc1eadce47cc43a227b44eda71ea60e0..66764027506d9db8308c593254199fc6d9cbc5e4 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -50,14 +50,14 @@
    (-> void_for_linking-tezos-client-alpha.empty)))
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Data_encoding
-   -open Tezos_base.TzPervasives
-   -open Tezos_client_base_unix
-   -open Tezos_client_base
-   -open Tezos_clic
-   -open Tezos_stdlib_unix
-   -open Tezos_event_logging)))
+  (:standard)
+  -open Data_encoding
+  -open Tezos_base.TzPervasives
+  -open Tezos_client_base_unix
+  -open Tezos_client_base
+  -open Tezos_clic
+  -open Tezos_stdlib_unix
+  -open Tezos_event_logging))
 
 (rule
  (action
diff --git a/src/bin_node/dune b/src/bin_node/dune
index f39e02a8be687cbacd43d394d908b611d738510b..68d0bc2a0cea6a07266c99ba699590d4ba9d153d 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -107,22 +107,22 @@
    (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty)))
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_server
-   -open Tezos_p2p
-   -open Tezos_shell
-   -open Tezos_store
-   -open Tezos_context
-   -open Tezos_validator
-   -open Tezos_validation
-   -open Tezos_shell_context
-   -open Tezos_workers
-   -open Tezos_protocol_updater)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_server
+  -open Tezos_p2p
+  -open Tezos_shell
+  -open Tezos_store
+  -open Tezos_context
+  -open Tezos_validator
+  -open Tezos_validation
+  -open Tezos_shell_context
+  -open Tezos_workers
+  -open Tezos_protocol_updater))
 
 (rule
  (action
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index 418fe1b4c4d65553da3db8b74caaa3e1dd09f8da..9683bbf8de972cb71270b87240904fd389a347b2 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -99,10 +99,10 @@
    (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base
-   -open Tezos_stdlib_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base
+  -open Tezos_stdlib_unix))
 
 (rule
  (action
diff --git a/src/bin_signer/dune b/src/bin_signer/dune
index d1effcec5c81cc52c07a3182d19189d15505605e..9b94a15f80f8162c035f6c8f41325886b5ea7b18 100644
--- a/src/bin_signer/dune
+++ b/src/bin_signer/dune
@@ -22,14 +22,14 @@
   tezos-stdlib
   tezos-signer-backends.unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_client_commands
-   -open Tezos_signer_services
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_server
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_commands
+  -open Tezos_signer_services
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_server
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib))
diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune
index 945b0d816dd0942b49306535f948ba87f965b340..7e051dbd700983ac9d5d72e61effee28d0cd03a4 100644
--- a/src/bin_snoop/dune
+++ b/src/bin_snoop/dune
@@ -24,7 +24,7 @@
   prbnmcn-stats)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_benchmark)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_benchmark))
diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune
index 1e21698e8b485d4b5f03cbdbb832fa7c0c8cea7b..3387c9dbbdbaf2848d093ec1430a5566c9cadad2 100644
--- a/src/bin_tps_evaluation/dune
+++ b/src/bin_tps_evaluation/dune
@@ -21,12 +21,12 @@
   tezt-tezos
   tezt-performance-regression)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezt
-   -open Tezt.Base
-   -open Tezt_tezos
-   -open Tezt_performance_regression)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezt
+  -open Tezt.Base
+  -open Tezt_tezos
+  -open Tezt_performance_regression))
 
 (rule
  (targets sql.ml)
diff --git a/src/bin_validation/bin/dune b/src/bin_validation/bin/dune
index f803e810791995ec460af67910679db9c628cf61..8898174fb85cb3117a58e94dcaafc6a4b3a20415 100644
--- a/src/bin_validation/bin/dune
+++ b/src/bin_validation/bin/dune
@@ -19,12 +19,12 @@
   tezos-validator)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_context
-   -open Tezos_stdlib_unix
-   -open Tezos_shell
-   -open Tezos_shell_services
-   -open Tezos_validation
-   -open Tezos_protocol_updater
-   -open Tezos_validator)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_context
+  -open Tezos_stdlib_unix
+  -open Tezos_shell
+  -open Tezos_shell_services
+  -open Tezos_validation
+  -open Tezos_protocol_updater
+  -open Tezos_validator))
diff --git a/src/bin_validation/dune b/src/bin_validation/dune
index 900b79e91bc316a597999fa2a873fb6a655db877..4d9caf473f2859d2f8b52d94b5ce9eeb4dede713 100644
--- a/src/bin_validation/dune
+++ b/src/bin_validation/dune
@@ -17,12 +17,12 @@
   tezos-protocol-updater
   tezos-shell-context)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_context
-   -open Tezos_stdlib_unix
-   -open Tezos_shell
-   -open Tezos_shell_services
-   -open Tezos_validation
-   -open Tezos_protocol_updater
-   -open Tezos_shell_context)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_context
+  -open Tezos_stdlib_unix
+  -open Tezos_shell
+  -open Tezos_shell_services
+  -open Tezos_validation
+  -open Tezos_protocol_updater
+  -open Tezos_shell_context))
diff --git a/src/lib_base/dune b/src/lib_base/dune
index dc2d0bc6686b9c08ad12648fc10a8ba379d0ec04..b7e314af392f6893efd6f8457d4d103910c57dc0 100644
--- a/src/lib_base/dune
+++ b/src/lib_base/dune
@@ -23,16 +23,16 @@
   ipaddr)
  (js_of_ocaml (javascript_files ptime.js))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_crypto
-   -open Data_encoding
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib
-   -open Tezos_rpc
-   -open Tezos_clic
-   -open Tezos_micheline
-   -open Tezos_event_logging)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_crypto
+  -open Data_encoding
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib
+  -open Tezos_rpc
+  -open Tezos_clic
+  -open Tezos_micheline
+  -open Tezos_event_logging))
 
 (ocamllex point_parser)
 
diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune
index d9ee4bedda463db463e36c69ab94d0b08772681c..633a5922696fa9f11c4e7cdaabef70aab98e479b 100644
--- a/src/lib_base/test/dune
+++ b/src/lib_base/test/dune
@@ -13,9 +13,9 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_base
-         -open Tezos_error_monad))
+ (flags (:standard)
+        -open Tezos_base
+        -open Tezos_error_monad)
  (modules test_bounded test_time test_protocol))
 
 (rule
@@ -58,9 +58,9 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_base
-         -open Tezos_error_monad))
+ (flags (:standard)
+        -open Tezos_base
+        -open Tezos_error_monad)
  (modules test_p2p_addr))
 
 (rule
@@ -85,9 +85,9 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_base
-         -open Tezos_error_monad))
+ (flags (:standard)
+        -open Tezos_base
+        -open Tezos_error_monad)
  (modules test_sized))
 
 (rule
diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune
index 0dcf1e21a29621f1aa02312398b1ec5deb1f0ae9..c67f9c3a36d1ff022b0cd9e3cbd0d053865b7893 100644
--- a/src/lib_base/test_helpers/dune
+++ b/src/lib_base/test_helpers/dune
@@ -14,5 +14,5 @@
   alcotest-lwt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune
index 4be03ed80795ac478eca0cc4ad8e2d8a0e789533..fa87059273db47d73a8eb0b96866688f0728030f 100644
--- a/src/lib_base/unix/dune
+++ b/src/lib_base/unix/dune
@@ -14,10 +14,10 @@
   tezos-stdlib-unix
   data-encoding)
  (flags
-  (:standard
-   -open Tezos_error_monad
-   -open Tezos_crypto
-   -open Tezos_base
-   -open Tezos_stdlib
-   -open Tezos_stdlib_unix
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_error_monad
+  -open Tezos_crypto
+  -open Tezos_base
+  -open Tezos_stdlib
+  -open Tezos_stdlib_unix
+  -open Data_encoding))
diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune
index 124cc5f7ce8bc25a9c8f58f05c3bd59f4b8016c8..c700874c33e7bce519dcdd1d53d85ccd30e26244 100644
--- a/src/lib_base/unix/test/dune
+++ b/src/lib_base/unix/test/dune
@@ -11,10 +11,10 @@
   tezos-test-helpers
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base
-   -open Tezos_base_unix
-   -open Tezos_error_monad)))
+  (:standard)
+  -open Tezos_base
+  -open Tezos_base_unix
+  -open Tezos_error_monad))
 
 (rule
  (alias runtest)
diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune
index 58e35f6c115b7cff41e9dfd0933df71b9c72b373..faf1b37edd4851cc525762059f2ea329b8a9e5fb 100644
--- a/src/lib_benchmark/dune
+++ b/src/lib_benchmark/dune
@@ -18,7 +18,7 @@
   pringo
   pyml-plot
   ocaml-migrate-parsetree)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib_unix))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib_unix)
  (foreign_stubs (language c) (flags (:standard)) (names snoop_stubs)))
diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune
index a4e519b371f0b72edf0b3653774aebb56ef7d3f3..270df02850ce48139485cf397c0cc3e4f41c4fe0 100644
--- a/src/lib_benchmark/example/dune
+++ b/src/lib_benchmark/example/dune
@@ -10,5 +10,5 @@
   tezos-stdlib-unix
   tezos-crypto
   tezos-benchmark)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_benchmark/lib_micheline_rewriting/dune b/src/lib_benchmark/lib_micheline_rewriting/dune
index a65d487d392c0abc9f6f30f83025390ed7cb3f22..294c1ed00bd6d1f96f250fad41e338b34e398eb6 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/dune
@@ -12,7 +12,7 @@
   tezos-error-monad
   tezos-micheline)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_micheline)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_micheline))
diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune
index 31d8de8010b06efbf7d004f53f2691f9aacd1915..5dab467223f1d16f4622e2be47eee2fe3df4a0cd 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/test/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune
@@ -10,8 +10,8 @@
   tezos-error-monad
   tezos-client-alpha
   alcotest-lwt)
- (flags (:standard
-         -open Tezos_micheline)))
+ (flags (:standard)
+        -open Tezos_micheline))
 
 (rule
  (alias runtest)
diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune
index 51b0660118b4dbcac93c35da2b8ced808ae65ab5..961ff42ce298eafb5e24f9e34f5d5669e9cd3e3c 100644
--- a/src/lib_benchmark/test/dune
+++ b/src/lib_benchmark/test/dune
@@ -12,8 +12,8 @@
   tezos-crypto
   tezos-benchmark
   tezos-benchmark-examples)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_clic/dune b/src/lib_clic/dune
index 0a90728126d49463677113b715b039b839ff09ae..7aacb8fcb66c3472fcd7b129caf45be810418283 100644
--- a/src/lib_clic/dune
+++ b/src/lib_clic/dune
@@ -13,7 +13,7 @@
   tezos-lwt-result-stdlib)
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib))
diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune
index d4129c4905c5bd72870bdf6c8dfe782173248ab4..2ddfa6c673c49172873cc6557b2260f27e5c6f49 100644
--- a/src/lib_clic/test/dune
+++ b/src/lib_clic/test/dune
@@ -7,9 +7,9 @@
   tezos-stdlib
   tezos-clic
   alcotest-lwt)
- (flags (:standard
-         -open Tezos_stdlib
-         -open Tezos_clic)))
+ (flags (:standard)
+        -open Tezos_stdlib
+        -open Tezos_clic))
 
 (rule
  (alias runtest)
diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune
index 4bcbab0c7984252072d6c7ea363a57568e9d0a39..fe5189ee46f8211a2057a1b5f441d4c43e662fe1 100644
--- a/src/lib_clic/unix/dune
+++ b/src/lib_clic/unix/dune
@@ -12,8 +12,8 @@
   tezos-error-monad
   tezos-lwt-result-stdlib)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_clic
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_clic
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib))
diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune
index 1343ffd87b44ad5912de2449a868268403ad8ab2..ad36004a8c7a05a1e801cce4039dbba9dd99e04e 100644
--- a/src/lib_client_base/dune
+++ b/src/lib_client_base/dune
@@ -15,10 +15,10 @@
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_rpc
-   -open Tezos_shell_services))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc
+  -open Tezos_shell_services)
  (modules :standard bip39_english))
 
 (rule
diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune
index 0028d7c447164e179a6b46420fe2d49017421e4f..c5395e1776cb21d8260fff1126e96b6f6a0551b7 100644
--- a/src/lib_client_base/test/dune
+++ b/src/lib_client_base/test/dune
@@ -11,8 +11,8 @@
   tezos-client-base
   alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_client_base)))
+ (flags (:standard)
+        -open Tezos_client_base))
 
 (rule
  (alias runtest)
diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune
index bf5fcab5495cdde75f82bfa35e90300997e5d3b7..4a5aecf6f86ba9420f2f4bfd743f638d3ddcd03a 100644
--- a/src/lib_client_base_unix/dune
+++ b/src/lib_client_base_unix/dune
@@ -23,12 +23,12 @@
   lwt-exit)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_shell_services
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_commands
-   -open Tezos_mockup_commands)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_shell_services
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_commands
+  -open Tezos_mockup_commands))
diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune
index f281d725b3a25367c8eac065f746c25d7bb08b92..1f50e8e220269dc2184719b74bc31a830202ffb6 100644
--- a/src/lib_client_base_unix/test/dune
+++ b/src/lib_client_base_unix/test/dune
@@ -11,9 +11,9 @@
   alcotest
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune
index f9857b3eaeb649376ffa59dfe5ad6e6794d58aee..93f4677f3d8348009cb2eab3b9cee4fd1b994fee 100644
--- a/src/lib_client_commands/dune
+++ b/src/lib_client_commands/dune
@@ -17,11 +17,11 @@
   data-encoding)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_rpc
-   -open Tezos_clic_unix
-   -open Tezos_client_base
-   -open Tezos_shell_services
-   -open Tezos_p2p_services
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc
+  -open Tezos_clic_unix
+  -open Tezos_client_base
+  -open Tezos_shell_services
+  -open Tezos_p2p_services
+  -open Data_encoding))
diff --git a/src/lib_context/dune b/src/lib_context/dune
index 019cd79cfd96afe3eec22ed79c1bc57d7b74c192..681666c7645cd50233f49ea5fc5f218d47159886 100644
--- a/src/lib_context/dune
+++ b/src/lib_context/dune
@@ -22,8 +22,8 @@
   tezos-context.encoding
   tezos-context.memory)
  (flags
-  (:standard
-   -open Tezos_shell_services
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib)))
+  (:standard)
+  -open Tezos_shell_services
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib))
diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune
index 08fbf3c8e1d25b8029d6e6cb07e43a056947caca..f46f172120f63a85e232c68fc58a949f8604a224 100644
--- a/src/lib_context/encoding/dune
+++ b/src/lib_context/encoding/dune
@@ -10,6 +10,6 @@
   tezos-stdlib
   irmin
   irmin-pack)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib))
diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune
index 70c33458ff1f6190730eb652f498d41d2c4a3d16..aae7f71419e3894b7a858cacde63925f186ad1c8 100644
--- a/src/lib_context/helpers/dune
+++ b/src/lib_context/helpers/dune
@@ -12,6 +12,6 @@
   tezos-context.sigs
   irmin
   irmin-pack)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib))
diff --git a/src/lib_context/memory/dune b/src/lib_context/memory/dune
index 9a8e9007410b8db2a83db7dffcc956f10999f921..a08f9892f6f4f510254990d9fe0689e4f6706eda 100644
--- a/src/lib_context/memory/dune
+++ b/src/lib_context/memory/dune
@@ -13,6 +13,6 @@
   tezos-context.sigs
   tezos-context.encoding
   tezos-context.helpers)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib))
diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune
index 31a431e4a0f5ed81f1601c2b983babeb2c8a9d00..115362e890bec65fb6cf1518c2abc822ce0587b9 100644
--- a/src/lib_context/memory/test/dune
+++ b/src/lib_context/memory/test/dune
@@ -10,9 +10,9 @@
   tezos-context.memory
   tezos-stdlib-unix
   alcotest-lwt)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib_unix)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib_unix))
 
 (rule
  (alias runtest)
diff --git a/src/lib_context/sigs/dune b/src/lib_context/sigs/dune
index b6a887c55a0282df15b76dccb90e5682e2f37ab5..38c3365fb3fa2c2fa6532413c2f58cadddb8796d 100644
--- a/src/lib_context/sigs/dune
+++ b/src/lib_context/sigs/dune
@@ -8,6 +8,6 @@
  (libraries
   tezos-base
   tezos-stdlib)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib))
diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune
index 8d01172e93bca4dbde4834091e8ab18e200d5fdb..c5dac24ea71a2de8605f873e4b4025cca38517aa 100644
--- a/src/lib_context/test/dune
+++ b/src/lib_context/test/dune
@@ -12,10 +12,10 @@
   tezos-test-helpers-extra
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_context
-   -open Tezos_stdlib_unix))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_context
+  -open Tezos_stdlib_unix)
  (modules test_context test))
 
 (rule
@@ -34,10 +34,10 @@
   qcheck-alcotest
   tezos-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base__TzPervasives
-   -open Tezos_context
-   -open Tezos_stdlib_unix))
+  (:standard)
+  -open Tezos_base__TzPervasives
+  -open Tezos_context
+  -open Tezos_stdlib_unix)
  (modules test_merkle_proof))
 
 (rule
diff --git a/src/lib_crypto/dal/dune b/src/lib_crypto/dal/dune
index 909ccacf42ff72454da1738bb3d8ce152cacc3c1..c579c679939d572a8c272b8c326fdd483d84cd33 100644
--- a/src/lib_crypto/dal/dune
+++ b/src/lib_crypto/dal/dune
@@ -11,8 +11,8 @@
   data-encoding
   tezos-polynomial)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Data_encoding
-   -open Tezos_polynomial)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Data_encoding
+  -open Tezos_polynomial))
diff --git a/src/lib_crypto/dal/test/dune b/src/lib_crypto/dal/test/dune
index bb3bd25f93ea75223981627b1121f4450e01000d..03ad18bb2e3b780e2c1e80888c82c21af2216fda 100644
--- a/src/lib_crypto/dal/test/dune
+++ b/src/lib_crypto/dal/test/dune
@@ -12,11 +12,11 @@
   qcheck-alcotest
   tezos-polynomial)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_crypto_dal
-   -open Tezos_error_monad
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_crypto_dal
+  -open Tezos_error_monad
+  -open Data_encoding))
 
 (rule
  (alias runtest)
diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune
index 3823078eef731edfc8c15e8a9a98079817ff6446..254fd50ba7a4f905fb340b202dba74a42fb98875 100644
--- a/src/lib_crypto/dune
+++ b/src/lib_crypto/dune
@@ -22,9 +22,9 @@
   bls12-381)
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Data_encoding
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Data_encoding
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib
+  -open Tezos_rpc))
diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune
index 2cb3f6c9c05d1ff464daa5ef48b424df5b0a726b..520c7973b0d1864f156bb482cdc12007dbca357c 100644
--- a/src/lib_crypto/test-unix/dune
+++ b/src/lib_crypto/test-unix/dune
@@ -17,11 +17,11 @@
   qcheck-alcotest
   tezos-test-helpers)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_crypto
-   -open Tezos_error_monad.TzLwtreslib
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_crypto
+  -open Tezos_error_monad.TzLwtreslib
+  -open Data_encoding))
 
 (rule
  (alias runtest)
diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune
index 818d39c8300e7adb9ddd79d2112043e14a2b2c5f..47efa0f051c957e8dd82c00508db3ae5d3cd1e04 100644
--- a/src/lib_crypto/test/dune
+++ b/src/lib_crypto/test/dune
@@ -19,11 +19,11 @@
   tezos-test-helpers)
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_crypto
-   -open Tezos_error_monad.TzLwtreslib
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_crypto
+  -open Tezos_error_monad.TzLwtreslib
+  -open Data_encoding))
 
 (rule
  (alias runtest)
diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune
index 4bd790be28e756b145624028d632d7f2eb1cd4a4..1e65874dda8e265394fb9fd4234ee16b8f6f0316 100644
--- a/src/lib_error_monad/dune
+++ b/src/lib_error_monad/dune
@@ -12,6 +12,6 @@
   lwt
   tezos-lwt-result-stdlib)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_stdlib
-         -open Data_encoding)))
+ (flags (:standard)
+        -open Tezos_stdlib
+        -open Data_encoding))
diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune
index afd52702e95809eb6ddd62e37a751994fb454058..bcfb9b7f2244c09d3fad22e2710467c5dc98c7c3 100644
--- a/src/lib_error_monad/test/dune
+++ b/src/lib_error_monad/test/dune
@@ -9,8 +9,8 @@
   data-encoding
   alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_error_monad)))
+ (flags (:standard)
+        -open Tezos_error_monad))
 
 (rule
  (alias runtest)
diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune
index 3b478cc1a30d7b1ee3531604754d1df80218e890..f2d0896513b6db3791c75cd1a070ce2fef8c61a9 100644
--- a/src/lib_event_logging/dune
+++ b/src/lib_event_logging/dune
@@ -13,8 +13,8 @@
   lwt_log.core)
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Data_encoding
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Data_encoding
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib))
diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune
index 9856f22b991b1efb88328ada71d6cd789923cd24..317f0d609505d4832a301b2c0f5809ce2144a6e7 100644
--- a/src/lib_event_logging/test_helpers/dune
+++ b/src/lib_event_logging/test_helpers/dune
@@ -15,7 +15,7 @@
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib
-   -open Tezos_event_logging)))
+  (:standard)
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib
+  -open Tezos_event_logging))
diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune
index 35b68a8aff11d6d065f7cd7914ce0b8d10fcfa7b..e068b907c9b9c10b21f352324059f4c0bfdb4ec9 100644
--- a/src/lib_hacl/test/dune
+++ b/src/lib_hacl/test/dune
@@ -17,11 +17,11 @@
   tezos-test-helpers)
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad.TzLwtreslib
-   -open Data_encoding
-   -open Tezos_hacl))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad.TzLwtreslib
+  -open Data_encoding
+  -open Tezos_hacl)
  (modules (:standard \ test)))
 
 (rule
diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune
index 36f12b5132e771356ac49c13b05492b8112558b3..827d8d029789f7238b30c6ae27609b47fbc50504 100644
--- a/src/lib_lwt_result_stdlib/test/dune
+++ b/src/lib_lwt_result_stdlib/test/dune
@@ -20,8 +20,8 @@
   alcotest-lwt
   qcheck-alcotest
   tezos-test-helpers)
- (flags (:standard
-         -open Tezos_lwt_result_stdlib)))
+ (flags (:standard)
+        -open Tezos_lwt_result_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune
index 0cbc6a10f99bc257529669228e0f2df58dde44a8..9f700f7aae36e8bddcf73ceebedc9464f73f20f4 100644
--- a/src/lib_micheline/dune
+++ b/src/lib_micheline/dune
@@ -16,7 +16,7 @@
  (preprocess (pps ppx_inline_test))
  (js_of_ocaml)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Data_encoding))
diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune
index 9db7872d16784c5abf280b1950f66086729d4bb2..039eb5c02ae1ebf90a98b26e1519f46ddf07a9c7 100644
--- a/src/lib_micheline/test/dune
+++ b/src/lib_micheline/test/dune
@@ -8,8 +8,8 @@
   tezos-micheline
   alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_micheline)))
+ (flags (:standard)
+        -open Tezos_micheline))
 
 (rule
  (alias runtest)
diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune
index 9dbb2184d35f912df0331b6ce33f5da9dc8e43bb..e471ee3769b0989cbc5f135efaa001d44c68cccd 100644
--- a/src/lib_mockup/dune
+++ b/src/lib_mockup/dune
@@ -10,8 +10,8 @@
   tezos-client-base
   tezos-shell-services
   tezos-protocol-environment)
- (flags (:standard
-         -open Tezos_base.TzPervasives))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives)
  (modules registration registration_intf mockup_args))
 
 (library
@@ -33,9 +33,9 @@
   tezos-rpc-http-client
   tezos-mockup-registration)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_mockup_registration))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_mockup_registration)
  (modules
   files
   local_services
@@ -55,8 +55,8 @@
   tezos-mockup
   tezos-mockup-registration)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_mockup
-   -open Tezos_mockup_registration))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_mockup
+  -open Tezos_mockup_registration)
  (modules mockup_wallet mockup_commands))
diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune
index 919fb5cd6895444d1a857adee51d99f3123c211f..b4c3085a71a12b61c80be9e09759de7782418003 100644
--- a/src/lib_mockup/test/dune
+++ b/src/lib_mockup/test/dune
@@ -12,9 +12,9 @@
   qcheck-alcotest
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune
index dd307e2cc23dbb2733cfd5d70097c3b40da1bd49..728704554cd39dd28368855ec6bf2aab5618be8c 100644
--- a/src/lib_mockup_proxy/dune
+++ b/src/lib_mockup_proxy/dune
@@ -13,5 +13,5 @@
   resto-cohttp-self-serving-client
   tezos-rpc-http-client
   tezos-shell-services)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune
index 1ce7a01dbad1f74722c7ddd13c9ce28e83c66b8a..a1f5b040f5505bb4d1dcb012067fc28a5981f309 100644
--- a/src/lib_p2p/dune
+++ b/src/lib_p2p/dune
@@ -17,9 +17,9 @@
   tezos-version
   prometheus)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_unix
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib
-   -open Tezos_p2p_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_unix
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib
+  -open Tezos_p2p_services))
diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune
index 8d711324ac9668f43f8c516355d3a40a86a02873..02fea7044a7932c9c4e6f167b463bcd0123417a4 100644
--- a/src/lib_p2p/test/dune
+++ b/src/lib_p2p/test/dune
@@ -25,14 +25,14 @@
   astring)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib
-   -open Tezos_p2p
-   -open Tezos_base_test_helpers
-   -open Tezos_event_logging_test_helpers
-   -open Tezos_p2p_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib
+  -open Tezos_p2p
+  -open Tezos_base_test_helpers
+  -open Tezos_event_logging_test_helpers
+  -open Tezos_p2p_services))
 
 (rule
  (alias runtest_p2p_socket)
diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune
index cc66b130e02df4967657f25a1d333214b4a1e16d..144be3955b9c3017d0f293782c16b60a86e99774 100644
--- a/src/lib_p2p_services/dune
+++ b/src/lib_p2p_services/dune
@@ -11,5 +11,5 @@
   tezos-base)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune
index 3e8146d329e7cdfbfc5bbfc54ceb67c8f591fe46..deb9a5a7985bf6e3c5e4b5247ed8ae03ab3c49a3 100644
--- a/src/lib_polynomial/dune
+++ b/src/lib_polynomial/dune
@@ -9,8 +9,8 @@
   data-encoding
   bls12-381)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -open Data_encoding))
+ (flags (:standard)
+        -open Data_encoding)
  (modules
   Carray
   Fr_generation
diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune
index 3779d43dbfdfe2fbbea2b3bcece5cae3c2fa5cf8..cc46cb643f17a3837eed497529ab04a667e9ddb3 100644
--- a/src/lib_protocol_compiler/bin/dune
+++ b/src/lib_protocol_compiler/bin/dune
@@ -24,10 +24,10 @@
   tezos-stdlib-unix
   tezos-protocol-compiler)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_protocol_compiler))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_protocol_compiler)
  (modules Main_packer))
 
 (executable
@@ -42,8 +42,8 @@
   tezos-stdlib-unix)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_unix
-   -open Tezos_stdlib_unix))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_unix
+  -open Tezos_stdlib_unix)
  (modules Main_embedded_packer))
diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune
index e08545bd5b474e9121aa66664317b04a0ba24045..f02df288fc74393aa92be06052c7b048da921ba2 100644
--- a/src/lib_protocol_compiler/dune
+++ b/src/lib_protocol_compiler/dune
@@ -8,9 +8,9 @@
  (libraries
   tezos-base
   tezos-protocol-environment.sigs)
- (flags (:standard
-         -opaque
-         -open Tezos_base.TzPervasives))
+ (flags (:standard)
+        -opaque
+        -open Tezos_base.TzPervasives)
  (modules Registerer))
 
 (rule
@@ -49,10 +49,10 @@
   ocplib-ocamlres
   unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_unix
-   -open Tezos_stdlib_unix))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_unix
+  -open Tezos_stdlib_unix)
  (modules Embedded_cmis Packer Compiler))
 
 (library
@@ -64,9 +64,9 @@
   tezos-protocol-compiler
   compiler-libs.optcomp)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_compiler))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_compiler)
  (modules Native))
 
 (install
diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune
index 29d7a6a53b231a8b93f01c60e4b6b83d892bed33..4889c9df429ca1a49da1c70ba2ae0002e6e0cbb9 100644
--- a/src/lib_protocol_environment/dune
+++ b/src/lib_protocol_environment/dune
@@ -18,9 +18,9 @@
   tezos-micheline
   tezos-context.memory
   tezos-event-logging)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_micheline))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_micheline)
  (wrapped false)
  (modules
   Tezos_protocol_environment
@@ -52,6 +52,6 @@
   tezos-base
   tezos-protocol-environment
   tezos-context)
- (flags (:standard
-         -open Tezos_base.TzPervasives))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives)
  (modules Proxy_delegate_maker Shell_context))
diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune
index d75ae7b90fca2faa76fc5485e6f9ec7d0b82bf97..c895848d9a57108b4a3aeb32d8f2558abaf8f531 100644
--- a/src/lib_protocol_environment/sigs/dune
+++ b/src/lib_protocol_environment/sigs/dune
@@ -7,9 +7,9 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezos-protocol-environment.sigs.stdlib-compat)
- (flags (:standard
-         -nostdlib
-         -nopervasives))
+ (flags (:standard)
+        -nostdlib
+        -nopervasives)
  (modules V0 V1 V2 V3 V4 V5 V6))
 
 (include v0.dune.inc)
diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune
index 23893178140433b917ca5c321a32e473e4a072ea..c5123f6aeaa38f752269b3c8f97c959cf8f42e2b 100644
--- a/src/lib_protocol_environment/test/dune
+++ b/src/lib_protocol_environment/test/dune
@@ -12,9 +12,9 @@
   qcheck-alcotest
   lwt.unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_environment)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_environment))
 
 (rule
  (alias runtest)
diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune
index 07c2ba658d8c6df1f9346c6b2455eebb91ca4cbf..dbad85be6387f580df17449c1624d6adc7195d3a 100644
--- a/src/lib_protocol_environment/test_shell_context/dune
+++ b/src/lib_protocol_environment/test_shell_context/dune
@@ -10,10 +10,10 @@
   tezos-base
   tezos-protocol-environment)
  (flags
-  (:standard
-   -open Lib_test
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_environment)))
+  (:standard)
+  -open Lib_test
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_environment))
 
 (rule
  (alias runtest)
diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune
index 4feabf7ab64515fcb7f272d4cad4b77ea14de39d..b1f0c9a41afb2273b6daf7a33f2e5a6d5147e253 100644
--- a/src/lib_protocol_updater/dune
+++ b/src/lib_protocol_updater/dune
@@ -18,9 +18,9 @@
   lwt-exit
   dynlink)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_micheline
-   -open Tezos_shell_services
-   -open Tezos_context)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_micheline
+  -open Tezos_shell_services
+  -open Tezos_context))
diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune
index 35babf2b8236c623f6c191ef508842757394594f..00fe8f3d482c517c16ffe26e958fa02d61a0ccd5 100644
--- a/src/lib_proxy/dune
+++ b/src/lib_proxy/dune
@@ -14,5 +14,5 @@
   tezos-rpc
   tezos-shell-services
   tezos-context.memory)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune
index 9be44faa0a0e273bd34f0fae43019228608bf10f..6a8db218687e397b1191734315aad489e3043edb 100644
--- a/src/lib_proxy/rpc/dune
+++ b/src/lib_proxy/rpc/dune
@@ -11,5 +11,5 @@
   tezos-mockup-proxy
   tezos-rpc
   tezos-proxy)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune
index b198ff72dee775aa0a48f323d0d43e1bc2d53194..c71c636cf2b49777f53162377a867b9ecd81e110 100644
--- a/src/lib_proxy/test/dune
+++ b/src/lib_proxy/test/dune
@@ -14,9 +14,9 @@
   qcheck-alcotest
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune
index e7ec1a55ad9f2db564bbc1abf0171b1d0d1d2d23..7c949916971fe19da2808f8df1884ae0264cd115 100644
--- a/src/lib_proxy_server_config/dune
+++ b/src/lib_proxy_server_config/dune
@@ -8,5 +8,5 @@
  (libraries
   tezos-base
   tezos-stdlib-unix)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune
index ec3d610973a3b2bc07f5d80e448e75fde83f02a3..bfbaeabf0a8e1852093121a83a138ce220deebd6 100644
--- a/src/lib_proxy_server_config/test/dune
+++ b/src/lib_proxy_server_config/test/dune
@@ -10,8 +10,8 @@
   tezos-test-helpers
   qcheck-alcotest
   alcotest-lwt)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_requester/dune b/src/lib_requester/dune
index 6c710cc0e25e905a973e4431397c5522a1e5938a..9ac46aca3b4d7587e7cef563d12183dfc7b746c0 100644
--- a/src/lib_requester/dune
+++ b/src/lib_requester/dune
@@ -9,6 +9,6 @@
   tezos-base
   tezos-stdlib-unix
   lwt-watcher)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_stdlib_unix)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_stdlib_unix))
diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune
index 092ee204f1f0608b6be002244d373196c7c9e0dd..7a0d1b0c571e604b8fbb4341e24ec596d05a03ee 100644
--- a/src/lib_requester/test/dune
+++ b/src/lib_requester/test/dune
@@ -14,11 +14,11 @@
   alcotest-lwt
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_test_helpers
-   -open Tezos_stdlib
-   -open Tezos_requester)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_test_helpers
+  -open Tezos_stdlib
+  -open Tezos_requester))
 
 (rule
  (alias runtest)
diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune
index 4e0d7966ff3f88d611740e9bb29497a20d58a383..994891744bdcfcb852d10e68937b7d3c6454e24c 100644
--- a/src/lib_rpc/dune
+++ b/src/lib_rpc/dune
@@ -11,6 +11,6 @@
   resto
   resto-directory)
  (js_of_ocaml)
- (flags (:standard
-         -open Data_encoding
-         -open Tezos_error_monad)))
+ (flags (:standard)
+        -open Data_encoding
+        -open Tezos_error_monad))
diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune
index 2a41e960746653cf0193636decc0a5e772b4e246..580019e62af220b527181dc2c3fce9ceb44e9224 100644
--- a/src/lib_rpc_http/dune
+++ b/src/lib_rpc_http/dune
@@ -8,8 +8,8 @@
  (libraries
   tezos-base
   resto-cohttp)
- (flags (:standard
-         -open Tezos_base.TzPervasives))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives)
  (modules RPC_client_errors media_type))
 
 (library
@@ -20,9 +20,9 @@
   tezos-base
   resto-cohttp-client
   tezos-rpc-http)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_rpc_http))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_rpc_http)
  (modules RPC_client))
 
 (library
@@ -35,9 +35,9 @@
   cohttp-lwt-unix
   resto-cohttp-client
   tezos-rpc-http-client)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_rpc_http_client))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_rpc_http_client)
  (modules RPC_client_unix))
 
 (library
@@ -52,10 +52,10 @@
   tezos-rpc
   tezos-rpc-http)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_rpc
-   -open Tezos_rpc_http))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_rpc
+  -open Tezos_rpc_http)
  (modules RPC_server RPC_logging)
  (private_modules RPC_logging))
diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune
index f37e8bcc0ce2861409b3830ea7b3313a1a5ed00d..38108e36f50d4fc58dcab7677af2cb13ff475c98 100644
--- a/src/lib_rpc_http/test/dune
+++ b/src/lib_rpc_http/test/dune
@@ -14,12 +14,12 @@
   qcheck-alcotest
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib
-   -open Lib_test
-   -open Tezos_base_test_helpers
-   -open Tezos_rpc_http_server)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib
+  -open Lib_test
+  -open Tezos_base_test_helpers
+  -open Tezos_rpc_http_server))
 
 (rule
  (alias runtest)
diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune
index b9d37125c8c7718f346ad26c6c5b5c0d2f6be790..33e0912d7a87c41d43c2e4e5bbd7be2d8411a395 100644
--- a/src/lib_sapling/dune
+++ b/src/lib_sapling/dune
@@ -19,11 +19,11 @@
   tezos-lwt-result-stdlib)
  (js_of_ocaml (javascript_files runtime.js))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_crypto
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_crypto
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib)
  (foreign_stubs
   (language c)
   (flags (:standard -I%{env:OPAM_SWITCH_PREFIX=}/lib/tezos-rust-libs))
diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune
index 552b0570e12225cd8aab92453d8ef711f9853604..2db116f142b987970f2bd91ea10755f83a6bf47b 100644
--- a/src/lib_sapling/test/dune
+++ b/src/lib_sapling/test/dune
@@ -17,12 +17,12 @@
   tezos-base-test-helpers
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_sapling
-   -open Tezos_crypto
-   -open Tezos_stdlib
-   -open Data_encoding
-   -open Tezos_base_test_helpers))
+  (:standard)
+  -open Tezos_sapling
+  -open Tezos_crypto
+  -open Tezos_stdlib
+  -open Data_encoding
+  -open Tezos_base_test_helpers)
  (modules (:standard \ test_js)))
 
 (rule
diff --git a/src/lib_shell/dune b/src/lib_shell/dune
index fd4f6b0bcc13e744714d80ba6948b7c167a6a316..d1ff87fbc10b2639b09e37e6d564886a0d3debf9 100644
--- a/src/lib_shell/dune
+++ b/src/lib_shell/dune
@@ -25,21 +25,21 @@
   tezos-version
   lwt-exit)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base
-   -open Tezos_base_unix
-   -open Tezos_context
-   -open Tezos_store
-   -open Tezos_shell_context
-   -open Tezos_p2p
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_p2p_services
-   -open Tezos_protocol_updater
-   -open Tezos_requester
-   -open Tezos_workers
-   -open Tezos_validation
-   -open Tezos_version)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base
+  -open Tezos_base_unix
+  -open Tezos_context
+  -open Tezos_store
+  -open Tezos_shell_context
+  -open Tezos_p2p
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_p2p_services
+  -open Tezos_protocol_updater
+  -open Tezos_requester
+  -open Tezos_workers
+  -open Tezos_validation
+  -open Tezos_version))
 
 (documentation (package tezos-shell))
diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune
index 7208b849d6f92405c7d25db072be32578042aa53..c16e0e3b004fb25e3bbddbf2efe986eb6a3bd477 100644
--- a/src/lib_shell/test/dune
+++ b/src/lib_shell/test/dune
@@ -31,20 +31,20 @@
   tezos-test-helpers
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base_test_helpers
-   -open Tezos_store
-   -open Tezos_context
-   -open Tezos_shell_context
-   -open Tezos_protocol_updater
-   -open Tezos_p2p
-   -open Tezos_p2p_services
-   -open Tezos_shell
-   -open Tezos_shell_services
-   -open Tezos_stdlib_unix
-   -open Tezos_validation
-   -open Tezos_event_logging_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base_test_helpers
+  -open Tezos_store
+  -open Tezos_context
+  -open Tezos_shell_context
+  -open Tezos_protocol_updater
+  -open Tezos_p2p
+  -open Tezos_p2p_services
+  -open Tezos_shell
+  -open Tezos_shell_services
+  -open Tezos_stdlib_unix
+  -open Tezos_validation
+  -open Tezos_event_logging_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune
index 2a1e79e7b2f21748412c277ce36d005b7fa7d9d5..b8a351df5a1e8bef146f64c24ecee5cdc152ec7b 100644
--- a/src/lib_shell_benchmarks/dune
+++ b/src/lib_shell_benchmarks/dune
@@ -16,10 +16,10 @@
   tezos-micheline)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_error_monad
-   -open Tezos_benchmark
-   -open Tezos_crypto)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_error_monad
+  -open Tezos_benchmark
+  -open Tezos_crypto))
diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune
index c886532324f7d3e916bbe4aa463fe5551aa6ffa5..176af66c2a702016e9317d131986f5aca445ec12 100644
--- a/src/lib_shell_services/dune
+++ b/src/lib_shell_services/dune
@@ -14,8 +14,8 @@
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base
-   -open Tezos_p2p_services
-   -open Tezos_version)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base
+  -open Tezos_p2p_services
+  -open Tezos_version))
diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune
index 603935416d32cf5be789fa55796a3badbe0d9b4e..6935d0a634e4b67a8b5b7763a3f451811be6f851 100644
--- a/src/lib_shell_services/test/dune
+++ b/src/lib_shell_services/test/dune
@@ -11,9 +11,9 @@
   tezos-shell-services
   alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_shell_services)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_shell_services))
 
 (rule
  (alias runtest)
diff --git a/src/lib_shell_services/test_helpers/dune b/src/lib_shell_services/test_helpers/dune
index 09364eef125b723db38e7d5a4621a04c638d4dd9..c1556e3d2498ef408ee67f414209ef94e0ef89ea 100644
--- a/src/lib_shell_services/test_helpers/dune
+++ b/src/lib_shell_services/test_helpers/dune
@@ -10,5 +10,5 @@
   tezos-test-helpers
   qcheck-core)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
diff --git a/src/lib_shell_services/test_helpers/test/dune b/src/lib_shell_services/test_helpers/test/dune
index aea37e476688ac56479b42439290f54cbd4aadb6..2ffe9b0db5b4da6e4abbc0058cbb1de1adbd96f2 100644
--- a/src/lib_shell_services/test_helpers/test/dune
+++ b/src/lib_shell_services/test_helpers/test/dune
@@ -11,8 +11,8 @@
   tezos-shell-services-test-helpers
   qcheck-alcotest
   alcotest-lwt)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune
index d624a94e0b85f7db070e6466ce0f0f42bb804eef..bc4d7eec594549ee41441cc2b4f84b78a14bc041 100644
--- a/src/lib_signer_backends/dune
+++ b/src/lib_signer_backends/dune
@@ -14,11 +14,11 @@
   tezos-signer-services
   tezos-shell-services)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib
-   -open Tezos_client_base
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_client
-   -open Tezos_signer_services
-   -open Tezos_shell_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib
+  -open Tezos_client_base
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_client
+  -open Tezos_signer_services
+  -open Tezos_shell_services))
diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune
index 18ea1899ab8d92d1fbd9275bc86115dc5e27f4bb..8e7b90f54123d6c6341770d4a37ff6fa3d3550f2 100644
--- a/src/lib_signer_backends/test/dune
+++ b/src/lib_signer_backends/test/dune
@@ -13,13 +13,13 @@
   tezos-signer-backends
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib
-   -open Tezos_crypto
-   -open Tezos_client_base
-   -open Tezos_signer_backends)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib
+  -open Tezos_crypto
+  -open Tezos_client_base
+  -open Tezos_signer_backends))
 
 (rule
  (alias runtest)
diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune
index 6a01d4ca9f3791e3f7b17aecb564ed5a0f1b6cdf..16397695f536cfb29a59543cd32b36ccee22baf5 100644
--- a/src/lib_signer_backends/unix/dune
+++ b/src/lib_signer_backends/unix/dune
@@ -23,14 +23,14 @@
    (ledgerwallet-tezos -> ledger.available.ml)
    (-> ledger.none.ml)))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib
-   -open Tezos_client_base
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_client
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_signer_services
-   -open Tezos_signer_backends
-   -open Tezos_shell_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib
+  -open Tezos_client_base
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_client
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_signer_services
+  -open Tezos_signer_backends
+  -open Tezos_shell_services))
diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune
index 400cd2dcf555554f9e0bf2fdef3a776a2fb614dc..d432ec1b14472997b20a6fb3d41685155a9cdc04 100644
--- a/src/lib_signer_backends/unix/test/dune
+++ b/src/lib_signer_backends/unix/test/dune
@@ -11,12 +11,12 @@
   tezos-signer-backends.unix
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_error_monad
-   -open Tezos_stdlib
-   -open Tezos_crypto
-   -open Tezos_client_base
-   -open Tezos_signer_backends_unix)))
+  (:standard)
+  -open Tezos_error_monad
+  -open Tezos_stdlib
+  -open Tezos_crypto
+  -open Tezos_client_base
+  -open Tezos_signer_backends_unix))
 
 (rule
  (alias runtest)
diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune
index 8572944a04b6b2023b92831afad33cc921816255..28ed60b79e47bcf7b0aafb90fb67f7ba7afd0d84 100644
--- a/src/lib_signer_services/dune
+++ b/src/lib_signer_services/dune
@@ -14,7 +14,7 @@
  (js_of_ocaml)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_rpc
-   -open Tezos_client_base)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc
+  -open Tezos_client_base))
diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune
index 2d60504a81f35d547e3d3186a9e3afaf90afdc85..9f5f5285b125a5572b5d5552aa502bb1ed9f4e5f 100644
--- a/src/lib_stdlib/test-unix/dune
+++ b/src/lib_stdlib/test-unix/dune
@@ -16,8 +16,8 @@
   lwt.unix
   tezos-test-helpers
   qcheck-alcotest)
- (flags (:standard
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune
index 5b854000e2d874ac11fadc2f34c699b41b77a14a..97d93db6fa22e4f1825d5df8b3ec0228858548c2 100644
--- a/src/lib_stdlib/test/dune
+++ b/src/lib_stdlib/test/dune
@@ -18,8 +18,8 @@
   tezos-test-helpers
   qcheck-alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_stdlib)))
+ (flags (:standard)
+        -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune
index e17a8afeeb7769785e3253a24b2348e2577911cb..10baf017aa82e2b3136449d86343b02841c1fc6b 100644
--- a/src/lib_stdlib_unix/dune
+++ b/src/lib_stdlib_unix/dune
@@ -21,9 +21,9 @@
   mtime.clock.os
   lwt_log)
  (flags
-  (:standard
-   -open Tezos_error_monad
-   -open Tezos_error_monad.TzLwtreslib
-   -open Tezos_event_logging
-   -open Tezos_stdlib
-   -open Data_encoding)))
+  (:standard)
+  -open Tezos_error_monad
+  -open Tezos_error_monad.TzLwtreslib
+  -open Tezos_event_logging
+  -open Tezos_stdlib
+  -open Data_encoding))
diff --git a/src/lib_store/dune b/src/lib_store/dune
index 180f4a87cfc0b3fa3aa9ddf092124441effc9a5a..1bdc8b4bebcf0f1f0f444605292fe7a949a21303 100644
--- a/src/lib_store/dune
+++ b/src/lib_store/dune
@@ -23,12 +23,12 @@
   tar-unix
   prometheus)
  (flags
-  (:standard
-   -open Tezos_shell_services
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_context
-   -open Tezos_validation
-   -open Tezos_protocol_updater
-   -open Tezos_stdlib_unix
-   -open Tezos_stdlib)))
+  (:standard)
+  -open Tezos_shell_services
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_context
+  -open Tezos_validation
+  -open Tezos_protocol_updater
+  -open Tezos_stdlib_unix
+  -open Tezos_stdlib))
diff --git a/src/lib_store/test/dune b/src/lib_store/test/dune
index 5de2aeb780a6247ba1903c0bbf375602655ddbb7..1aa7284c3c2d6aa6257fcae937987082b08126c4 100644
--- a/src/lib_store/test/dune
+++ b/src/lib_store/test/dune
@@ -18,14 +18,14 @@
   tezos-test-helpers
   tezos-test-helpers-extra)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_store
-   -open Tezos_shell_services
-   -open Tezos_stdlib_unix
-   -open Tezos_validation
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_protocol_plugin_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_store
+  -open Tezos_shell_services
+  -open Tezos_stdlib_unix
+  -open Tezos_validation
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_protocol_plugin_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/lib_validation/dune b/src/lib_validation/dune
index 00323085066cba664391b496b58f5606c808dae4..d2a5295031ce6a689ada3e3716895e7106d80215 100644
--- a/src/lib_validation/dune
+++ b/src/lib_validation/dune
@@ -14,10 +14,10 @@
   tezos-protocol-updater
   tezos-stdlib-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_context
-   -open Tezos_shell_context
-   -open Tezos_shell_services
-   -open Tezos_protocol_updater
-   -open Tezos_stdlib_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_context
+  -open Tezos_shell_context
+  -open Tezos_shell_services
+  -open Tezos_protocol_updater
+  -open Tezos_stdlib_unix))
diff --git a/src/lib_version/dune b/src/lib_version/dune
index 30e0a4c2b6351a45a7b0df70e2bb806fbf80f329..4b7a680e8b43863791363e2294680029cbf6aa48 100644
--- a/src/lib_version/dune
+++ b/src/lib_version/dune
@@ -11,8 +11,8 @@
   tezos-base
   tezos-version.parser)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_base.TzPervasives)))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives))
 
 (rule
  (targets generated_git_info.ml)
diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune
index 4d935e03e7ec1a245845687b124b43057bd671ac..338b18dce12bc96648e272d817f6b0a644ba86b1 100644
--- a/src/lib_version/exe/dune
+++ b/src/lib_version/exe/dune
@@ -8,8 +8,7 @@
  (libraries
   dune-configurator
   tezos-version.parser)
- (flags (:standard
-         \ -ccopt -static))
+ (flags (:standard \ -ccopt -static))
  (modules get_git_info))
 
 (executable
@@ -19,6 +18,6 @@
  (libraries
   tezos-version
   tezos-base.unix)
- (flags (:standard
-         -open Tezos_version))
+ (flags (:standard)
+        -open Tezos_version)
  (modules tezos_print_version))
diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune
index ef9dd516b3648a4fcd3846b3388416b988ed3cfd..a84b182b31566bbed6438b3e5ab24e15c26c15e4 100644
--- a/src/lib_version/test/dune
+++ b/src/lib_version/test/dune
@@ -11,8 +11,8 @@
   tezos-version.parser
   alcotest)
  (js_of_ocaml)
- (flags (:standard
-         -open Tezos_version)))
+ (flags (:standard)
+        -open Tezos_version))
 
 (rule
  (alias runtest)
diff --git a/src/lib_webassembly/interpreter/dune b/src/lib_webassembly/interpreter/dune
index c76a3f5960e22d26e4d8126befb1e3f720a85894..1806a8c40388ee217d18993ce6253847e9c60535 100644
--- a/src/lib_webassembly/interpreter/dune
+++ b/src/lib_webassembly/interpreter/dune
@@ -14,6 +14,6 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezos-webassembly-interpreter)
- (flags (:standard
-         -open Tezos_webassembly_interpreter))
+ (flags (:standard)
+        -open Tezos_webassembly_interpreter)
  (modules main))
diff --git a/src/lib_workers/dune b/src/lib_workers/dune
index e40806421cb43488b0e9c1bba5eb9795572565f0..f73b47440bc7f3e6dc1617a9341b310b4ef8056b 100644
--- a/src/lib_workers/dune
+++ b/src/lib_workers/dune
@@ -10,9 +10,9 @@
   tezos-stdlib-unix
   ringo)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base
-   -open Tezos_stdlib_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base
+  -open Tezos_stdlib_unix))
 
 (documentation (package tezos-workers))
diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune
index 0803c56c02459437fe41f32b64f38928e4c78f59..9ee1f402e6b3d0be9eecd391131778eac3d82449 100644
--- a/src/lib_workers/test/dune
+++ b/src/lib_workers/test/dune
@@ -12,15 +12,15 @@
   tezos-base-test-helpers
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_stdlib_unix
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.Worker_types
-   -open Tezos_workers
-   -open Lib_test
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_stdlib_unix
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.Worker_types
+  -open Tezos_workers
+  -open Lib_test
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune
index fca6ed3a078cd5d115f4c9a2a910f0e1ecc5ec22..d2dbc3b45d16835ddc9220a0b4875f964a3c6c46 100644
--- a/src/proto_000_Ps9mPmXa/lib_client/dune
+++ b/src/proto_000_Ps9mPmXa/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-stdlib-unix)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_000_Ps9mPmXa
-   -open Tezos_client_commands)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_000_Ps9mPmXa
+  -open Tezos_client_commands))
diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune
index ac3008ff0594c9b9a89a911903d9e0df753e0438..79f857ffd833f993046e2615ca5a042a18e67834 100644
--- a/src/proto_000_Ps9mPmXa/lib_protocol/dune
+++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-000-Ps9mPmXa.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_000_Ps9mPmXa.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_000_Ps9mPmXa.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules Data Services Main))
 
 (library
@@ -44,9 +44,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -90,9 +90,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -117,9 +117,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune
index 994f6409377bac085b208ede9c0d6348696565f7..fab5a8b0b699222132afcfddeb39a3a75161ab99 100644
--- a/src/proto_001_PtCJ7pwo/lib_client/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_001_PtCJ7pwo
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_001_PtCJ7pwo
+  -open Tezos_rpc))
diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
index 28c272189483637198a993d0efbd27294285ab91..ab400514c832b83b99d900e6af2c36aa01eec068 100644
--- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune
+++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_001_PtCJ7pwo
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_001_PtCJ7pwo
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_001_PtCJ7pwo
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_001_PtCJ7pwo
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_001_PtCJ7pwo
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_001_PtCJ7pwo
-   -open Tezos_client_commands
-   -open Tezos_client_001_PtCJ7pwo_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_001_PtCJ7pwo
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_001_PtCJ7pwo
+  -open Tezos_client_commands
+  -open Tezos_client_001_PtCJ7pwo_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune
index 6a591083268f692ca0a5e2ee837afe0f0fc61ab4..df81b7cf7dc22339335729aa78cbb256694e63ee 100644
--- a/src/proto_001_PtCJ7pwo/lib_protocol/dune
+++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-001-PtCJ7pwo.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_001_PtCJ7pwo.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_001_PtCJ7pwo.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -111,9 +111,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -288,9 +288,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -380,9 +380,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune
index 8373a9bec0da9ee54961532751e9af331f38a72a..73b2072afc5e9415045e7a191b3ea1e5ed84911c 100644
--- a/src/proto_002_PsYLVpVv/lib_client/dune
+++ b/src/proto_002_PsYLVpVv/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_002_PsYLVpVv
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_002_PsYLVpVv
+  -open Tezos_rpc))
diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune
index 07d8fb2ade312c26c376e300729ac19ed535d82c..f685df1f4a90544db31118a075e6fe387116f83e 100644
--- a/src/proto_002_PsYLVpVv/lib_client_commands/dune
+++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_002_PsYLVpVv
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_002_PsYLVpVv
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_002_PsYLVpVv
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_002_PsYLVpVv
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_002_PsYLVpVv
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_002_PsYLVpVv
-   -open Tezos_client_commands
-   -open Tezos_client_002_PsYLVpVv_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_002_PsYLVpVv
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_002_PsYLVpVv
+  -open Tezos_client_commands
+  -open Tezos_client_002_PsYLVpVv_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune
index 3191056ad3d78dde6a29b9c32d2bcac9b307bc67..e62be7f99d4b0ac1d9d539de633cab790ace6ad9 100644
--- a/src/proto_002_PsYLVpVv/lib_protocol/dune
+++ b/src/proto_002_PsYLVpVv/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-002-PsYLVpVv.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_002_PsYLVpVv.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_002_PsYLVpVv.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -111,9 +111,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -288,9 +288,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -380,9 +380,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune
index 4e4cfae74760a235bfbb29ad63ad6c60232ce011..581eb364fdb888a102c2a4b72d8c5574aaec5b64 100644
--- a/src/proto_003_PsddFKi3/lib_client/dune
+++ b/src/proto_003_PsddFKi3/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_003_PsddFKi3
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_003_PsddFKi3
+  -open Tezos_rpc))
diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune
index c0e3b895f677c211df92ece83a8bbe881ef459bf..f7483368b9f4a872c6dc6117eef73415670d59fd 100644
--- a/src/proto_003_PsddFKi3/lib_client_commands/dune
+++ b/src/proto_003_PsddFKi3/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_003_PsddFKi3
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_003_PsddFKi3
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_003_PsddFKi3
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_003_PsddFKi3
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_003_PsddFKi3
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_003_PsddFKi3
-   -open Tezos_client_commands
-   -open Tezos_client_003_PsddFKi3_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_003_PsddFKi3
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_003_PsddFKi3
+  -open Tezos_client_commands
+  -open Tezos_client_003_PsddFKi3_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune
index 814d61273430fa6b8140caa404362de62d90b838..b01ffff8317c5147cadfda8bc5748a0cd0f808a6 100644
--- a/src/proto_003_PsddFKi3/lib_protocol/dune
+++ b/src/proto_003_PsddFKi3/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-003-PsddFKi3.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_003_PsddFKi3.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_003_PsddFKi3.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -112,9 +112,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -291,9 +291,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -384,9 +384,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune
index a7969fd124fb6d28c1a4c3b2f40fe6913dd7d8cb..5ab4fe8783f0b5b5e261917532fd0419413e3134 100644
--- a/src/proto_004_Pt24m4xi/lib_client/dune
+++ b/src/proto_004_Pt24m4xi/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_004_Pt24m4xi
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_004_Pt24m4xi
+  -open Tezos_rpc))
diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune
index 59583c624e291509c836ed4f622c5463a748c2e0..44affb9a13de413f0f12ee6c4772a307e5a2b7c1 100644
--- a/src/proto_004_Pt24m4xi/lib_client_commands/dune
+++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_004_Pt24m4xi
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_004_Pt24m4xi
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_004_Pt24m4xi
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_004_Pt24m4xi
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_004_Pt24m4xi
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_004_Pt24m4xi
-   -open Tezos_client_commands
-   -open Tezos_client_004_Pt24m4xi_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_004_Pt24m4xi
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_004_Pt24m4xi
+  -open Tezos_client_commands
+  -open Tezos_client_004_Pt24m4xi_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune
index 60a40adbcfb0809e3420f98edd4d7a2bfa8ee168..f30b692d35181b837553b099555a19c5a53008e4 100644
--- a/src/proto_004_Pt24m4xi/lib_protocol/dune
+++ b/src/proto_004_Pt24m4xi/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-004-Pt24m4xi.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_004_Pt24m4xi.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_004_Pt24m4xi.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -112,9 +112,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -291,9 +291,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -384,9 +384,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune
index 837c1496ab7dafbe8efb9d1561875268953820e3..28f320e8c1dec57443c068fbbcfdff226f0ef6c4 100644
--- a/src/proto_005_PsBABY5H/lib_protocol/dune
+++ b/src/proto_005_PsBABY5H/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-005-PsBABY5H.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_005_PsBABY5H.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_005_PsBABY5H.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -113,9 +113,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -294,9 +294,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -388,9 +388,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune
index 6ce5a1229e261d402226abb01f803fa83a99437a..b51896e5855412f24118468cdff7c5521a1f0f5a 100644
--- a/src/proto_005_PsBabyM1/lib_client/dune
+++ b/src/proto_005_PsBabyM1/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_005_PsBabyM1
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_005_PsBabyM1
+  -open Tezos_rpc))
diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune
index 377767c68affb556bb70ddb88da246e81521a5b1..b02ddcae19056fed75267b78a69a58b0c8a16b34 100644
--- a/src/proto_005_PsBabyM1/lib_client_commands/dune
+++ b/src/proto_005_PsBabyM1/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_005_PsBabyM1
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_005_PsBabyM1
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_005_PsBabyM1
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_005_PsBabyM1
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_005_PsBabyM1
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_005_PsBabyM1
-   -open Tezos_client_commands
-   -open Tezos_client_005_PsBabyM1_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_005_PsBabyM1
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_005_PsBabyM1
+  -open Tezos_client_commands
+  -open Tezos_client_005_PsBabyM1_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune
index 34148b140d047eb65f885eaabf72dc65138208be..13f3e43a7a2b36e6abff15095594872baaa0da1f 100644
--- a/src/proto_005_PsBabyM1/lib_protocol/dune
+++ b/src/proto_005_PsBabyM1/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-005-PsBabyM1.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_005_PsBabyM1.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_005_PsBabyM1.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -113,9 +113,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -294,9 +294,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -388,9 +388,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune
index e187583ca9bde025c38af2c4c0efe5bba12698a0..12a5f0a75706e859c4a43b61d88089b7a3fcc89e 100644
--- a/src/proto_006_PsCARTHA/lib_client/dune
+++ b/src/proto_006_PsCARTHA/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_006_PsCARTHA
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_006_PsCARTHA
+  -open Tezos_rpc))
diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune
index 0d8a09d546609ce358bf444ef160a89bd7836a02..eae98a9a821eaa508b5ff1c03ccbfd883c6fc480 100644
--- a/src/proto_006_PsCARTHA/lib_client_commands/dune
+++ b/src/proto_006_PsCARTHA/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_006_PsCARTHA
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_006_PsCARTHA
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_006_PsCARTHA
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_006_PsCARTHA
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_006_PsCARTHA
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_006_PsCARTHA
-   -open Tezos_client_commands
-   -open Tezos_client_006_PsCARTHA_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_006_PsCARTHA
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_006_PsCARTHA
+  -open Tezos_client_commands
+  -open Tezos_client_006_PsCARTHA_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune
index 86cd28f116bfbd26bb235c33f6719536cf8d8e9e..1c0a764409835d3058dc163025359405eee6bfeb 100644
--- a/src/proto_006_PsCARTHA/lib_protocol/dune
+++ b/src/proto_006_PsCARTHA/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-006-PsCARTHA.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_006_PsCARTHA.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_006_PsCARTHA.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -113,9 +113,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -294,9 +294,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -388,9 +388,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune
index 44ac3dafeb93bc2c571d28550238bb260887fa59..12f706302fb9288acb3ee9b6eac4f881b6a21d83 100644
--- a/src/proto_007_PsDELPH1/lib_client/dune
+++ b/src/proto_007_PsDELPH1/lib_client/dune
@@ -14,10 +14,10 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_007_PsDELPH1
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_007_PsDELPH1
+  -open Tezos_rpc))
diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune
index 2b99683494f632686bce2cce1af4e8944d7fd0b4..4f877d212c87dc1da42f7119736e713643442499 100644
--- a/src/proto_007_PsDELPH1/lib_client_commands/dune
+++ b/src/proto_007_PsDELPH1/lib_client_commands/dune
@@ -16,16 +16,16 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_007_PsDELPH1
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_007_PsDELPH1
-   -open Tezos_client_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_007_PsDELPH1
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_007_PsDELPH1
+  -open Tezos_client_commands
+  -open Tezos_rpc)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -43,14 +43,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_007_PsDELPH1
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_007_PsDELPH1
-   -open Tezos_client_commands
-   -open Tezos_client_007_PsDELPH1_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_007_PsDELPH1
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_007_PsDELPH1
+  -open Tezos_client_commands
+  -open Tezos_client_007_PsDELPH1_commands
+  -open Tezos_rpc)
  (modules alpha_commands_registration))
diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune
index f237aa4908466aad2d99ec4505ec5895e9733f50..b4f3fcd6ed5e7dc848a7b83cddc1f7e51eca9081 100644
--- a/src/proto_007_PsDELPH1/lib_plugin/dune
+++ b/src/proto_007_PsDELPH1/lib_plugin/dune
@@ -8,10 +8,10 @@
   tezos-base
   tezos-protocol-007-PsDELPH1)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_007_PsDELPH1))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_007_PsDELPH1)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -23,10 +23,10 @@
   tezos-protocol-plugin-007-PsDELPH1
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_007_PsDELPH1
-   -open Tezos_protocol_plugin_007_PsDELPH1
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_007_PsDELPH1
+  -open Tezos_protocol_plugin_007_PsDELPH1
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune
index 1878dc7549016fad82fc84fc48703e1abebcd49e..ed10cae4931ba76b6325b0cb96e525a0f7afb1ca 100644
--- a/src/proto_007_PsDELPH1/lib_protocol/dune
+++ b/src/proto_007_PsDELPH1/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-007-PsDELPH1.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_007_PsDELPH1.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_007_PsDELPH1.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -115,9 +115,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -300,9 +300,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -396,9 +396,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune
index 3386055076b0bdbd3854047870c7ffbef17e8cb3..cfabef1bd5313631a78771a55f74262fd673b40d 100644
--- a/src/proto_008_PtEdo2Zk/lib_client/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client/dune
@@ -15,11 +15,11 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_008_PtEdo2Zk
-   -open Tezos_protocol_plugin_008_PtEdo2Zk
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_008_PtEdo2Zk
+  -open Tezos_protocol_plugin_008_PtEdo2Zk
+  -open Tezos_rpc))
diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
index 8938dd24b071c725695a95dbe2ff06db5b32d4a1..2df48867a7b6c0aeea604dbc8a02ea5a2cd0ee9f 100644
--- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune
+++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune
@@ -18,17 +18,17 @@
   tezos-protocol-plugin-008-PtEdo2Zk)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_008_PtEdo2Zk
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_008_PtEdo2Zk
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_008_PtEdo2Zk))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_008_PtEdo2Zk
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_008_PtEdo2Zk
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_008_PtEdo2Zk)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -48,15 +48,15 @@
   tezos-protocol-plugin-008-PtEdo2Zk)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_008_PtEdo2Zk
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_008_PtEdo2Zk
-   -open Tezos_client_commands
-   -open Tezos_client_008_PtEdo2Zk_commands
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_008_PtEdo2Zk))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_008_PtEdo2Zk
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_008_PtEdo2Zk
+  -open Tezos_client_commands
+  -open Tezos_client_008_PtEdo2Zk_commands
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_008_PtEdo2Zk)
  (modules alpha_commands_registration))
diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune
index 59096e6faf5ccb679362725c8f9e346f7188aae2..624c38de08ff500beaeab3a970dd3aca5d6cfd3e 100644
--- a/src/proto_008_PtEdo2Zk/lib_plugin/dune
+++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-008-PtEdo2Zk)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_008_PtEdo2Zk))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_008_PtEdo2Zk)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-008-PtEdo2Zk
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_008_PtEdo2Zk
-   -open Tezos_protocol_plugin_008_PtEdo2Zk
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_008_PtEdo2Zk
+  -open Tezos_protocol_plugin_008_PtEdo2Zk
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune
index 68336b56cfc77a9b79cb361b1b17950264915572..d1b2a088e6b7b27dab8447e70110f9a9e80986cc 100644
--- a/src/proto_008_PtEdo2Zk/lib_protocol/dune
+++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-008-PtEdo2Zk.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_008_PtEdo2Zk.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_008_PtEdo2Zk.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -120,9 +120,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -315,9 +315,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -416,9 +416,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune
index 8a9283b9bed76812a8c5bb3c713a1e0d1be33f2c..3f6548997e3edc9fe9344a305866a33994319db5 100644
--- a/src/proto_008_PtEdoTez/lib_protocol/dune
+++ b/src/proto_008_PtEdoTez/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-008-PtEdoTez.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_008_PtEdoTez.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_008_PtEdoTez.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -120,9 +120,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -315,9 +315,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -416,9 +416,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune
index 43833471e22efa8b26ed96b773106f1c768700b4..2dcd21413cabc004ca52f91fe549caf4a1104e4d 100644
--- a/src/proto_009_PsFLoren/lib_client/dune
+++ b/src/proto_009_PsFLoren/lib_client/dune
@@ -17,11 +17,11 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_009_PsFLoren
-   -open Tezos_protocol_plugin_009_PsFLoren
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_009_PsFLoren
+  -open Tezos_protocol_plugin_009_PsFLoren
+  -open Tezos_rpc))
diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune
index c392b16b0c9fbaec67101117ce13a269a2f6e0b3..2bf1e497003c5cdab737ca6feebd4a6e89bf7936 100644
--- a/src/proto_009_PsFLoren/lib_client_commands/dune
+++ b/src/proto_009_PsFLoren/lib_client_commands/dune
@@ -19,18 +19,18 @@
   tezos-protocol-plugin-009-PsFLoren)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_009_PsFLoren
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_009_PsFLoren
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_009_PsFLoren))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_009_PsFLoren
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_009_PsFLoren
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_009_PsFLoren)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -50,15 +50,15 @@
   tezos-protocol-plugin-009-PsFLoren)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_009_PsFLoren
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_009_PsFLoren
-   -open Tezos_client_commands
-   -open Tezos_client_009_PsFLoren_commands
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_009_PsFLoren))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_009_PsFLoren
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_009_PsFLoren
+  -open Tezos_client_commands
+  -open Tezos_client_009_PsFLoren_commands
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_009_PsFLoren)
  (modules alpha_commands_registration))
diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune
index d9c5a7cbeaaaf197f0d929c939577ce2e8802108..2e834249870384b437f9e939a57098ee3f024cdf 100644
--- a/src/proto_009_PsFLoren/lib_plugin/dune
+++ b/src/proto_009_PsFLoren/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-009-PsFLoren)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_009_PsFLoren))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_009_PsFLoren)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-009-PsFLoren
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_009_PsFLoren
-   -open Tezos_protocol_plugin_009_PsFLoren
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_009_PsFLoren
+  -open Tezos_protocol_plugin_009_PsFLoren
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune
index 5474e0791565fbc188860342fe343588fda6cb74..8537e9e6df9e0dfeede6187312b6239ff98ee75e 100644
--- a/src/proto_009_PsFLoren/lib_protocol/dune
+++ b/src/proto_009_PsFLoren/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-009-PsFLoren.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_009_PsFLoren.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_009_PsFLoren.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -123,9 +123,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -324,9 +324,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -428,9 +428,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune
index e7fb29dee12df9fe4529ab534b7874a63bacb42b..22fc4577f90f5c64e8433d110002c60cff317210 100644
--- a/src/proto_010_PtGRANAD/lib_client/dune
+++ b/src/proto_010_PtGRANAD/lib_client/dune
@@ -17,11 +17,11 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_010_PtGRANAD
-   -open Tezos_protocol_plugin_010_PtGRANAD
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_010_PtGRANAD
+  -open Tezos_protocol_plugin_010_PtGRANAD
+  -open Tezos_rpc))
diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune
index 9bcd2e088f772e8c3d35664d774ce8a52c1845ba..454d11459df499ecc9ecfa3f881bf0ade71129ef 100644
--- a/src/proto_010_PtGRANAD/lib_client_commands/dune
+++ b/src/proto_010_PtGRANAD/lib_client_commands/dune
@@ -19,18 +19,18 @@
   tezos-protocol-plugin-010-PtGRANAD)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_010_PtGRANAD
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_010_PtGRANAD
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_010_PtGRANAD))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_010_PtGRANAD
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_010_PtGRANAD
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_010_PtGRANAD)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -50,15 +50,15 @@
   tezos-protocol-plugin-010-PtGRANAD)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_010_PtGRANAD
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_010_PtGRANAD
-   -open Tezos_client_commands
-   -open Tezos_client_010_PtGRANAD_commands
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_010_PtGRANAD))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_010_PtGRANAD
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_010_PtGRANAD
+  -open Tezos_client_commands
+  -open Tezos_client_010_PtGRANAD_commands
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_010_PtGRANAD)
  (modules alpha_commands_registration))
diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune
index 60007c8eadfc00340932290eff3d74211a8fdc60..a249bc0db86f45356a56af0938aa6eb739c76cfb 100644
--- a/src/proto_010_PtGRANAD/lib_plugin/dune
+++ b/src/proto_010_PtGRANAD/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-010-PtGRANAD)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_010_PtGRANAD))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_010_PtGRANAD)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-010-PtGRANAD
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_010_PtGRANAD
-   -open Tezos_protocol_plugin_010_PtGRANAD
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_010_PtGRANAD
+  -open Tezos_protocol_plugin_010_PtGRANAD
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune
index ef252d922b0d4687d43c689c199bcbdf4b4903b4..0ccea78d1cf11d74034a27188e8b11c9ed7f232f 100644
--- a/src/proto_010_PtGRANAD/lib_protocol/dune
+++ b/src/proto_010_PtGRANAD/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-010-PtGRANAD.environment)
  (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
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_010_PtGRANAD.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_010_PtGRANAD.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Storage_description
@@ -128,9 +128,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -339,9 +339,9 @@
   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
-   -nopervasives))
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -448,9 +448,9 @@
   tezos-protocol-environment)
  (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))
+  (:standard)
+  -w +a-4-6-7-9-16-29-32-40..42-44-45-48-51-60-67-68-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune
index c3e232ad405e97ee9548be360062d272208e5b96..14e10b37aff3f200c5c723b1d87516a2bdbeff83 100644
--- a/src/proto_011_PtHangz2/lib_client/dune
+++ b/src/proto_011_PtHangz2/lib_client/dune
@@ -20,12 +20,12 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_011_PtHangz2
-   -open Tezos_protocol_plugin_011_PtHangz2
-   -open Tezos_protocol_011_PtHangz2_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_011_PtHangz2
+  -open Tezos_protocol_plugin_011_PtHangz2
+  -open Tezos_protocol_011_PtHangz2_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_011_PtHangz2/lib_client/test/dune b/src/proto_011_PtHangz2/lib_client/test/dune
index 2cd55f021c02121986bd79c581ffd4bd677aa424..2f067d44bd9bd624bfaa0dba33c61567974b79a3 100644
--- a/src/proto_011_PtHangz2/lib_client/test/dune
+++ b/src/proto_011_PtHangz2/lib_client/test/dune
@@ -17,14 +17,14 @@
   alcotest-lwt
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_011_PtHangz2
-   -open Tezos_protocol_011_PtHangz2
-   -open Tezos_base_test_helpers
-   -open Lib_test)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_011_PtHangz2
+  -open Tezos_protocol_011_PtHangz2
+  -open Tezos_base_test_helpers
+  -open Lib_test))
 
 (rule
  (alias runtest)
diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune
index ec656aafed4f835a4254f121e2d2e4fdb3db5a38..388b2dcf209cb9e63e4af5205c3beb7fce61be8f 100644
--- a/src/proto_011_PtHangz2/lib_client_commands/dune
+++ b/src/proto_011_PtHangz2/lib_client_commands/dune
@@ -22,18 +22,18 @@
   tezos-protocol-plugin-011-PtHangz2)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_011_PtHangz2
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_011_PtHangz2
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_011_PtHangz2))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_011_PtHangz2
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_011_PtHangz2
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_011_PtHangz2)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -54,16 +54,16 @@
   tezos-protocol-plugin-011-PtHangz2)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_011_PtHangz2
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_011_PtHangz2
-   -open Tezos_client_commands
-   -open Tezos_client_011_PtHangz2_commands
-   -open Tezos_client_sapling_011_PtHangz2
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_011_PtHangz2))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_011_PtHangz2
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_011_PtHangz2
+  -open Tezos_client_commands
+  -open Tezos_client_011_PtHangz2_commands
+  -open Tezos_client_sapling_011_PtHangz2
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_011_PtHangz2)
  (modules alpha_commands_registration))
diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune
index e115326c309b60e1b44eb98e11ab212fbd486ada..593ba47dfd004f31f90ef1625d59f63ed593e1a2 100644
--- a/src/proto_011_PtHangz2/lib_client_sapling/dune
+++ b/src/proto_011_PtHangz2/lib_client_sapling/dune
@@ -17,12 +17,12 @@
   tezos-protocol-011-PtHangz2.environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_011_PtHangz2
-   -open Tezos_client_011_PtHangz2_commands
-   -open Tezos_protocol_011_PtHangz2
-   -open Tezos_protocol_environment_011_PtHangz2)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_011_PtHangz2
+  -open Tezos_client_011_PtHangz2_commands
+  -open Tezos_protocol_011_PtHangz2
+  -open Tezos_protocol_environment_011_PtHangz2))
diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune
index 5155a595ff7c211cd0fda2861b0c650b5a26cdf8..f6aa1419c82177553358c4980e178704554685af 100644
--- a/src/proto_011_PtHangz2/lib_parameters/dune
+++ b/src/proto_011_PtHangz2/lib_parameters/dune
@@ -11,9 +11,9 @@
   tezos-protocol-011-PtHangz2)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_011_PtHangz2))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_011_PtHangz2)
  (modules (:standard \ gen)))
 
 (executable
@@ -23,9 +23,9 @@
   tezos-protocol-011-PtHangz2.parameters)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_011_PtHangz2_parameters))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_011_PtHangz2_parameters)
  (modules gen))
 
 (rule
diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune
index 36a356a4474a79c527178111b37fb58368a130e5..f5838c36abc3df305b3e6fc96c687a2ea3256b25 100644
--- a/src/proto_011_PtHangz2/lib_plugin/dune
+++ b/src/proto_011_PtHangz2/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-011-PtHangz2)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_011_PtHangz2))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_011_PtHangz2)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-011-PtHangz2
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_011_PtHangz2
-   -open Tezos_protocol_plugin_011_PtHangz2
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_011_PtHangz2
+  -open Tezos_protocol_plugin_011_PtHangz2
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 66ee5aced61feabf6cac972abd2d804802dd02b6..693fb21ff8fdc57d16a26e527832d33fc3458f96 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-011-PtHangz2.environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -w +a-4-40..42-44-45-48-51-70
-   -warn-error +a
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_011_PtHangz2.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_011_PtHangz2.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Path_encoding
@@ -140,9 +140,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -376,9 +376,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -497,9 +497,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-51-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune
index 3b72637a2a0aa4501fad37450d434e67731421c7..daa3bf0a3bce3769e7861b6b8b9cd62ca7a43852 100644
--- a/src/proto_012_Psithaca/bin_accuser/dune
+++ b/src/proto_012_Psithaca/bin_accuser/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_baking_012_Psithaca_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_baking_012_Psithaca_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune
index 2e929e8c6550d167166c597001431f654bfd7e58..6b24571329592a2cdd669683b96bb1010b8738e9 100644
--- a/src/proto_012_Psithaca/bin_baker/dune
+++ b/src/proto_012_Psithaca/bin_baker/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_baking_012_Psithaca_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_baking_012_Psithaca_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_012_Psithaca/lib_benchmark/dune b/src/proto_012_Psithaca/lib_benchmark/dune
index 21429caa9f494c0803521ab3ad196b997ee1f2f3..7dc7450270f24001d232e36d91a295ec3307c1c1 100644
--- a/src/proto_012_Psithaca/lib_benchmark/dune
+++ b/src/proto_012_Psithaca/lib_benchmark/dune
@@ -21,16 +21,16 @@
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_crypto
-   -open Tezos_012_Psithaca_test_helpers))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_crypto
+  -open Tezos_012_Psithaca_test_helpers)
  (private_modules kernel rules state_space))
diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune
index 4de2bf16aa72ae8243c900ba0b7509b44a52387b..6b76db68f888202488be7c67497e572960656f49 100644
--- a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune
@@ -14,9 +14,9 @@
   tezos-protocol-012-Psithaca
   hashcons)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_protocol_012_Psithaca)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_protocol_012_Psithaca))
diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune
index a1a87f52d8a717be1b030bb61e2b141b84c5ce16..e1daf0bbd7a65d45f09f5dcef8a701f920997315 100644
--- a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -11,9 +11,9 @@
   tezos-error-monad
   tezos-client-012-Psithaca)
  (flags
-  (:standard
-   -open Tezos_micheline
-   -open Tezos_benchmark_type_inference_012_Psithaca)))
+  (:standard)
+  -open Tezos_micheline
+  -open Tezos_benchmark_type_inference_012_Psithaca))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_benchmark/test/dune b/src/proto_012_Psithaca/lib_benchmark/test/dune
index 8143618c48f67b4b9c3790c13fc426c96434be0f..0e65ea7f74abf30f8677ea42e8154cd37e708246 100644
--- a/src/proto_012_Psithaca/lib_benchmark/test/dune
+++ b/src/proto_012_Psithaca/lib_benchmark/test/dune
@@ -20,14 +20,14 @@
   alcotest-lwt
   prbnmcn-stats)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_012_Psithaca
-   -open Tezos_benchmark_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_012_Psithaca
+  -open Tezos_benchmark_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers))
 
 (rule
  (alias runtest_micheline_rewriting_data)
diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/dune b/src/proto_012_Psithaca/lib_benchmarks_proto/dune
index 0ab1d38d63e999a443c2f4daaeb9816516bec6fa..cab7ecc383ca130d7e8f2d54f09da0a72b98582d 100644
--- a/src/proto_012_Psithaca/lib_benchmarks_proto/dune
+++ b/src/proto_012_Psithaca/lib_benchmarks_proto/dune
@@ -25,18 +25,18 @@
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_benchmark
-   -open Tezos_benchmark_012_Psithaca
-   -open Tezos_benchmark_type_inference_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_raw_protocol_012_Psithaca
-   -open Tezos_crypto
-   -open Tezos_micheline
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_client_012_Psithaca)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_benchmark
+  -open Tezos_benchmark_012_Psithaca
+  -open Tezos_benchmark_type_inference_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_raw_protocol_012_Psithaca
+  -open Tezos_crypto
+  -open Tezos_micheline
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_client_012_Psithaca))
diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune
index 113816a99bcbd40660e9c57dca6d05e1578738fe..95d0e8d358dba71ecf70bd4f29cbef114469d122 100644
--- a/src/proto_012_Psithaca/lib_client/dune
+++ b/src/proto_012_Psithaca/lib_client/dune
@@ -20,12 +20,12 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_plugin_012_Psithaca
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_plugin_012_Psithaca
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_012_Psithaca/lib_client/test/dune b/src/proto_012_Psithaca/lib_client/test/dune
index c44954bce05dfda8065632a776c134a2e44f70ab..3e0ee29407be280710d3e0945d3feebf0a57630d 100644
--- a/src/proto_012_Psithaca/lib_client/test/dune
+++ b/src/proto_012_Psithaca/lib_client/test/dune
@@ -17,14 +17,14 @@
   alcotest-lwt
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_base_test_helpers
-   -open Lib_test)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_base_test_helpers
+  -open Lib_test))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune
index 5b701c45a58833303af4f4736fc771572b2bc25a..cac9ec57c6b0d4bc08b7da8625e589e2102a0639 100644
--- a/src/proto_012_Psithaca/lib_client_commands/dune
+++ b/src/proto_012_Psithaca/lib_client_commands/dune
@@ -22,18 +22,18 @@
   tezos-protocol-plugin-012-Psithaca)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_012_Psithaca))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_012_Psithaca)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -54,16 +54,16 @@
   tezos-protocol-plugin-012-Psithaca)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_client_012_Psithaca_commands
-   -open Tezos_client_sapling_012_Psithaca
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_012_Psithaca))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_client_012_Psithaca_commands
+  -open Tezos_client_sapling_012_Psithaca
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_012_Psithaca)
  (modules alpha_commands_registration))
diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune
index bd149aa597ee429afe7238b45474af31cf64d42f..7af8c25abc368b164ccbde50937a89aa3fc7db53 100644
--- a/src/proto_012_Psithaca/lib_client_sapling/dune
+++ b/src/proto_012_Psithaca/lib_client_sapling/dune
@@ -17,12 +17,12 @@
   tezos-protocol-012-Psithaca.environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_012_Psithaca_commands
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_environment_012_Psithaca)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_012_Psithaca_commands
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca))
diff --git a/src/proto_012_Psithaca/lib_delegate/dune b/src/proto_012_Psithaca/lib_delegate/dune
index aba1d230bee6f16b80fc86efc61a721f0c57b9a6..d77dc59b050ac2c16fa310179773a17eb68efe56 100644
--- a/src/proto_012_Psithaca/lib_delegate/dune
+++ b/src/proto_012_Psithaca/lib_delegate/dune
@@ -27,21 +27,21 @@
   lwt-exit)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_plugin_012_Psithaca
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_stdlib
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_context
-   -open Tezos_context
-   -open Tezos_rpc
-   -open Tezos_rpc_http))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_plugin_012_Psithaca
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_stdlib
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_context
+  -open Tezos_context
+  -open Tezos_rpc
+  -open Tezos_rpc_http)
  (modules (:standard \ Baking_commands Baking_commands_registration)))
 
 (library
@@ -61,17 +61,17 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_baking_012_Psithaca
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_baking_012_Psithaca
+  -open Tezos_rpc)
  (modules Baking_commands))
 
 (library
@@ -91,14 +91,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_baking_012_Psithaca
-   -open Tezos_baking_012_Psithaca_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_baking_012_Psithaca
+  -open Tezos_baking_012_Psithaca_commands
+  -open Tezos_rpc)
  (modules Baking_commands_registration))
diff --git a/src/proto_012_Psithaca/lib_delegate/test/dune b/src/proto_012_Psithaca/lib_delegate/test/dune
index e0cbcb2bc179fbed78c99ecfeb01bb0f77235c7f..526659f988e923e8ae32a035edbeab6e374f5b6a 100644
--- a/src/proto_012_Psithaca/lib_delegate/test/dune
+++ b/src/proto_012_Psithaca/lib_delegate/test/dune
@@ -16,16 +16,16 @@
   tezos-crypto
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_environment_012_Psithaca
-   -open Tezos_base_test_helpers
-   -open Tezos_012_Psithaca_mockup_simulator
-   -open Tezos_baking_012_Psithaca)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_base_test_helpers
+  -open Tezos_012_Psithaca_mockup_simulator
+  -open Tezos_baking_012_Psithaca))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
index fed71f518bd48aaebc4b69038018e10d3571362c..7e4cb5663959a8f9a09cded84c2f856de3eb8924 100644
--- a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune
@@ -17,14 +17,14 @@
   tezos-mockup-proxy
   tezos-mockup-commands)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_client_012_Psithaca
-   -open Tezos_client_commands
-   -open Tezos_baking_012_Psithaca
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_protocol_012_Psithaca.Protocol)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_client_012_Psithaca
+  -open Tezos_client_commands
+  -open Tezos_baking_012_Psithaca
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_protocol_012_Psithaca.Protocol))
diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune
index eb1ec036d201a8950c8d3fc61f89ef52aee03652..47c29e8dce25cc707656ee5bb1d4a44e61bfdec8 100644
--- a/src/proto_012_Psithaca/lib_parameters/dune
+++ b/src/proto_012_Psithaca/lib_parameters/dune
@@ -11,9 +11,9 @@
   tezos-protocol-012-Psithaca)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_012_Psithaca))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_012_Psithaca)
  (modules (:standard \ gen)))
 
 (executable
@@ -24,10 +24,10 @@
   tezos-protocol-012-Psithaca)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_protocol_012_Psithaca))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_protocol_012_Psithaca)
  (modules gen))
 
 (rule
diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune
index d56ecd3d57f735b59e9964b9096e5b269b38d5a6..edb66c2d20a2a8a0c2a5fc83237ebd427df34e38 100644
--- a/src/proto_012_Psithaca/lib_plugin/dune
+++ b/src/proto_012_Psithaca/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-012-Psithaca)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-012-Psithaca
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_012_Psithaca
-   -open Tezos_protocol_plugin_012_Psithaca
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_012_Psithaca
+  -open Tezos_protocol_plugin_012_Psithaca
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_012_Psithaca/lib_plugin/test/dune b/src/proto_012_Psithaca/lib_plugin/test/dune
index 945c46cb6c57e37b120b9c67e8be35443b174122..ddd216c1640d626fa85426cad8f313a71adb28ed 100644
--- a/src/proto_012_Psithaca/lib_plugin/test/dune
+++ b/src/proto_012_Psithaca/lib_plugin/test/dune
@@ -17,17 +17,17 @@
   tezos-protocol-012-Psithaca.parameters
   tezos-012-Psithaca-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_protocol_plugin_012_Psithaca
-   -open Tezos_protocol_environment_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_012_Psithaca.Protocol
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_012_Psithaca_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_protocol_plugin_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_012_Psithaca.Protocol
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_012_Psithaca_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index d689fca95d490fa07380abd0fd740b123da8bda9..45f319b15b187738f90e961c0833aac64e57f304 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-012-Psithaca.environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -w +a-4-40..42-44-45-48-51-70
-   -warn-error +a
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_012_Psithaca.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_012_Psithaca.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -157,9 +157,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -427,9 +427,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -565,9 +565,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-51-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune
index dcdf7b735eaccb4a74da69ce82cb81428c306327..43128051c6bd0631553ba227a6b1465e3ea1053b 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune
@@ -20,13 +20,13 @@
   tezos-protocol-012-Psithaca.environment
   tezos-shell-services)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_stdlib_unix
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_plugin_012_Psithaca
-   -open Tezos_protocol_environment_012_Psithaca
-   -open Tezos_shell_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_stdlib_unix
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_plugin_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_shell_services))
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune
index 74e4e0b4b140606ad88785dc5b729afe890a6ab5..e39efde10f11aa551f8ab60f46c042605e19178f 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune
@@ -12,14 +12,14 @@
   tezos-protocol-012-Psithaca.parameters
   tezos-protocol-plugin-012-Psithaca)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_protocol_plugin_012_Psithaca)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_protocol_plugin_012_Psithaca))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/dune
index a0c7891083e74c609324393cdb907a9d354a824c..3c92107104c73f146e66eb7e9bf4dd38b6cecbc7 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/dune
@@ -13,14 +13,14 @@
   tezos-012-Psithaca-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_012_Psithaca_parameters
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_012_Psithaca_parameters
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/gas/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/gas/dune
index b6396ca4ed74fbfb294f303cc39af4f2ff7262a1..df193e5f65309b547eba89ca2ad4ae4d8e70e633 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/gas/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/gas/dune
@@ -10,12 +10,12 @@
   tezos-012-Psithaca-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/dune
index d490b7d857d13e2c8489d894bed2dd29c5bd613f..4bf9e951571614b1832291035d373421f55d1550 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/michelson/dune
@@ -16,16 +16,16 @@
   tezos-benchmark-012-Psithaca
   tezos-benchmark-type-inference-012-Psithaca)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_client_012_Psithaca
-   -open Tezos_micheline
-   -open Tezos_benchmark_012_Psithaca
-   -open Tezos_benchmark_type_inference_012_Psithaca)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_client_012_Psithaca
+  -open Tezos_micheline
+  -open Tezos_benchmark_012_Psithaca
+  -open Tezos_benchmark_type_inference_012_Psithaca))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/operations/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/operations/dune
index d8161c57bfaf105a65cd3aa8c115ccceabbde05a..381de452feadefe47ec52ca5b5ecc225c8a99012 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/integration/operations/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/integration/operations/dune
@@ -11,13 +11,13 @@
   tezos-012-Psithaca-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_client_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_client_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/pbt/dune b/src/proto_012_Psithaca/lib_protocol/test/pbt/dune
index 07c95c4461c90006c078e8c48a761186ce0be946..27213755018e3b37462501a31a6edf965143e119 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/pbt/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/pbt/dune
@@ -23,15 +23,15 @@
   tezos-benchmark-012-Psithaca
   tezos-benchmark-type-inference-012-Psithaca)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers
-   -open Tezos_benchmark_012_Psithaca
-   -open Tezos_benchmark_type_inference_012_Psithaca)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers
+  -open Tezos_benchmark_012_Psithaca
+  -open Tezos_benchmark_type_inference_012_Psithaca))
 
 (rule
  (alias runtest)
diff --git a/src/proto_012_Psithaca/lib_protocol/test/unit/dune b/src/proto_012_Psithaca/lib_protocol/test/unit/dune
index 6ba7f80bdc9648ec119fcdba355657978203ddea..e5838098e220a5fa925e6eb9d6e50dedc72c4fec 100644
--- a/src/proto_012_Psithaca/lib_protocol/test/unit/dune
+++ b/src/proto_012_Psithaca/lib_protocol/test/unit/dune
@@ -17,15 +17,15 @@
   tezos-012-Psithaca-test-helpers
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_client_012_Psithaca
-   -open Tezos_protocol_012_Psithaca
-   -open Tezos_protocol_environment_012_Psithaca
-   -open Tezos_012_Psithaca_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_client_012_Psithaca
+  -open Tezos_protocol_012_Psithaca
+  -open Tezos_protocol_environment_012_Psithaca
+  -open Tezos_012_Psithaca_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune
index 901713b7afae47ce0d080cb4f6a178420a9e2c32..4a51c4d009c7f4551ec801017bf7890a8ffaeed6 100644
--- a/src/proto_013_PtJakart/bin_accuser/dune
+++ b/src/proto_013_PtJakart/bin_accuser/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune
index ab9fcb2630be5a3ef5ef0a5a63ddf31dad28336a..6dcf377bedc30f361d5707bd9538f31da14ab93c 100644
--- a/src/proto_013_PtJakart/bin_baker/dune
+++ b/src/proto_013_PtJakart/bin_baker/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune
index 12f1d612a4e05a25b35d01e1e6ee9f84beb3a109..fb3c8c4bbd21afaf6db1b9e7ba4052911a7df74c 100644
--- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune
+++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune
@@ -20,13 +20,13 @@
   tezos-protocol-013-PtJakart
   tezos-sc-rollup-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_sc_rollup_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_sc_rollup_013_PtJakart))
diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune
index 9baf3f7d25f2b7af24c90bfd9c9c1e613827eaa9..c8f692b950d298befd5a629ca496f11165553768 100644
--- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune
+++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune
@@ -32,17 +32,17 @@
   ringo
   ringo-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_rpc
-   -open Tezos_shell_services
-   -open Tezos_sc_rollup_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_rpc
+  -open Tezos_shell_services
+  -open Tezos_sc_rollup_013_PtJakart))
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
index 23cd5884db41c245796f32b3661f7ad6e0e09a1e..c63080db4ea860d195f59759d063162b6d3205d3 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune
+++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
@@ -18,13 +18,13 @@
   tezos-tx-rollup-013-PtJakart
   tezos-protocol-013-PtJakart.raw)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_013_PtJakart_commands
-   -open Tezos_client_base_unix
-   -open Tezos_stdlib_unix
-   -open Tezos_tx_rollup_013_PtJakart
-   -open Tezos_raw_protocol_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_013_PtJakart_commands
+  -open Tezos_client_base_unix
+  -open Tezos_stdlib_unix
+  -open Tezos_tx_rollup_013_PtJakart
+  -open Tezos_raw_protocol_013_PtJakart))
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune
index 7de75c320483c5120cd8f6c02181019ce08ca981..c1f148f75c0a4b42184b1ee2211bf2caa9cf9cd2 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune
+++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune
@@ -16,12 +16,12 @@
   tezos-client-base-unix
   tezos-tx-rollup-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_tx_rollup_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_tx_rollup_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_benchmark/dune b/src/proto_013_PtJakart/lib_benchmark/dune
index 40099aaadfeccbd3fd487959f24ec2bb51965671..e285d9d7ef49cbf510a3a175d29e7ddc6c954fa8 100644
--- a/src/proto_013_PtJakart/lib_benchmark/dune
+++ b/src/proto_013_PtJakart/lib_benchmark/dune
@@ -20,16 +20,16 @@
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_crypto
-   -open Tezos_013_PtJakart_test_helpers))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_crypto
+  -open Tezos_013_PtJakart_test_helpers)
  (private_modules kernel rules state_space))
diff --git a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune
index 73367658b4ceabe8c0bd4b6c940504bd21e09a3d..9e80bfe152eef83c1c6dec40794e378812a92199 100644
--- a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune
@@ -14,9 +14,9 @@
   tezos-protocol-013-PtJakart
   hashcons)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_protocol_013_PtJakart)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_protocol_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/test/dune
index a79501b2019b5dfb82a59cdc6265f10d2c5db359..cf66138ab693fdef9ce49d5e0a89c21c544ca6e5 100644
--- a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -11,9 +11,9 @@
   tezos-error-monad
   tezos-client-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_micheline
-   -open Tezos_benchmark_type_inference_013_PtJakart)))
+  (:standard)
+  -open Tezos_micheline
+  -open Tezos_benchmark_type_inference_013_PtJakart))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_benchmark/test/dune b/src/proto_013_PtJakart/lib_benchmark/test/dune
index eb5af53a894d4a0379c787284637d25dffa45566..c6158a2b6106c85b69df56f27ec50cf00a6ca120 100644
--- a/src/proto_013_PtJakart/lib_benchmark/test/dune
+++ b/src/proto_013_PtJakart/lib_benchmark/test/dune
@@ -20,14 +20,14 @@
   alcotest-lwt
   prbnmcn-stats)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_013_PtJakart
-   -open Tezos_benchmark_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_013_PtJakart
+  -open Tezos_benchmark_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers))
 
 (rule
  (alias runtest_micheline_rewriting_data)
diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/dune b/src/proto_013_PtJakart/lib_benchmarks_proto/dune
index 8f9ebf315b4cde88c7f68c4afeaee1204d24e364..cf8a353a83734385779fcdd619d1804f5820128d 100644
--- a/src/proto_013_PtJakart/lib_benchmarks_proto/dune
+++ b/src/proto_013_PtJakart/lib_benchmarks_proto/dune
@@ -25,18 +25,18 @@
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_benchmark
-   -open Tezos_benchmark_013_PtJakart
-   -open Tezos_benchmark_type_inference_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_raw_protocol_013_PtJakart
-   -open Tezos_crypto
-   -open Tezos_micheline
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_client_013_PtJakart)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_benchmark
+  -open Tezos_benchmark_013_PtJakart
+  -open Tezos_benchmark_type_inference_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_raw_protocol_013_PtJakart
+  -open Tezos_crypto
+  -open Tezos_micheline
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_client_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune
index 3bd636b7459bb9d34f49363cb8ea693e5f1e6729..2ecdef28e9825ea79e037b1355c9c3795bb46282 100644
--- a/src/proto_013_PtJakart/lib_client/dune
+++ b/src/proto_013_PtJakart/lib_client/dune
@@ -20,12 +20,12 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_013_PtJakart/lib_client/test/dune b/src/proto_013_PtJakart/lib_client/test/dune
index a3cef0ba1682bc7f2ad9fb1aea91724b90f089e0..1739af8200c072e8e0662da7784aa0467dcacf62 100644
--- a/src/proto_013_PtJakart/lib_client/test/dune
+++ b/src/proto_013_PtJakart/lib_client/test/dune
@@ -17,14 +17,14 @@
   alcotest-lwt
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_base_test_helpers
-   -open Lib_test)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_base_test_helpers
+  -open Lib_test))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune
index 64de5d63adfed06a618296ae0ac82bdc8b0e86a6..da8371f402d08901b4a66fd12e45ead763792b6d 100644
--- a/src/proto_013_PtJakart/lib_client_commands/dune
+++ b/src/proto_013_PtJakart/lib_client_commands/dune
@@ -23,19 +23,19 @@
   tezos-protocol-plugin-013-PtJakart)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_013_PtJakart))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_013_PtJakart)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -57,17 +57,17 @@
   tezos-protocol-plugin-013-PtJakart)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_client_013_PtJakart_commands
-   -open Tezos_client_sapling_013_PtJakart
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_013_PtJakart))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_client_013_PtJakart_commands
+  -open Tezos_client_sapling_013_PtJakart
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_013_PtJakart)
  (modules alpha_commands_registration))
diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune
index ec4e68f7c40c9469b942196c1b4079ecbfc3082d..f44d1bd7425c4d4dfbd4db6d0c18392ebff76fc5 100644
--- a/src/proto_013_PtJakart/lib_client_sapling/dune
+++ b/src/proto_013_PtJakart/lib_client_sapling/dune
@@ -18,13 +18,13 @@
   tezos-protocol-plugin-013-PtJakart)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_013_PtJakart_commands
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_013_PtJakart_commands
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_delegate/dune b/src/proto_013_PtJakart/lib_delegate/dune
index f565f6446dfa111b3d0336269b48c58eaabfe386..1a0694f4d5b2f486cf48e187be26f1a15d174797 100644
--- a/src/proto_013_PtJakart/lib_delegate/dune
+++ b/src/proto_013_PtJakart/lib_delegate/dune
@@ -27,21 +27,21 @@
   lwt-exit)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_stdlib
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_context
-   -open Tezos_context
-   -open Tezos_rpc
-   -open Tezos_rpc_http))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_stdlib
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_context
+  -open Tezos_context
+  -open Tezos_rpc
+  -open Tezos_rpc_http)
  (modules (:standard \ Baking_commands Baking_commands_registration)))
 
 (library
@@ -61,17 +61,17 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart
+  -open Tezos_rpc)
  (modules Baking_commands))
 
 (library
@@ -91,14 +91,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart
-   -open Tezos_baking_013_PtJakart_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart
+  -open Tezos_baking_013_PtJakart_commands
+  -open Tezos_rpc)
  (modules Baking_commands_registration))
diff --git a/src/proto_013_PtJakart/lib_delegate/test/dune b/src/proto_013_PtJakart/lib_delegate/test/dune
index b42353ef9ada634f36b33edff12c1186cf2b5b44..07901458bca23851026a3c6d839287967617ba34 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/dune
@@ -16,16 +16,16 @@
   tezos-crypto
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_base_test_helpers
-   -open Tezos_013_PtJakart_mockup_simulator
-   -open Tezos_baking_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_base_test_helpers
+  -open Tezos_013_PtJakart_mockup_simulator
+  -open Tezos_baking_013_PtJakart))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
index eee2708e0e889c14793dcf7b250c7262812c726d..a93b72e35f7f3c17bf757c59289e5ef08deef765 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune
@@ -18,15 +18,15 @@
   tezos-mockup-commands
   tezos-baking-013-PtJakart.tenderbrute)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tenderbrute_013_PtJakart
-   -open Tezos_protocol_013_PtJakart.Protocol)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tenderbrute_013_PtJakart
+  -open Tezos_protocol_013_PtJakart.Protocol))
diff --git a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
index a6796d80ac7acd70903035bb0a4ce152ded8329a..4de96f7b4beef7c5af04bb8a37de52b3fa0e4390 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
@@ -11,11 +11,11 @@
   tezos-baking-013-PtJakart.tenderbrute)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tenderbrute_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tenderbrute_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/lib/dune b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/lib/dune
index 1df3940b772e050364517bab7415e2f1cf51e831..4f7df429d1204924e9f7145e135c371ae4381a77 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/lib/dune
@@ -12,11 +12,11 @@
   tezos-client-base
   tezos-client-013-PtJakart)
  (flags
-  (:standard
-   -open Data_encoding
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_base
-   -open Tezos_client_013_PtJakart)))
+  (:standard)
+  -open Data_encoding
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_base
+  -open Tezos_client_013_PtJakart))
diff --git a/src/proto_013_PtJakart/lib_injector/dune b/src/proto_013_PtJakart/lib_injector/dune
index aa0d03bf1fc52a288cdbc274590e388692413e06..fc8079e4f7e9ee9645c8bec7bee24f2b579840dd 100644
--- a/src/proto_013_PtJakart/lib_injector/dune
+++ b/src/proto_013_PtJakart/lib_injector/dune
@@ -19,14 +19,14 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_crypto
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_micheline
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_base
-   -open Tezos_workers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_crypto
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_micheline
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_base
+  -open Tezos_workers))
diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune
index 4a72ab04af24e636d2d9265243aacadb2e2d3e46..9df035d1b5b9b2f39fa4462c8b6053de98c16141 100644
--- a/src/proto_013_PtJakart/lib_parameters/dune
+++ b/src/proto_013_PtJakart/lib_parameters/dune
@@ -11,9 +11,9 @@
   tezos-protocol-013-PtJakart)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_013_PtJakart))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_013_PtJakart)
  (modules (:standard \ gen)))
 
 (executable
@@ -24,10 +24,10 @@
   tezos-protocol-013-PtJakart)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_protocol_013_PtJakart))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_protocol_013_PtJakart)
  (modules gen))
 
 (rule
diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune
index 985006bb74eb7f7a52ca88108de4040d0cb5f7ba..8afa4d74c043ed7285be0d101ef67b2d0a4bc532 100644
--- a/src/proto_013_PtJakart/lib_plugin/dune
+++ b/src/proto_013_PtJakart/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-013-PtJakart
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_013_PtJakart/lib_plugin/test/dune b/src/proto_013_PtJakart/lib_plugin/test/dune
index 568c3dc825492453bc99fd2385bb0464b2693773..b7ed56e2ab4e7b15f9dad142a25df28785cc8150 100644
--- a/src/proto_013_PtJakart/lib_plugin/test/dune
+++ b/src/proto_013_PtJakart/lib_plugin/test/dune
@@ -18,17 +18,17 @@
   tezos-protocol-013-PtJakart.parameters
   tezos-013-PtJakart-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_013_PtJakart.Protocol
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_013_PtJakart_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart.Protocol
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_013_PtJakart_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index 2918010fc563cb19e00e5afbfd22a68d86335e5b..e7fc45e8f1157ebd559825e1ee5970f6735db2c3 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-013-PtJakart.environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -w +a-4-40..42-44-45-48-51-70
-   -warn-error +a
-   -nostdlib
-   -nopervasives
-   -open Tezos_protocol_environment_013_PtJakart.Environment
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_013_PtJakart.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -222,9 +222,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -624,9 +624,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
- (flags (-w +a-4-40..42-44-45-48-51-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -828,9 +828,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-51-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-51-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune
index 205d1eee114944ea861ceada8bf91f5fc73a9b61..72aaee09a31e45c53e8abf4ee2d17ac83b9b475b 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune
@@ -20,13 +20,13 @@
   tezos-protocol-013-PtJakart.environment
   tezos-shell-services)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_stdlib_unix
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_shell_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_stdlib_unix
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_shell_services))
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune
index 0ffea3660cfbdbb461d5cf55645edb8c0393bc18..89fd0d6ec645247e1350c8ceb9f81180f136b947 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune
@@ -12,14 +12,14 @@
   tezos-protocol-013-PtJakart.parameters
   tezos-protocol-plugin-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_protocol_plugin_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_protocol_plugin_013_PtJakart))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/dune
index 5f045a93b2a3e2d991401325e93d0f9b422661a6..f2d87626111a32598aa6e3f3b6bbd27582a1dbbb 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/dune
@@ -12,14 +12,14 @@
   tezos-013-PtJakart-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/gas/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/gas/dune
index d3e8de79912c341af04296a1b111dc91229b295a..ba04ffe8ed3fe8ef82427a030857cb032b7b2404 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/gas/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/gas/dune
@@ -10,12 +10,12 @@
   tezos-013-PtJakart-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune
index 1c4c8ab64298731478fd185a3da31f48646299c8..72e09a8f7eb0afa863d07b01544fad8c3b006190 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune
@@ -16,16 +16,16 @@
   tezos-benchmark-type-inference-013-PtJakart
   tezos-protocol-013-PtJakart.parameters)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_client_013_PtJakart
-   -open Tezos_micheline
-   -open Tezos_benchmark_013_PtJakart
-   -open Tezos_benchmark_type_inference_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_client_013_PtJakart
+  -open Tezos_micheline
+  -open Tezos_benchmark_013_PtJakart
+  -open Tezos_benchmark_type_inference_013_PtJakart))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/operations/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/operations/dune
index 771c03cb38966c2535016899cb80640d7987e0db..88e3cd46e6e62ce0dc84c80777a4e08c28bc7797 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/integration/operations/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/integration/operations/dune
@@ -11,13 +11,13 @@
   tezos-013-PtJakart-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/dune b/src/proto_013_PtJakart/lib_protocol/test/pbt/dune
index caa8cabce5901d94ce8c0fc2398f59c32122d040..1eb51946830daf6b5371924cd59e9ec81d8705f3 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/pbt/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/dune
@@ -28,15 +28,15 @@
   tezos-benchmark-013-PtJakart
   tezos-benchmark-type-inference-013-PtJakart)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_benchmark_013_PtJakart
-   -open Tezos_benchmark_type_inference_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_benchmark_013_PtJakart
+  -open Tezos_benchmark_type_inference_013_PtJakart))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_protocol/test/unit/dune b/src/proto_013_PtJakart/lib_protocol/test/unit/dune
index 4aece4b6124e5357a57323525edfe1aa88db02cf..5ee97703d133e8b2b269d7fe7596fdd67fd81f9d 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/unit/dune
+++ b/src/proto_013_PtJakart/lib_protocol/test/unit/dune
@@ -18,16 +18,16 @@
   alcotest-lwt
   tezos-stdlib)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_client_013_PtJakart
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_013_PtJakart_test_helpers
-   -open Tezos_stdlib)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_client_013_PtJakart
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_013_PtJakart_test_helpers
+  -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/proto_013_PtJakart/lib_sc_rollup/dune b/src/proto_013_PtJakart/lib_sc_rollup/dune
index 7067bf15af87b86c195c0bffcd410c80ff23f6d6..e84c8760b2df95e053ed7c449c85940fe8a7b97b 100644
--- a/src/proto_013_PtJakart/lib_sc_rollup/dune
+++ b/src/proto_013_PtJakart/lib_sc_rollup/dune
@@ -15,9 +15,9 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_protocol_013_PtJakart_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_protocol_013_PtJakart_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_013_PtJakart/lib_tx_rollup/dune b/src/proto_013_PtJakart/lib_tx_rollup/dune
index 78165779b116b56bae3c04298e6f391f207cf809..dfb78c5bf6903bbcb5b38466f753a304a928a9fd 100644
--- a/src/proto_013_PtJakart/lib_tx_rollup/dune
+++ b/src/proto_013_PtJakart/lib_tx_rollup/dune
@@ -32,24 +32,24 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_crypto
-   -open Tezos_protocol_013_PtJakart
-   -open Tezos_protocol_environment_013_PtJakart
-   -open Tezos_client_013_PtJakart
-   -open Tezos_client_commands
-   -open Tezos_baking_013_PtJakart_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_rpc
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_rpc_http_server
-   -open Tezos_micheline
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_workers
-   -open Tezos_protocol_plugin_013_PtJakart
-   -open Tezos_injector_013_PtJakart)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_crypto
+  -open Tezos_protocol_013_PtJakart
+  -open Tezos_protocol_environment_013_PtJakart
+  -open Tezos_client_013_PtJakart
+  -open Tezos_client_commands
+  -open Tezos_baking_013_PtJakart_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_rpc
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_rpc_http_server
+  -open Tezos_micheline
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_workers
+  -open Tezos_protocol_plugin_013_PtJakart
+  -open Tezos_injector_013_PtJakart))
diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune
index 9a5c3e500cd480ddd9d9e739940e4c9eb8bc6445..52c6022c9ed830093298440098c205bbcf40b49d 100644
--- a/src/proto_alpha/bin_accuser/dune
+++ b/src/proto_alpha/bin_accuser/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune
index 8dde7113a7faf1e6265a5852983a38d0df55f0b7..347249fba917dedd1fb207895f1d89a46fd9db0c 100644
--- a/src/proto_alpha/bin_baker/dune
+++ b/src/proto_alpha/bin_baker/dune
@@ -17,12 +17,12 @@
   tezos-stdlib-unix
   tezos-client-base-unix)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix))
diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune
index 61efa6b87b7b501d1e314c4ddc5df1440e0ea7c7..146a9faac83714c5f5e2530dbcd9af02ed97ede0 100644
--- a/src/proto_alpha/bin_sc_rollup_client/dune
+++ b/src/proto_alpha/bin_sc_rollup_client/dune
@@ -20,13 +20,13 @@
   tezos-protocol-alpha
   tezos-sc-rollup-alpha)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_protocol_alpha
-   -open Tezos_sc_rollup_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_protocol_alpha
+  -open Tezos_sc_rollup_alpha))
diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune
index e94958a0486198affa9090d33ab10365698c1b8d..8ee9f184846c33a65a329c173aa61dd7ec61dd91 100644
--- a/src/proto_alpha/bin_sc_rollup_node/dune
+++ b/src/proto_alpha/bin_sc_rollup_node/dune
@@ -32,17 +32,17 @@
   ringo
   ringo-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_rpc
-   -open Tezos_shell_services
-   -open Tezos_sc_rollup_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_rpc
+  -open Tezos_shell_services
+  -open Tezos_sc_rollup_alpha))
diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune
index 8fa338cd476e4c7db24a9709d30d02e24c4e2c1a..bf4bc5c14e66a52356bacef9b43f441137c086f4 100644
--- a/src/proto_alpha/bin_tx_rollup_client/dune
+++ b/src/proto_alpha/bin_tx_rollup_client/dune
@@ -18,13 +18,13 @@
   tezos-tx-rollup-alpha
   tezos-protocol-alpha.raw)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_alpha_commands
-   -open Tezos_client_base_unix
-   -open Tezos_stdlib_unix
-   -open Tezos_tx_rollup_alpha
-   -open Tezos_raw_protocol_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_alpha_commands
+  -open Tezos_client_base_unix
+  -open Tezos_stdlib_unix
+  -open Tezos_tx_rollup_alpha
+  -open Tezos_raw_protocol_alpha))
diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune
index 833c1539404f14dc09878774b2ef5f80f743b5c7..be28870762500bdbf6603b9bc9ae5b939c06b7af 100644
--- a/src/proto_alpha/bin_tx_rollup_node/dune
+++ b/src/proto_alpha/bin_tx_rollup_node/dune
@@ -16,12 +16,12 @@
   tezos-client-base-unix
   tezos-tx-rollup-alpha)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_tx_rollup_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_tx_rollup_alpha))
diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune
index 5e10d5f230daacfd58ce66e23f8e4b77d0dd1039..7866df9840921433c4a660d2575e1f5c5e428e29 100644
--- a/src/proto_alpha/lib_benchmark/dune
+++ b/src/proto_alpha/lib_benchmark/dune
@@ -20,16 +20,16 @@
   prbnmcn-stats)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_crypto
-   -open Tezos_alpha_test_helpers))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_crypto
+  -open Tezos_alpha_test_helpers)
  (private_modules kernel rules state_space))
diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
index e26b66152cd3642a8704f71cdb08aed42a417c7a..59ed88cf18f41e491a20547728e5e3c5c1dce001 100644
--- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
+++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune
@@ -14,9 +14,9 @@
   tezos-protocol-alpha
   hashcons)
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_error_monad
-   -open Tezos_micheline
-   -open Tezos_micheline_rewriting
-   -open Tezos_protocol_alpha)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_error_monad
+  -open Tezos_micheline
+  -open Tezos_micheline_rewriting
+  -open Tezos_protocol_alpha))
diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
index 86727cf2606f5bb9b1f89ec0986796c0ee5bd967..de2cd72795d6617c86be54a5fc4f02a3cf5c6a13 100644
--- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
+++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune
@@ -11,9 +11,9 @@
   tezos-error-monad
   tezos-client-alpha)
  (flags
-  (:standard
-   -open Tezos_micheline
-   -open Tezos_benchmark_type_inference_alpha)))
+  (:standard)
+  -open Tezos_micheline
+  -open Tezos_benchmark_type_inference_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune
index 3ad9dbc1b6d179d9456608fd50ab628372c02b89..a71d013193916dd086cc46afdf828a4552622cf4 100644
--- a/src/proto_alpha/lib_benchmark/test/dune
+++ b/src/proto_alpha/lib_benchmark/test/dune
@@ -20,14 +20,14 @@
   alcotest-lwt
   prbnmcn-stats)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_protocol_alpha
-   -open Tezos_benchmark
-   -open Tezos_benchmark_type_inference_alpha
-   -open Tezos_benchmark_alpha
-   -open Tezos_alpha_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_protocol_alpha
+  -open Tezos_benchmark
+  -open Tezos_benchmark_type_inference_alpha
+  -open Tezos_benchmark_alpha
+  -open Tezos_alpha_test_helpers))
 
 (rule
  (alias runtest_micheline_rewriting_data)
diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune
index 266e68abdeaf68960e38b87e22a3c2385656c586..7de0ac3e8dd77c1b2cd946b31952c10776cb6e48 100644
--- a/src/proto_alpha/lib_benchmarks_proto/dune
+++ b/src/proto_alpha/lib_benchmarks_proto/dune
@@ -25,18 +25,18 @@
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_stdlib
-   -open Tezos_base
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_error_monad
-   -open Tezos_benchmark
-   -open Tezos_benchmark_alpha
-   -open Tezos_benchmark_type_inference_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_raw_protocol_alpha
-   -open Tezos_crypto
-   -open Tezos_micheline
-   -open Tezos_alpha_test_helpers
-   -open Tezos_client_alpha)))
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_base
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_error_monad
+  -open Tezos_benchmark
+  -open Tezos_benchmark_alpha
+  -open Tezos_benchmark_type_inference_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_raw_protocol_alpha
+  -open Tezos_crypto
+  -open Tezos_micheline
+  -open Tezos_alpha_test_helpers
+  -open Tezos_client_alpha))
diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune
index 845fb5d80c0a7d2724b7c960fa5ffa87a6fa5054..0046b98ef42eb4a14058f11bf740f0d74a445f9a 100644
--- a/src/proto_alpha/lib_client/dune
+++ b/src/proto_alpha/lib_client/dune
@@ -20,12 +20,12 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune
index a211b189a156654f981aa641bc122ebd6991b450..d64599de9795c89e0e10867437b6c05fcceb0c6c 100644
--- a/src/proto_alpha/lib_client/test/dune
+++ b/src/proto_alpha/lib_client/test/dune
@@ -17,14 +17,14 @@
   alcotest-lwt
   qcheck-alcotest)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_base_test_helpers
-   -open Lib_test)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_base_test_helpers
+  -open Lib_test))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune
index 24a67937bb2dcb5f59bc19d62c211423e1b1e5cb..01d5cc4b48b3900c213bc2a08b10f08a06031684 100644
--- a/src/proto_alpha/lib_client_commands/dune
+++ b/src/proto_alpha/lib_client_commands/dune
@@ -23,19 +23,19 @@
   tezos-protocol-plugin-alpha)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_rpc
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_plugin_alpha))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_rpc
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_plugin_alpha)
  (modules (:standard \ alpha_commands_registration)))
 
 (library
@@ -57,17 +57,17 @@
   tezos-protocol-plugin-alpha)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_client_alpha_commands
-   -open Tezos_client_sapling_alpha
-   -open Tezos_rpc
-   -open Tezos_protocol_plugin_alpha))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_client_alpha_commands
+  -open Tezos_client_sapling_alpha
+  -open Tezos_rpc
+  -open Tezos_protocol_plugin_alpha)
  (modules alpha_commands_registration))
diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune
index 393fbd1d16db51d821017dc08b829d466167b976..5d714cd77fd814b50391474dd388c7b7dc0f1864 100644
--- a/src/proto_alpha/lib_client_sapling/dune
+++ b/src/proto_alpha/lib_client_sapling/dune
@@ -18,13 +18,13 @@
   tezos-protocol-plugin-alpha)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_alpha_commands
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_protocol_plugin_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_alpha_commands
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_protocol_plugin_alpha))
diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune
index b62a78dedac67654f99e5c73833bc1ab04e419ea..7aff5c7e26e7d38886851d89b4c3d8367dc99438 100644
--- a/src/proto_alpha/lib_delegate/dune
+++ b/src/proto_alpha/lib_delegate/dune
@@ -27,21 +27,21 @@
   lwt-exit)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_stdlib
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_context
-   -open Tezos_context
-   -open Tezos_rpc
-   -open Tezos_rpc_http))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_stdlib
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_context
+  -open Tezos_context
+  -open Tezos_rpc
+  -open Tezos_rpc_http)
  (modules (:standard \ Baking_commands Baking_commands_registration)))
 
 (library
@@ -61,17 +61,17 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_stdlib_unix
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_stdlib_unix
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha
+  -open Tezos_rpc)
  (modules Baking_commands))
 
 (library
@@ -91,14 +91,14 @@
   tezos-rpc)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_alpha
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha
-   -open Tezos_baking_alpha_commands
-   -open Tezos_rpc))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha
+  -open Tezos_baking_alpha_commands
+  -open Tezos_rpc)
  (modules Baking_commands_registration))
diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune
index 5f2c9f0e53671db47fcba6dbdf7fb6274533ddd0..6e9dbede128d0be4220577df5ea22ce7dcd1350f 100644
--- a/src/proto_alpha/lib_delegate/test/dune
+++ b/src/proto_alpha/lib_delegate/test/dune
@@ -16,16 +16,16 @@
   tezos-crypto
   alcotest-lwt)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_base_test_helpers
-   -open Tezos_alpha_mockup_simulator
-   -open Tezos_baking_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_base_test_helpers
+  -open Tezos_alpha_mockup_simulator
+  -open Tezos_baking_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
index bfbc06555a9c81daf3c07cda92469e75b3e6d6aa..ce67573ed371499a06be1681ad7f6abb8c02a62e 100644
--- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
+++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune
@@ -18,15 +18,15 @@
   tezos-mockup-commands
   tezos-baking-alpha.tenderbrute)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha
-   -open Tezos_stdlib_unix
-   -open Tezos_client_base_unix
-   -open Tezos_protocol_alpha_parameters
-   -open Tenderbrute_alpha
-   -open Tezos_protocol_alpha.Protocol)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha
+  -open Tezos_stdlib_unix
+  -open Tezos_client_base_unix
+  -open Tezos_protocol_alpha_parameters
+  -open Tenderbrute_alpha
+  -open Tezos_protocol_alpha.Protocol))
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
index 26595134f89ed6c9d6535f63a818333ea27368fd..5bba20e18a7a7247423d237be3f013a3f9ba4e9e 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
@@ -11,11 +11,11 @@
   tezos-baking-alpha.tenderbrute)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_client_base
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tenderbrute_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_client_base
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tenderbrute_alpha))
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
index 9d423c6e0a7bac8e205d10c2ed76f40fa7f21c21..bdeb6478d39c9736ec3923ac9aeec43565bac539 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune
@@ -12,11 +12,11 @@
   tezos-client-base
   tezos-client-alpha)
  (flags
-  (:standard
-   -open Data_encoding
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_protocol_alpha
-   -open Tezos_client_base
-   -open Tezos_client_alpha)))
+  (:standard)
+  -open Data_encoding
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_protocol_alpha
+  -open Tezos_client_base
+  -open Tezos_client_alpha))
diff --git a/src/proto_alpha/lib_injector/dune b/src/proto_alpha/lib_injector/dune
index 2e97ad8806e9d9aef92e169fbf786103f3a27791..ae86821fb4c8033319a04fd63b531b13ac487556 100644
--- a/src/proto_alpha/lib_injector/dune
+++ b/src/proto_alpha/lib_injector/dune
@@ -19,14 +19,14 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_crypto
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_micheline
-   -open Tezos_client_alpha
-   -open Tezos_client_base
-   -open Tezos_workers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_crypto
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_micheline
+  -open Tezos_client_alpha
+  -open Tezos_client_base
+  -open Tezos_workers))
diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune
index 1590cf7ccb846fc8ea5aaef33af9da0ffe287d2e..25fac718610ee42871320ad9aa010957db66cc5b 100644
--- a/src/proto_alpha/lib_parameters/dune
+++ b/src/proto_alpha/lib_parameters/dune
@@ -10,9 +10,9 @@
   tezos-protocol-environment
   tezos-protocol-alpha)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -open Tezos_base.TzPervasives
-         -open Tezos_protocol_alpha))
+ (flags (:standard)
+        -open Tezos_base.TzPervasives
+        -open Tezos_protocol_alpha)
  (modules (:standard \ gen)))
 
 (executable
@@ -23,10 +23,10 @@
   tezos-protocol-alpha)
  (link_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_protocol_alpha))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_protocol_alpha)
  (modules gen))
 
 (rule
diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune
index 570fcb41f81e6ca70d2051226b1e9e869587ca40..148f8d0e9c9c47d0402edcf358759a4d636eefe5 100644
--- a/src/proto_alpha/lib_plugin/dune
+++ b/src/proto_alpha/lib_plugin/dune
@@ -9,10 +9,10 @@
   tezos-base
   tezos-protocol-alpha)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha)
  (modules (:standard \ Plugin_registerer)))
 
 (library
@@ -25,10 +25,10 @@
   tezos-protocol-plugin-alpha
   tezos-shell)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_embedded_protocol_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_shell))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_embedded_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_shell)
  (modules Plugin_registerer))
diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune
index d053bae5bd8f12f7fcfaca5221474b8a48618b24..234101ef4fa274f8663d838f10f35b5ef0d415e6 100644
--- a/src/proto_alpha/lib_plugin/test/dune
+++ b/src/proto_alpha/lib_plugin/test/dune
@@ -18,17 +18,17 @@
   tezos-protocol-alpha.parameters
   tezos-alpha-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_alpha.Protocol
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_alpha_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_alpha.Protocol
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_alpha_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index d53656c4f247d3ee74cb60cd36262714bcf67a10..76288263427d62a8f7348246df5b0e8f4b5da1a6 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-alpha.environment)
  (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
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_alpha.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Misc
   Non_empty_string
@@ -237,9 +237,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -670,9 +670,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -890,9 +890,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune
index f62f78e2a1ec4ccf4f64a81749b98c0a9e3ee03c..c8393950cf91134e7abcba9676063973b7240efc 100644
--- a/src/proto_alpha/lib_protocol/test/helpers/dune
+++ b/src/proto_alpha/lib_protocol/test/helpers/dune
@@ -20,13 +20,13 @@
   tezos-protocol-alpha.environment
   tezos-shell-services)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_stdlib_unix
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_shell_services)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_stdlib_unix
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_shell_services))
diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
index c6580ada3ad07a3cacf4ea55dde6d6cbd77114a9..4baf3031174a37583c6ae9465eedbe28da885c2f 100644
--- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune
@@ -12,14 +12,14 @@
   tezos-protocol-alpha.parameters
   tezos-protocol-plugin-alpha)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_protocol_plugin_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_protocol_plugin_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune
index eaa2642a40ae0dced0b95fb722c7f3895505aef1..9e468e08764aadba3b606c3c2103ff1034813308 100644
--- a/src/proto_alpha/lib_protocol/test/integration/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/dune
@@ -12,14 +12,14 @@
   tezos-alpha-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_alpha_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_alpha_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune
index d3cfb0543c9f6bde29c7d7a78d77596785b5e7f5..82514b6a297a0dcb1641550265cba1982685ee59 100644
--- a/src/proto_alpha/lib_protocol/test/integration/gas/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune
@@ -10,12 +10,12 @@
   tezos-alpha-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
index 1f0a1209b046de5f3519d6d9a5a1187ab9b94ff5..7b2b2a1a6c31e43cd8ad27a2888ae288b965474c 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune
@@ -16,16 +16,16 @@
   tezos-benchmark-type-inference-alpha
   tezos-protocol-alpha.parameters)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_base_test_helpers
-   -open Tezos_client_alpha
-   -open Tezos_micheline
-   -open Tezos_benchmark_alpha
-   -open Tezos_benchmark_type_inference_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_base_test_helpers
+  -open Tezos_client_alpha
+  -open Tezos_micheline
+  -open Tezos_benchmark_alpha
+  -open Tezos_benchmark_type_inference_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune
index 6fd3828b4cd259da494a470496110d407c94c6be..973c934a63628bcb375d1ffc7eee677dab51ac33 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/dune
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune
@@ -11,13 +11,13 @@
   tezos-alpha-test-helpers
   tezos-base-test-helpers)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_base_test_helpers)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_base_test_helpers))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune
index fb22d7dfd2474c2ca0f9a3c7c385c431b887a9ff..c1d653c638782710456e6eef6db2d7189d8574ec 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/dune
+++ b/src/proto_alpha/lib_protocol/test/pbt/dune
@@ -28,15 +28,15 @@
   tezos-benchmark-alpha
   tezos-benchmark-type-inference-alpha)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_micheline
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_benchmark_alpha
-   -open Tezos_benchmark_type_inference_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_micheline
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_benchmark_alpha
+  -open Tezos_benchmark_type_inference_alpha))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune
index 03227ca9d865ebb0fbce2143127fbc474054f353..c87df26eba04af6d0d513dec7a75ef438c62698d 100644
--- a/src/proto_alpha/lib_protocol/test/regression/dune
+++ b/src/proto_alpha/lib_protocol/test/regression/dune
@@ -12,13 +12,13 @@
   tezos-alpha-test-helpers
   tezos-micheline)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_alpha
-   -open Tezos_client_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_micheline)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha
+  -open Tezos_client_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_micheline))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune
index 9f34b042ee77a07bac31b9d510e58bd13cc31b80..6e3bae54db29c285bec0408e24f64b5f6e024ac0 100644
--- a/src/proto_alpha/lib_protocol/test/unit/dune
+++ b/src/proto_alpha/lib_protocol/test/unit/dune
@@ -18,16 +18,16 @@
   alcotest-lwt
   tezos-stdlib)
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base_test_helpers
-   -open Tezos_micheline
-   -open Tezos_client_alpha
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_alpha_test_helpers
-   -open Tezos_stdlib)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base_test_helpers
+  -open Tezos_micheline
+  -open Tezos_client_alpha
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_alpha_test_helpers
+  -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune
index 8eaf39c7e09a3406918bb450ce764944d831b74a..3dc5efa6bccbbc658369cee748084d03d67e73be 100644
--- a/src/proto_alpha/lib_sc_rollup/dune
+++ b/src/proto_alpha/lib_sc_rollup/dune
@@ -15,9 +15,9 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_protocol_alpha_parameters
-   -open Tezos_rpc)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_protocol_alpha_parameters
+  -open Tezos_rpc))
diff --git a/src/proto_alpha/lib_tx_rollup/dune b/src/proto_alpha/lib_tx_rollup/dune
index 999fd0cb43afa924e23d045fc4eb40d702af4072..34b76f32f84b0c4bc312518d322b9f79dfd48a58 100644
--- a/src/proto_alpha/lib_tx_rollup/dune
+++ b/src/proto_alpha/lib_tx_rollup/dune
@@ -32,24 +32,24 @@
  (preprocess (pps ppx_inline_test))
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_base
-   -open Tezos_crypto
-   -open Tezos_protocol_alpha
-   -open Tezos_protocol_environment_alpha
-   -open Tezos_client_alpha
-   -open Tezos_client_commands
-   -open Tezos_baking_alpha_commands
-   -open Tezos_stdlib_unix
-   -open Tezos_rpc
-   -open Tezos_rpc_http
-   -open Tezos_rpc_http_client_unix
-   -open Tezos_rpc_http_server
-   -open Tezos_micheline
-   -open Tezos_client_base
-   -open Tezos_client_base_unix
-   -open Tezos_workers
-   -open Tezos_protocol_plugin_alpha
-   -open Tezos_injector_alpha)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_base
+  -open Tezos_crypto
+  -open Tezos_protocol_alpha
+  -open Tezos_protocol_environment_alpha
+  -open Tezos_client_alpha
+  -open Tezos_client_commands
+  -open Tezos_baking_alpha_commands
+  -open Tezos_stdlib_unix
+  -open Tezos_rpc
+  -open Tezos_rpc_http
+  -open Tezos_rpc_http_client_unix
+  -open Tezos_rpc_http_server
+  -open Tezos_micheline
+  -open Tezos_client_base
+  -open Tezos_client_base_unix
+  -open Tezos_workers
+  -open Tezos_protocol_plugin_alpha
+  -open Tezos_injector_alpha))
diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune
index 9b9b03fe0df799ad66aa33a8f24cecd85f4b47f1..68029e931a4a1071f35b861053ffcdb3b42cc1f9 100644
--- a/src/proto_demo_counter/lib_client/dune
+++ b/src/proto_demo_counter/lib_client/dune
@@ -13,10 +13,10 @@
   tezos-protocol-demo-counter)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_client_commands
-   -open Tezos_protocol_demo_counter)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_client_commands
+  -open Tezos_protocol_demo_counter))
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index 6c12bac5703ab832ba50ca7bb6bf8f56447cc1b6..2ea77e8ad30ccd909a1cb62a0bc71f53f39e2914 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-demo-counter.environment)
  (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
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_demo_counter.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules
   Error
   Proto_params
@@ -52,9 +52,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -112,9 +112,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -145,9 +145,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-70
-         -warn-error +a))
+ (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 ff8c23a3359a646863fb306ad7d785f2a07f938f..507d65017a650076cc89cf09f6446919a458ee35 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-demo-noops.environment)
  (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
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_demo_noops.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules Main))
 
 (library
@@ -43,9 +43,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -83,9 +83,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -107,9 +107,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune
index a36074cf5314e95be1dd4785f3bb388f2dbf6792..3d26598d8c525c02d5bd3e46f89fa5bfc06c4f5b 100644
--- a/src/proto_genesis/lib_client/dune
+++ b/src/proto_genesis/lib_client/dune
@@ -16,10 +16,10 @@
   tezos-stdlib-unix)
  (library_flags (:standard -linkall))
  (flags
-  (:standard
-   -open Tezos_base.TzPervasives
-   -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
-   -open Tezos_shell_services
-   -open Tezos_client_base
-   -open Tezos_protocol_genesis
-   -open Tezos_client_commands)))
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals
+  -open Tezos_shell_services
+  -open Tezos_client_base
+  -open Tezos_protocol_genesis
+  -open Tezos_client_commands))
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index a4d6a43c24e816de676c528a98c39bfe4ad541ca..319306c5f134eccb3a748c41cdf3147f99965e74 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -25,14 +25,14 @@
   tezos-protocol-genesis.environment)
  (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
-   -open Pervasives
-   -open Error_monad))
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nostdlib
+  -nopervasives
+  -open Tezos_protocol_environment_genesis.Environment
+  -open Pervasives
+  -open Error_monad)
  (modules Data Services Main))
 
 (library
@@ -43,9 +43,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Protocol))
 
 (install
@@ -87,9 +87,9 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
- (flags (-w +a-4-40..42-44-45-48-70
-         -warn-error +a
-         -nopervasives))
+ (flags -w +a-4-40..42-44-45-48-70
+        -warn-error +a
+        -nopervasives)
  (modules Functor))
 
 (rule
@@ -113,9 +113,9 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard
-         -w +a-4-40..42-44-45-48-70
-         -warn-error +a))
+ (flags (:standard)
+        -w +a-4-40..42-44-45-48-70
+        -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune
index 1a7b5690d1b36458f554803e7bfa59a798574f44..53e45d9b1db28de79ba33d64142adaac5cc9110b 100644
--- a/tezt/lib_performance_regression/dune
+++ b/tezt/lib_performance_regression/dune
@@ -8,6 +8,6 @@
   tezt
   uri
   cohttp-lwt-unix)
- (flags (:standard
-         -open Tezt
-         -open Tezt.Base)))
+ (flags (:standard)
+        -open Tezt
+        -open Tezt.Base))
diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune
index d462d3d052efa97151ccd58c28fe0aa5e4a4db6c..df971cd47313210e3be068969604f55c7dfdc518 100644
--- a/tezt/lib_tezos/dune
+++ b/tezt/lib_tezos/dune
@@ -13,7 +13,7 @@
   tezos-base.unix
   cohttp-lwt-unix)
  (flags
-  (:standard
-   -open Tezt
-   -open Tezt.Base
-   -open Tezt_performance_regression)))
+  (:standard)
+  -open Tezt
+  -open Tezt.Base
+  -open Tezt_performance_regression))
diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune
index 6f47d7861cb7be73994c19b2090c55845511c234..e0ab5fa475d79fcf07d5dc37a090a744e4d266ef 100644
--- a/tezt/self_tests/dune
+++ b/tezt/self_tests/dune
@@ -8,9 +8,9 @@
  (libraries
   tezt
   tezt-tezos)
- (flags (:standard
-         -open Tezt
-         -open Tezt.Base
-         -open Tezt_tezos)))
+ (flags (:standard)
+        -open Tezt
+        -open Tezt.Base
+        -open Tezt_tezos))
 
 (cram (package tezt-self-tests) (deps tezt.sh main.exe))