4 files changed, 5 insertions, 8 deletions
diff --git a/lib/cProfile.ml b/lib/cProfile.ml
index b68d35d2d4..7245b35d59 100644
--- a/lib/cProfile.ml
+++ b/lib/cProfile.ml
@@ -8,6 +8,8 @@
 (*         *     (see LICENSE file for the text of the license)         *)
 (************************************************************************)
 
+let enable_profile = false
+
 let word_length = Sys.word_size / 8
 
 let float_of_time t = float_of_int t /. 100.
@@ -87,9 +89,9 @@ let init_alloc = ref 0.0
 let reset_profile () = List.iter reset_record !prof_table
 
 let init_profile () =
-  (* We test Flags.profile as a way to support declaring profiled
+  (* We test enable_profile as a way to support declaring profiled
      functions in plugins *)
-  if !prof_table <> [] || Flags.profile then begin
+  if !prof_table <> [] || enable_profile then begin
   let outside = create_record () in
   stack := [outside];
   last_alloc := get_alloc ();
diff --git a/lib/flags.ml b/lib/flags.ml
index 57e879add7..c87a375356 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -51,8 +51,6 @@ let xml_debug = ref false
 let in_debugger = ref false
 let in_toplevel = ref false
 
-let profile = false
-
 let raw_print = ref false
 
 let we_are_parsing = ref false
diff --git a/lib/flags.mli b/lib/flags.mli
index e10e2c8cb8..2f59a0cc18 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -44,8 +44,6 @@ val xml_debug : bool ref
 val in_debugger : bool ref
 val in_toplevel : bool ref
 
-val profile : bool
-
 (* development flag to detect race conditions, it should go away. *)
 val we_are_parsing : bool ref
 
diff --git a/lib/pp.mli b/lib/pp.mli
index b3c2301d34..865f97166f 100644
--- a/lib/pp.mli
+++ b/lib/pp.mli
@@ -171,7 +171,7 @@ val prvecti_with_sep :
 
 val pr_enum : ('a -> t) -> 'a list -> t
 (** [pr_enum pr [a ; b ; ... ; c]] outputs
-    [pr a ++ str "," ++ pr b ++ str "," ++ ... ++ str "and" ++ pr c]. *)
+    [pr a ++ str "," ++ spc () ++ pr b ++ str "," ++ spc () ++ ... ++ str "and" ++ spc () ++ pr c]. *)
 
 val pr_sequence : ('a -> t) -> 'a list -> t
 (** Sequence of objects separated by space (unless an element is empty). *)
@@ -188,7 +188,6 @@ val pp_with          : Format.formatter -> t -> unit
 
 val string_of_ppcmds : t -> string
 
-
 (** Tag prefix to start a multi-token diff span *)
 val start_pfx : string