rename test files (do not start by a digit)

829 files changed, 300 insertions, 390 deletions

diff --git a/dev/tools/update-compat.py b/dev/tools/update-compat.py
index 7c8b9f025c..14094553a2 100755
--- a/dev/tools/update-compat.py
+++ b/dev/tools/update-compat.py
@@ -17,7 +17,7 @@ FLAGS_ML_PATH = os.path.join(ROOT_PATH, 'lib', 'flags.ml')
 COQARGS_ML_PATH = os.path.join(ROOT_PATH, 'toplevel', 'coqargs.ml')
 G_VERNAC_PATH = os.path.join(ROOT_PATH, 'vernac', 'g_vernac.mlg')
 DOC_INDEX_PATH = os.path.join(ROOT_PATH, 'doc', 'stdlib', 'index-list.html.template')
-BUG_4798_PATH = os.path.join(ROOT_PATH, 'test-suite', 'bugs', 'closed', '4798.v')
+BUG_4798_PATH = os.path.join(ROOT_PATH, 'test-suite', 'bugs', 'closed', 'bug_4798.v')
 TEST_SUITE_PATHS = tuple(os.path.join(ROOT_PATH, 'test-suite', 'success', i)
                          for i in ('CompatOldOldFlag.v', 'CompatOldFlag.v', 'CompatPreviousFlag.v', 'CompatCurrentFlag.v'))
 TEST_SUITE_DESCRIPTIONS = ('current-minus-three', 'current-minus-two', 'current-minus-one', 'current')
diff --git a/test-suite/bugs/5996.v b/test-suite/bugs/bug_5996.v
index c9e3292b48..c9e3292b48 100644
--- a/test-suite/bugs/5996.v
+++ b/test-suite/bugs/bug_5996.v
diff --git a/test-suite/bugs/closed/2946.v b/test-suite/bugs/closed/2946.v
deleted file mode 100644
index d8138e145c..0000000000
--- a/test-suite/bugs/closed/2946.v
+++ /dev/null
@@ -1,8 +0,0 @@
-Lemma toto (E : nat -> nat -> Prop) (x y : nat)  
-  (Ex_ : forall z, E x z) (E_y : forall z, E z y) : True.
-
-(* OK *)                                                                     
-assert (pairE1 := let Exy := _ in (Ex_ y, E_y _) : Exy * Exy).               
-
-(* FAIL *)                                                                   
-assert (pairE2 := let Exy := _ in (Ex_ _, E_y x) : Exy * Exy).
diff --git a/test-suite/bugs/closed/1238.v b/test-suite/bugs/closed/bug_1238.v
index 6b6e83779f..6b6e83779f 100644
--- a/test-suite/bugs/closed/1238.v
+++ b/test-suite/bugs/closed/bug_1238.v
diff --git a/test-suite/bugs/closed/1243.v b/test-suite/bugs/closed/bug_1243.v
index 7d6781db27..a80e1dd609 100644
--- a/test-suite/bugs/closed/1243.v
+++ b/test-suite/bugs/closed/bug_1243.v
@@ -7,6 +7,3 @@ Admitted.
 
 Theorem r_ex' : forall x y:nat, (x + y = x + y)%nat.
 Admitted.
-
-
-
diff --git a/test-suite/bugs/closed/1302.v b/test-suite/bugs/closed/bug_1302.v
index e94dfcfb05..bea71f5022 100644
--- a/test-suite/bugs/closed/1302.v
+++ b/test-suite/bugs/closed/bug_1302.v
@@ -19,4 +19,3 @@ Inductive L : Type :=
 | L1 :  A -> L.
 
 End TT.
-
diff --git a/test-suite/bugs/closed/1322.v b/test-suite/bugs/closed/bug_1322.v
index 6941ade44c..6941ade44c 100644
--- a/test-suite/bugs/closed/1322.v
+++ b/test-suite/bugs/closed/bug_1322.v
diff --git a/test-suite/bugs/closed/1341.v b/test-suite/bugs/closed/bug_1341.v
index 79a0a14d7c..79a0a14d7c 100644
--- a/test-suite/bugs/closed/1341.v
+++ b/test-suite/bugs/closed/bug_1341.v
diff --git a/test-suite/bugs/closed/1362.v b/test-suite/bugs/closed/bug_1362.v
index 6cafb9f0cd..6cafb9f0cd 100644
--- a/test-suite/bugs/closed/1362.v
+++ b/test-suite/bugs/closed/bug_1362.v
diff --git a/test-suite/bugs/closed/1411.v b/test-suite/bugs/closed/bug_1411.v
index a1a7b288a5..504c967a20 100644
--- a/test-suite/bugs/closed/1411.v
+++ b/test-suite/bugs/closed/bug_1411.v
@@ -32,4 +32,3 @@ Next Obligation. inversion x. Qed.
 Next Obligation. inversion x. Qed.
 Next Obligation. inversion x; trivial. Qed.
 Next Obligation. inversion x; trivial. Qed.
-
diff --git a/test-suite/bugs/closed/1414.v b/test-suite/bugs/closed/bug_1414.v
index ee9e2504a6..ee9e2504a6 100644
--- a/test-suite/bugs/closed/1414.v
+++ b/test-suite/bugs/closed/bug_1414.v
diff --git a/test-suite/bugs/closed/1416.v b/test-suite/bugs/closed/bug_1416.v
index ee09200573..667c6b1d5f 100644
--- a/test-suite/bugs/closed/1416.v
+++ b/test-suite/bugs/closed/bug_1416.v
@@ -27,4 +27,3 @@ Lemma autorewrite_raise_anomaly: forall (Env A:Type) (e: Env) (p:Place Env A),
 Proof.
   intros Env A e p; eapply ex_intro.
   autorewrite with placeeq. (* Here is the bug *)
-
diff --git a/test-suite/bugs/closed/1419.v b/test-suite/bugs/closed/bug_1419.v
index d021107d1d..d021107d1d 100644
--- a/test-suite/bugs/closed/1419.v
+++ b/test-suite/bugs/closed/bug_1419.v
diff --git a/test-suite/bugs/closed/1425.v b/test-suite/bugs/closed/bug_1425.v
index 775d278e74..775d278e74 100644
--- a/test-suite/bugs/closed/1425.v
+++ b/test-suite/bugs/closed/bug_1425.v
diff --git a/test-suite/bugs/closed/1446.v b/test-suite/bugs/closed/bug_1446.v
index 8cb2d653b6..8cb2d653b6 100644
--- a/test-suite/bugs/closed/1446.v
+++ b/test-suite/bugs/closed/bug_1446.v
diff --git a/test-suite/bugs/closed/1448.v b/test-suite/bugs/closed/bug_1448.v
index fe3b4c8b41..fe3b4c8b41 100644
--- a/test-suite/bugs/closed/1448.v
+++ b/test-suite/bugs/closed/bug_1448.v
diff --git a/test-suite/bugs/closed/1477.v b/test-suite/bugs/closed/bug_1477.v
index dfc8c32806..dfc8c32806 100644
--- a/test-suite/bugs/closed/1477.v
+++ b/test-suite/bugs/closed/bug_1477.v
diff --git a/test-suite/bugs/closed/1483.v b/test-suite/bugs/closed/bug_1483.v
index a3d7f16830..0d1419b94d 100644
--- a/test-suite/bugs/closed/1483.v
+++ b/test-suite/bugs/closed/bug_1483.v
@@ -5,6 +5,3 @@ Definition P := (fun x : positive => x = xH).
 Goal forall (p q : positive), P q -> q = p -> P p.
 intros; congruence.
 Qed.
-
-
-
diff --git a/test-suite/bugs/closed/1501.v b/test-suite/bugs/closed/bug_1501.v
index e771e192dc..e771e192dc 100644
--- a/test-suite/bugs/closed/1501.v
+++ b/test-suite/bugs/closed/bug_1501.v
diff --git a/test-suite/bugs/closed/1507.v b/test-suite/bugs/closed/bug_1507.v
index f2ab910034..96e421de64 100644
--- a/test-suite/bugs/closed/1507.v
+++ b/test-suite/bugs/closed/bug_1507.v
@@ -117,4 +117,3 @@ Record N (grnd:Set)(le:grnd->grnd->Prop)(grndI:I grnd le) : Type := Nmake {
   Nc_refl   : reflexive _ Nc;
   Nc_sym    : symmetric _ Nc
 }.
-
diff --git a/test-suite/bugs/closed/1519.v b/test-suite/bugs/closed/bug_1519.v
index de60de59e9..de60de59e9 100644
--- a/test-suite/bugs/closed/1519.v
+++ b/test-suite/bugs/closed/bug_1519.v
diff --git a/test-suite/bugs/closed/1542.v b/test-suite/bugs/closed/bug_1542.v
index 52cfbbc496..52cfbbc496 100644
--- a/test-suite/bugs/closed/1542.v
+++ b/test-suite/bugs/closed/bug_1542.v
diff --git a/test-suite/bugs/closed/1543.v b/test-suite/bugs/closed/bug_1543.v
index def6ed98dd..def6ed98dd 100644
--- a/test-suite/bugs/closed/1543.v
+++ b/test-suite/bugs/closed/bug_1543.v
diff --git a/test-suite/bugs/closed/1545.v b/test-suite/bugs/closed/bug_1545.v
index 9ef796faf7..9ef796faf7 100644
--- a/test-suite/bugs/closed/1545.v
+++ b/test-suite/bugs/closed/bug_1545.v
diff --git a/test-suite/bugs/closed/1547.v b/test-suite/bugs/closed/bug_1547.v
index 166fa7a9f2..166fa7a9f2 100644
--- a/test-suite/bugs/closed/1547.v
+++ b/test-suite/bugs/closed/bug_1547.v
diff --git a/test-suite/bugs/closed/1551.v b/test-suite/bugs/closed/bug_1551.v
index 48f0b55129..48f0b55129 100644
--- a/test-suite/bugs/closed/1551.v
+++ b/test-suite/bugs/closed/bug_1551.v
diff --git a/test-suite/bugs/closed/1568.v b/test-suite/bugs/closed/bug_1568.v
index 3609e9c83b..25fdcd297f 100644
--- a/test-suite/bugs/closed/1568.v
+++ b/test-suite/bugs/closed/bug_1568.v
@@ -9,5 +9,3 @@ with b:B := mk_B a.
 Goal b = match a with mk_A a1 => a1 end.
   simpl. reflexivity.
 Qed.
-
-
diff --git a/test-suite/bugs/closed/1576.v b/test-suite/bugs/closed/bug_1576.v
index 3621f7a1ff..0889568d82 100644
--- a/test-suite/bugs/closed/1576.v
+++ b/test-suite/bugs/closed/bug_1576.v
@@ -35,4 +35,3 @@ End H.
 
 Declare Module F:  TF.
 Module K := H(F).
-
diff --git a/test-suite/bugs/closed/1582.v b/test-suite/bugs/closed/bug_1582.v
index be5d3dd211..88af924934 100644
--- a/test-suite/bugs/closed/1582.v
+++ b/test-suite/bugs/closed/bug_1582.v
@@ -12,4 +12,3 @@ refine
         let fn := fact_rec (n-1) _ in
         n * fn).
 Admitted.
-
diff --git a/test-suite/bugs/closed/1584.v b/test-suite/bugs/closed/bug_1584.v
index 926af7dd1c..926af7dd1c 100644
--- a/test-suite/bugs/closed/1584.v
+++ b/test-suite/bugs/closed/bug_1584.v
diff --git a/test-suite/bugs/closed/1604.v b/test-suite/bugs/closed/bug_1604.v
index 22c3df824b..22c3df824b 100644
--- a/test-suite/bugs/closed/1604.v
+++ b/test-suite/bugs/closed/bug_1604.v
diff --git a/test-suite/bugs/closed/1614.v b/test-suite/bugs/closed/bug_1614.v
index 6bc165d406..6bc165d406 100644
--- a/test-suite/bugs/closed/1614.v
+++ b/test-suite/bugs/closed/bug_1614.v
diff --git a/test-suite/bugs/closed/1618.v b/test-suite/bugs/closed/bug_1618.v
index a9b067ceb2..a7be12e26f 100644
--- a/test-suite/bugs/closed/1618.v
+++ b/test-suite/bugs/closed/bug_1618.v
@@ -20,4 +20,3 @@ a :=
   match a return (P a) with
     | A1 n => f n
   end.
-
diff --git a/test-suite/bugs/closed/1634.v b/test-suite/bugs/closed/bug_1634.v
index 0150c25038..0150c25038 100644
--- a/test-suite/bugs/closed/1634.v
+++ b/test-suite/bugs/closed/bug_1634.v
diff --git a/test-suite/bugs/closed/1643.v b/test-suite/bugs/closed/bug_1643.v
index 879a65b183..879a65b183 100644
--- a/test-suite/bugs/closed/1643.v
+++ b/test-suite/bugs/closed/bug_1643.v
diff --git a/test-suite/bugs/closed/1680.v b/test-suite/bugs/closed/bug_1680.v
index 524c7bab42..fa563f32d7 100644
--- a/test-suite/bugs/closed/1680.v
+++ b/test-suite/bugs/closed/bug_1680.v
@@ -5,5 +5,3 @@ Goal nat -> nat -> True.
   Restart. let h' := fresh in int1; intro h'.
   trivial.
 Qed.
-
-
diff --git a/test-suite/bugs/closed/1683.v b/test-suite/bugs/closed/bug_1683.v
index 3e99694b3c..802057fa8c 100644
--- a/test-suite/bugs/closed/1683.v
+++ b/test-suite/bugs/closed/bug_1683.v
@@ -37,6 +37,3 @@ rewrite foobar.
 rewrite foobar in H.
 assumption.
 Qed.
-
-
-
diff --git a/test-suite/bugs/closed/1696.v b/test-suite/bugs/closed/bug_1696.v
index 0826428a34..0826428a34 100644
--- a/test-suite/bugs/closed/1696.v
+++ b/test-suite/bugs/closed/bug_1696.v
diff --git a/test-suite/bugs/closed/1703.v b/test-suite/bugs/closed/bug_1703.v
index 114e3185b8..114e3185b8 100644
--- a/test-suite/bugs/closed/1703.v
+++ b/test-suite/bugs/closed/bug_1703.v
diff --git a/test-suite/bugs/closed/1704.v b/test-suite/bugs/closed/bug_1704.v
index 7d8ba5b8da..7d8ba5b8da 100644
--- a/test-suite/bugs/closed/1704.v
+++ b/test-suite/bugs/closed/bug_1704.v
diff --git a/test-suite/bugs/closed/1711.v b/test-suite/bugs/closed/bug_1711.v
index e16612e380..e16612e380 100644
--- a/test-suite/bugs/closed/1711.v
+++ b/test-suite/bugs/closed/bug_1711.v
diff --git a/test-suite/bugs/closed/1718.v b/test-suite/bugs/closed/bug_1718.v
index 715fa94199..715fa94199 100644
--- a/test-suite/bugs/closed/1718.v
+++ b/test-suite/bugs/closed/bug_1718.v
diff --git a/test-suite/bugs/closed/1738.v b/test-suite/bugs/closed/bug_1738.v
index ef52c876c1..ef52c876c1 100644
--- a/test-suite/bugs/closed/1738.v
+++ b/test-suite/bugs/closed/bug_1738.v
diff --git a/test-suite/bugs/closed/1740.v b/test-suite/bugs/closed/bug_1740.v
index ec4a7a6bcb..3b882dc4ca 100644
--- a/test-suite/bugs/closed/1740.v
+++ b/test-suite/bugs/closed/bug_1740.v
@@ -20,4 +20,3 @@ Goal f =
   unfold f.
   reflexivity.
 Qed.
-
diff --git a/test-suite/bugs/closed/1754.v b/test-suite/bugs/closed/bug_1754.v
index 06b8dce851..06b8dce851 100644
--- a/test-suite/bugs/closed/1754.v
+++ b/test-suite/bugs/closed/bug_1754.v
diff --git a/test-suite/bugs/closed/1773.v b/test-suite/bugs/closed/bug_1773.v
index 211af89b70..211af89b70 100644
--- a/test-suite/bugs/closed/1773.v
+++ b/test-suite/bugs/closed/bug_1773.v
diff --git a/test-suite/bugs/closed/1774.v b/test-suite/bugs/closed/bug_1774.v
index 4c24b481bd..4c24b481bd 100644
--- a/test-suite/bugs/closed/1774.v
+++ b/test-suite/bugs/closed/bug_1774.v
diff --git a/test-suite/bugs/closed/1775.v b/test-suite/bugs/closed/bug_1775.v
index 932949a371..932949a371 100644
--- a/test-suite/bugs/closed/1775.v
+++ b/test-suite/bugs/closed/bug_1775.v
diff --git a/test-suite/bugs/closed/1776.v b/test-suite/bugs/closed/bug_1776.v
index 58491f9de1..58491f9de1 100644
--- a/test-suite/bugs/closed/1776.v
+++ b/test-suite/bugs/closed/bug_1776.v
diff --git a/test-suite/bugs/closed/1779.v b/test-suite/bugs/closed/bug_1779.v
index 95bb66b962..95bb66b962 100644
--- a/test-suite/bugs/closed/1779.v
+++ b/test-suite/bugs/closed/bug_1779.v
diff --git a/test-suite/bugs/closed/1780.v b/test-suite/bugs/closed/bug_1780.v
index ade4462a79..ade4462a79 100644
--- a/test-suite/bugs/closed/1780.v
+++ b/test-suite/bugs/closed/bug_1780.v
diff --git a/test-suite/bugs/closed/1784.v b/test-suite/bugs/closed/bug_1784.v
index 25d1b192eb..93d7f6ab75 100644
--- a/test-suite/bugs/closed/1784.v
+++ b/test-suite/bugs/closed/bug_1784.v
@@ -97,4 +97,3 @@ Next Obligation.
   intro H1; contradict H. inversion H1; subst. assumption. Defined.
 Next Obligation.
   intro H0; contradict H. inversion H0; subst; auto. Defined.
-
diff --git a/test-suite/bugs/closed/1787.v b/test-suite/bugs/closed/bug_1787.v
index 8e1024e6ec..e3cf9f4b40 100644
--- a/test-suite/bugs/closed/1787.v
+++ b/test-suite/bugs/closed/bug_1787.v
@@ -7,5 +7,3 @@ intros H H'.
 refine ((fun H1 : P 1 _ => let H2 := (_:Q 1 _) in A _ _ _ H1 H2) _).
 clear.
 Admitted.
-
-
diff --git a/test-suite/bugs/closed/1791.v b/test-suite/bugs/closed/bug_1791.v
index be0e8ae8ba..be0e8ae8ba 100644
--- a/test-suite/bugs/closed/1791.v
+++ b/test-suite/bugs/closed/bug_1791.v
diff --git a/test-suite/bugs/closed/1834.v b/test-suite/bugs/closed/bug_1834.v
index 884ac01cd2..884ac01cd2 100644
--- a/test-suite/bugs/closed/1834.v
+++ b/test-suite/bugs/closed/bug_1834.v
diff --git a/test-suite/bugs/closed/1844.v b/test-suite/bugs/closed/bug_1844.v
index c41e45900a..c41e45900a 100644
--- a/test-suite/bugs/closed/1844.v
+++ b/test-suite/bugs/closed/bug_1844.v
diff --git a/test-suite/bugs/closed/1850.v b/test-suite/bugs/closed/bug_1850.v
index 26b48093b7..b6d2edf8a7 100644
--- a/test-suite/bugs/closed/1850.v
+++ b/test-suite/bugs/closed/bug_1850.v
@@ -1,4 +1,3 @@
 Parameter P : Type -> Type -> Type.
 Notation      "e |= t --> v" := (P e t v)     (at level 100, t at level 54).
 Fail Check (nat |= nat --> nat).
-
diff --git a/test-suite/bugs/closed/1859.v b/test-suite/bugs/closed/bug_1859.v
index 43acfe4ba2..43acfe4ba2 100644
--- a/test-suite/bugs/closed/1859.v
+++ b/test-suite/bugs/closed/bug_1859.v
diff --git a/test-suite/bugs/closed/1865.v b/test-suite/bugs/closed/bug_1865.v
index 17c1998948..17c1998948 100644
--- a/test-suite/bugs/closed/1865.v
+++ b/test-suite/bugs/closed/bug_1865.v
diff --git a/test-suite/bugs/closed/1891.v b/test-suite/bugs/closed/bug_1891.v
index 5024a5bc97..0e4f35efca 100644
--- a/test-suite/bugs/closed/1891.v
+++ b/test-suite/bugs/closed/bug_1891.v
@@ -10,4 +10,3 @@
     refine (match x return _ with mkT _ n => fun g => f (g _) end).
     trivial.
   Qed.
-
diff --git a/test-suite/bugs/closed/1898.v b/test-suite/bugs/closed/bug_1898.v
index 70461286ce..70461286ce 100644
--- a/test-suite/bugs/closed/1898.v
+++ b/test-suite/bugs/closed/bug_1898.v
diff --git a/test-suite/bugs/closed/1900.v b/test-suite/bugs/closed/bug_1900.v
index 6eea5db083..6eea5db083 100644
--- a/test-suite/bugs/closed/1900.v
+++ b/test-suite/bugs/closed/bug_1900.v
diff --git a/test-suite/bugs/closed/1901.v b/test-suite/bugs/closed/bug_1901.v
index 98e017f9d6..98e017f9d6 100644
--- a/test-suite/bugs/closed/1901.v
+++ b/test-suite/bugs/closed/bug_1901.v
diff --git a/test-suite/bugs/closed/1905.v b/test-suite/bugs/closed/bug_1905.v
index 3b8a3d2f68..3b8a3d2f68 100644
--- a/test-suite/bugs/closed/1905.v
+++ b/test-suite/bugs/closed/bug_1905.v
diff --git a/test-suite/bugs/closed/1907.v b/test-suite/bugs/closed/bug_1907.v
index 55fc823190..55fc823190 100644
--- a/test-suite/bugs/closed/1907.v
+++ b/test-suite/bugs/closed/bug_1907.v
diff --git a/test-suite/bugs/closed/1912.v b/test-suite/bugs/closed/bug_1912.v
index 987a541778..987a541778 100644
--- a/test-suite/bugs/closed/1912.v
+++ b/test-suite/bugs/closed/bug_1912.v
diff --git a/test-suite/bugs/closed/1915.v b/test-suite/bugs/closed/bug_1915.v
index 2b0aed8c7d..2b0aed8c7d 100644
--- a/test-suite/bugs/closed/1915.v
+++ b/test-suite/bugs/closed/bug_1915.v
diff --git a/test-suite/bugs/closed/1918.v b/test-suite/bugs/closed/bug_1918.v
index 9d92fe12b8..9d92fe12b8 100644
--- a/test-suite/bugs/closed/1918.v
+++ b/test-suite/bugs/closed/bug_1918.v
diff --git a/test-suite/bugs/closed/1925.v b/test-suite/bugs/closed/bug_1925.v
index 4caee1c36d..4caee1c36d 100644
--- a/test-suite/bugs/closed/1925.v
+++ b/test-suite/bugs/closed/bug_1925.v
diff --git a/test-suite/bugs/closed/1931.v b/test-suite/bugs/closed/bug_1931.v
index 930ace1d55..930ace1d55 100644
--- a/test-suite/bugs/closed/1931.v
+++ b/test-suite/bugs/closed/bug_1931.v
diff --git a/test-suite/bugs/closed/1935.v b/test-suite/bugs/closed/bug_1935.v
index d583761985..d583761985 100644
--- a/test-suite/bugs/closed/1935.v
+++ b/test-suite/bugs/closed/bug_1935.v
diff --git a/test-suite/bugs/closed/1939.v b/test-suite/bugs/closed/bug_1939.v
index 7b430ace5e..7b430ace5e 100644
--- a/test-suite/bugs/closed/1939.v
+++ b/test-suite/bugs/closed/bug_1939.v
diff --git a/test-suite/bugs/closed/1944.v b/test-suite/bugs/closed/bug_1944.v
index ee2918c6e9..ee2918c6e9 100644
--- a/test-suite/bugs/closed/1944.v
+++ b/test-suite/bugs/closed/bug_1944.v
diff --git a/test-suite/bugs/closed/1951.v b/test-suite/bugs/closed/bug_1951.v
index e950554c4b..e950554c4b 100644
--- a/test-suite/bugs/closed/1951.v
+++ b/test-suite/bugs/closed/bug_1951.v
diff --git a/test-suite/bugs/closed/1962.v b/test-suite/bugs/closed/bug_1962.v
index 37b0dde06d..37b0dde06d 100644
--- a/test-suite/bugs/closed/1962.v
+++ b/test-suite/bugs/closed/bug_1962.v
diff --git a/test-suite/bugs/closed/1963.v b/test-suite/bugs/closed/bug_1963.v
index 11e2ee44d6..11e2ee44d6 100644
--- a/test-suite/bugs/closed/1963.v
+++ b/test-suite/bugs/closed/bug_1963.v
diff --git a/test-suite/bugs/closed/1977.v b/test-suite/bugs/closed/bug_1977.v
index 28715040ce..28715040ce 100644
--- a/test-suite/bugs/closed/1977.v
+++ b/test-suite/bugs/closed/bug_1977.v
diff --git a/test-suite/bugs/closed/1981.v b/test-suite/bugs/closed/bug_1981.v
index a3d9429307..a3d9429307 100644
--- a/test-suite/bugs/closed/1981.v
+++ b/test-suite/bugs/closed/bug_1981.v
diff --git a/test-suite/bugs/closed/2001.v b/test-suite/bugs/closed/bug_2001.v
index 652c65706a..652c65706a 100644
--- a/test-suite/bugs/closed/2001.v
+++ b/test-suite/bugs/closed/bug_2001.v
diff --git a/test-suite/bugs/closed/2006.v b/test-suite/bugs/closed/bug_2006.v
index d353d0e2d6..d353d0e2d6 100644
--- a/test-suite/bugs/closed/2006.v
+++ b/test-suite/bugs/closed/bug_2006.v
diff --git a/test-suite/bugs/closed/2016.v b/test-suite/bugs/closed/bug_2016.v
index 536e6fabd9..927021a259 100644
--- a/test-suite/bugs/closed/2016.v
+++ b/test-suite/bugs/closed/bug_2016.v
@@ -1,5 +1,5 @@
 (* Coq 8.2beta4 *)
-Require Import Classical_Prop. 
+Require Import Classical_Prop.
 
 Unset Structural Injection.
 
@@ -44,7 +44,7 @@ Qed.
 
 Definition f := CoreSemantics oe_core.
 
-Lemma oe_corestep_fun: forall q q1 q2, 
+Lemma oe_corestep_fun: forall q q1 q2,
        oe_corestep q q1 -> oe_corestep q q2 -> q1 = q2.
 Proof.
 unfold oe_corestep; intros.
diff --git a/test-suite/bugs/closed/2017.v b/test-suite/bugs/closed/bug_2017.v
index df6661483a..df6661483a 100644
--- a/test-suite/bugs/closed/2017.v
+++ b/test-suite/bugs/closed/bug_2017.v
diff --git a/test-suite/bugs/closed/2021.v b/test-suite/bugs/closed/bug_2021.v
index 5df92998e1..5df92998e1 100644
--- a/test-suite/bugs/closed/2021.v
+++ b/test-suite/bugs/closed/bug_2021.v
diff --git a/test-suite/bugs/closed/2027.v b/test-suite/bugs/closed/bug_2027.v
index ebc2bc070c..ebc2bc070c 100644
--- a/test-suite/bugs/closed/2027.v
+++ b/test-suite/bugs/closed/bug_2027.v
diff --git a/test-suite/bugs/closed/2083.v b/test-suite/bugs/closed/bug_2083.v
index 5f17f7af35..f33e96cea6 100644
--- a/test-suite/bugs/closed/2083.v
+++ b/test-suite/bugs/closed/bug_2083.v
@@ -21,7 +21,7 @@ Next Obligation.
   apply H. simpl. omega.
 Defined.
 
-Next Obligation. 
+Next Obligation.
   case (le_lt_dec p i) ; intros. assert(i = p) by omega. subst.
   revert H0. clear_subset_proofs. auto.
   apply H. simpl. assumption. Defined.
diff --git a/test-suite/bugs/closed/2089.v b/test-suite/bugs/closed/bug_2089.v
index aebccc9424..aebccc9424 100644
--- a/test-suite/bugs/closed/2089.v
+++ b/test-suite/bugs/closed/bug_2089.v
diff --git a/test-suite/bugs/closed/2095.v b/test-suite/bugs/closed/bug_2095.v
index 28ea99dfef..28ea99dfef 100644
--- a/test-suite/bugs/closed/2095.v
+++ b/test-suite/bugs/closed/bug_2095.v
diff --git a/test-suite/bugs/closed/2105.v b/test-suite/bugs/closed/bug_2105.v
index 46a416fd4b..46a416fd4b 100644
--- a/test-suite/bugs/closed/2105.v
+++ b/test-suite/bugs/closed/bug_2105.v
diff --git a/test-suite/bugs/closed/2108.v b/test-suite/bugs/closed/bug_2108.v
index cad8baa981..cad8baa981 100644
--- a/test-suite/bugs/closed/2108.v
+++ b/test-suite/bugs/closed/bug_2108.v
diff --git a/test-suite/bugs/closed/2117.v b/test-suite/bugs/closed/bug_2117.v
index 6377a8b74a..50c925617e 100644
--- a/test-suite/bugs/closed/2117.v
+++ b/test-suite/bugs/closed/bug_2117.v
@@ -39,7 +39,7 @@ Axiom substcopy: forall tau tau':Type, forall t:tau->tau', forall q:tau, forall
 (forall x:tau, (copyf tau x q) -> (copy tau' (t x) r))
 ->subst tau tau' t q r.
 
-Ltac EtaLong := (apply copy_fun;intros;EtaLong)|| apply copy_atom.

+Ltac EtaLong := (apply copy_fun;intros;EtaLong)|| apply copy_atom.
 Ltac Subst := apply substcopy;intros;EtaLong.
 Ltac Rigid_aux := fun A => apply A|| Rigid_aux (copyr_fun _ _ _ _ A).
 Ltac Rigid := fun A => apply copyr_atom; Rigid_aux A.
diff --git a/test-suite/bugs/closed/2123.v b/test-suite/bugs/closed/bug_2123.v
index 422a2c126e..2957e53e3c 100644
--- a/test-suite/bugs/closed/2123.v
+++ b/test-suite/bugs/closed/bug_2123.v
@@ -7,5 +7,3 @@ Parameter widen : forall (n : nat) (s : fset n), { x : fset (S n) | s=s }.
 Goal forall i, fset (S i).
 intro.
 refine (proj1_sig (widen i _)).
-
-
diff --git a/test-suite/bugs/closed/2127.v b/test-suite/bugs/closed/bug_2127.v
index 142ada268b..142ada268b 100644
--- a/test-suite/bugs/closed/2127.v
+++ b/test-suite/bugs/closed/bug_2127.v
diff --git a/test-suite/bugs/closed/2135.v b/test-suite/bugs/closed/bug_2135.v
index 61882176aa..1638214e96 100644
--- a/test-suite/bugs/closed/2135.v
+++ b/test-suite/bugs/closed/bug_2135.v
@@ -1,5 +1,5 @@
 (* Check that metas are whd-normalized before trying 2nd-order unification *)
-Lemma test : 
+Lemma test :
   forall (D:Type) (T : forall C, option C) (Q:forall D, option D -> Prop),
   (forall (A : Type) (P : forall B:Type, option B -> Prop), P A (T A))
   -> Q D (T D).
diff --git a/test-suite/bugs/closed/2136.v b/test-suite/bugs/closed/bug_2136.v
index 2fcfbe40dc..2fcfbe40dc 100644
--- a/test-suite/bugs/closed/2136.v
+++ b/test-suite/bugs/closed/bug_2136.v
diff --git a/test-suite/bugs/closed/2137.v b/test-suite/bugs/closed/bug_2137.v
index b1f54b1766..b1f54b1766 100644
--- a/test-suite/bugs/closed/2137.v
+++ b/test-suite/bugs/closed/bug_2137.v
diff --git a/test-suite/bugs/closed/2139.v b/test-suite/bugs/closed/bug_2139.v
index a7f3550888..e2e4784965 100644
--- a/test-suite/bugs/closed/2139.v
+++ b/test-suite/bugs/closed/bug_2139.v
@@ -6,7 +6,7 @@ Class Patch (patch : Type) := {
 }.
 
 Parameter flip : forall	`{patchInstance	: Patch	patch}
-                       	 {a b : patch},
+                        {a b : patch},
                  commute a b <-> commute b a.
 
 Lemma Foo : forall `{patchInstance : Patch patch}
diff --git a/test-suite/bugs/closed/2141.v b/test-suite/bugs/closed/bug_2141.v
index 22e33c8e81..22e33c8e81 100644
--- a/test-suite/bugs/closed/2141.v
+++ b/test-suite/bugs/closed/bug_2141.v
diff --git a/test-suite/bugs/closed/2145.v b/test-suite/bugs/closed/bug_2145.v
index 4dc0de7433..949fc20364 100644
--- a/test-suite/bugs/closed/2145.v
+++ b/test-suite/bugs/closed/bug_2145.v
@@ -8,13 +8,12 @@ Open Scope R_scope.
 Lemma essai :
  forall yb xb m1 m2 xa ya,
   xa <> xb ->
- yb - 2 * m2 * xb = ya - m2 * xa -> 
+ yb - 2 * m2 * xb = ya - m2 * xa ->
  yb - m1 * xb = ya - m1 * xa ->
- yb - ya = (2 * xb - xa) * m2 -> 
+ yb - ya = (2 * xb - xa) * m2 ->
  yb - ya = (xb - xa) * m1.
 Proof.
 intros.
 (* clear H. groebner used not to work when H was not cleared *)
 nsatz.
 Qed.
-
diff --git a/test-suite/bugs/closed/2149.v b/test-suite/bugs/closed/bug_2149.v
index 38c5f36ab2..8bc5a2cefc 100644
--- a/test-suite/bugs/closed/2149.v
+++ b/test-suite/bugs/closed/bug_2149.v
@@ -4,4 +4,3 @@ intros x y.
 rename x into y, y into x.
 trivial.
 Qed.
-
diff --git a/test-suite/bugs/closed/2164.v b/test-suite/bugs/closed/bug_2164.v
index 6adb3577be..6adb3577be 100644
--- a/test-suite/bugs/closed/2164.v
+++ b/test-suite/bugs/closed/bug_2164.v
diff --git a/test-suite/bugs/closed/2181.v b/test-suite/bugs/closed/bug_2181.v
index 62820d8699..62820d8699 100644
--- a/test-suite/bugs/closed/2181.v
+++ b/test-suite/bugs/closed/bug_2181.v
diff --git a/test-suite/bugs/closed/2193.v b/test-suite/bugs/closed/bug_2193.v
index fe2588676d..780636718e 100644
--- a/test-suite/bugs/closed/2193.v
+++ b/test-suite/bugs/closed/bug_2193.v
@@ -16,7 +16,7 @@ Definition A (P : forall s : SExpression, Type)
  (x alpha alpha1 : SExpression)
  (t : ProperExpr (x) alpha1) : option (x = atomic VAR) :=
  match t as pe in ProperExpr a b return option (a = atomic VAR) with
- | pe_3 x0 alpha3 tye' => 
+ | pe_3 x0 alpha3 tye' =>
       (fun (x:Symbol) (alpha : SExpression) => @None (atomic x = atomic VAR))
        x0 alpha3
  end.
@@ -25,7 +25,7 @@ Definition B (P : forall s : SExpression, Type)
  (x alpha alpha1 : SExpression)
  (t : ProperExpr (x) alpha1) : option (x = atomic VAR) :=
  match t as pe in ProperExpr a b return option (a = atomic VAR) with
- | pe_3 x0 alpha3 tye' => 
+ | pe_3 x0 alpha3 tye' =>
       (fun (x:Symbol) (alpha : SExpression) (t:ProperExpr alpha (atomic VAR)) => @None (atomic x = atomic VAR))
        x0 alpha3 tye'
  end.
diff --git a/test-suite/bugs/closed/2230.v b/test-suite/bugs/closed/bug_2230.v
index 5076fb2bb7..5076fb2bb7 100644
--- a/test-suite/bugs/closed/2230.v
+++ b/test-suite/bugs/closed/bug_2230.v
diff --git a/test-suite/bugs/closed/2231.v b/test-suite/bugs/closed/bug_2231.v
index 03e2c9bbf4..03e2c9bbf4 100644
--- a/test-suite/bugs/closed/2231.v
+++ b/test-suite/bugs/closed/bug_2231.v
diff --git a/test-suite/bugs/closed/2243.v b/test-suite/bugs/closed/bug_2243.v
index 6d45c9a09e..6d45c9a09e 100644
--- a/test-suite/bugs/closed/2243.v
+++ b/test-suite/bugs/closed/bug_2243.v
diff --git a/test-suite/bugs/closed/2244.v b/test-suite/bugs/closed/bug_2244.v
index d499e515fe..d72c51f216 100644
--- a/test-suite/bugs/closed/2244.v
+++ b/test-suite/bugs/closed/bug_2244.v
@@ -11,7 +11,7 @@ Lemma test : forall
   (x : A),
   S (f x).
 Proof.
-  intros. eapply EV. intros. 
+  intros. eapply EV. intros.
   (* worked in v8.2 but not in v8.3beta, fixed in r12898 *)
   apply HS.
 
diff --git a/test-suite/bugs/closed/2245.v b/test-suite/bugs/closed/bug_2245.v
index f0162f3b27..f0162f3b27 100644
--- a/test-suite/bugs/closed/2245.v
+++ b/test-suite/bugs/closed/bug_2245.v
diff --git a/test-suite/bugs/closed/2250.v b/test-suite/bugs/closed/bug_2250.v
index 565d7b68fd..565d7b68fd 100644
--- a/test-suite/bugs/closed/2250.v
+++ b/test-suite/bugs/closed/bug_2250.v
diff --git a/test-suite/bugs/closed/2251.v b/test-suite/bugs/closed/bug_2251.v
index d0fa3f2b33..d0fa3f2b33 100644
--- a/test-suite/bugs/closed/2251.v
+++ b/test-suite/bugs/closed/bug_2251.v
diff --git a/test-suite/bugs/closed/2255.v b/test-suite/bugs/closed/bug_2255.v
index bf80ff6607..ae5024fddd 100644
--- a/test-suite/bugs/closed/2255.v
+++ b/test-suite/bugs/closed/bug_2255.v
@@ -9,13 +9,13 @@ Inductive Tuple : forall n, TupleT n -> Type :=
 | cons {n} A (x : A) (F : A -> TupleT n) : Tuple _ (F x) -> Tuple _ (consT A F).
 
 Goal forall n A F x X n0 A0 x0 F0 H0 (H : existT (fun n0 : nat => {H0 : TupleT
-n0 & Tuple n0 H0}) 
+n0 & Tuple n0 H0})
          (S n0)
-         (existT (fun H0 : TupleT (S n0) => Tuple (S n0) H0) 
+         (existT (fun H0 : TupleT (S n0) => Tuple (S n0) H0)
             (consT A0 F0) (cons A0 x0 F0 H0)) =
-       existT (fun n0 : nat => {H0 : TupleT n0 & Tuple n0 H0}) 
+       existT (fun n0 : nat => {H0 : TupleT n0 & Tuple n0 H0})
          (S n)
-         (existT (fun H0 : TupleT (S n) => Tuple (S n) H0) 
+         (existT (fun H0 : TupleT (S n) => Tuple (S n) H0)
             (consT A F) (cons A x F X))), False.
 intros.
 injection H.
diff --git a/test-suite/bugs/closed/2262.v b/test-suite/bugs/closed/bug_2262.v
index b61f18b837..1533960150 100644
--- a/test-suite/bugs/closed/2262.v
+++ b/test-suite/bugs/closed/bug_2262.v
@@ -8,4 +8,3 @@ Admitted. (* works fine *)
 
 Definition mylemma' := forall `{Test A}, test = test.
 About mylemma'.
-
diff --git a/test-suite/bugs/closed/2281.v b/test-suite/bugs/closed/bug_2281.v
index 8f549b9201..8f549b9201 100644
--- a/test-suite/bugs/closed/2281.v
+++ b/test-suite/bugs/closed/bug_2281.v
diff --git a/test-suite/bugs/closed/2295.v b/test-suite/bugs/closed/bug_2295.v
index f5ca28dcaa..f5ca28dcaa 100644
--- a/test-suite/bugs/closed/2295.v
+++ b/test-suite/bugs/closed/bug_2295.v
diff --git a/test-suite/bugs/closed/2299.v b/test-suite/bugs/closed/bug_2299.v
index c0552ca7b3..c0552ca7b3 100644
--- a/test-suite/bugs/closed/2299.v
+++ b/test-suite/bugs/closed/bug_2299.v
diff --git a/test-suite/bugs/closed/2300.v b/test-suite/bugs/closed/bug_2300.v
index 4e587cbb25..4e587cbb25 100644
--- a/test-suite/bugs/closed/2300.v
+++ b/test-suite/bugs/closed/bug_2300.v
diff --git a/test-suite/bugs/closed/2303.v b/test-suite/bugs/closed/bug_2303.v
index e614b9b552..e614b9b552 100644
--- a/test-suite/bugs/closed/2303.v
+++ b/test-suite/bugs/closed/bug_2303.v
diff --git a/test-suite/bugs/closed/2304.v b/test-suite/bugs/closed/bug_2304.v
index 1ac2702b0a..663c42e480 100644
--- a/test-suite/bugs/closed/2304.v
+++ b/test-suite/bugs/closed/bug_2304.v
@@ -1,4 +1,3 @@
 (* This used to fail with an anomaly NotASort at some time *)
 Class A (O: Type): Type := a: O -> Type.
 Fail Goal forall (x: a tt), @a x = @a x.
-
diff --git a/test-suite/bugs/closed/2307.v b/test-suite/bugs/closed/bug_2307.v
index 7c04949539..2c82a61a68 100644
--- a/test-suite/bugs/closed/2307.v
+++ b/test-suite/bugs/closed/bug_2307.v
@@ -1,3 +1,2 @@
 Inductive V: nat -> Type := VS n: V (S n).
 Definition f (e: V 1): nat := match e with VS 0 => 3 end.
-
diff --git a/test-suite/bugs/closed/2310.v b/test-suite/bugs/closed/bug_2310.v
index 14a3e5a7b0..14a3e5a7b0 100644
--- a/test-suite/bugs/closed/2310.v
+++ b/test-suite/bugs/closed/bug_2310.v
diff --git a/test-suite/bugs/closed/2319.v b/test-suite/bugs/closed/bug_2319.v
index 73d95e91a1..73d95e91a1 100644
--- a/test-suite/bugs/closed/2319.v
+++ b/test-suite/bugs/closed/bug_2319.v
diff --git a/test-suite/bugs/closed/2320.v b/test-suite/bugs/closed/bug_2320.v
index facb9ecfc9..1616a29de6 100644
--- a/test-suite/bugs/closed/2320.v
+++ b/test-suite/bugs/closed/bug_2320.v
@@ -3,7 +3,7 @@
 (* This was working in 8.1 but is failing in 8.2 and 8.3. It works in
    trunk thanks to the new proof engine. It could probably made to work in
    8.2 and 8.3 if a return predicate of the form "dummy 0" instead of
-   (or in addition to) a sophisticated predicate of the form 
+   (or in addition to) a sophisticated predicate of the form
    "as x in dummy y return match y with 0 => ?P | _ => ID end" *)
 
 Inductive dummy : nat -> Prop := constr : dummy 0.
diff --git a/test-suite/bugs/closed/2342.v b/test-suite/bugs/closed/bug_2342.v
index 6613b28571..e55bda05a6 100644
--- a/test-suite/bugs/closed/2342.v
+++ b/test-suite/bugs/closed/bug_2342.v
@@ -3,6 +3,5 @@
 
 Parameter A : Set.
 Parameter B : A -> Set.
-Parameter F : Set -> Prop. 
+Parameter F : Set -> Prop.
 Check (F (forall x, B x)).
-
diff --git a/test-suite/bugs/closed/2347.v b/test-suite/bugs/closed/bug_2347.v
index e433f158e4..11456c7e35 100644
--- a/test-suite/bugs/closed/2347.v
+++ b/test-suite/bugs/closed/bug_2347.v
@@ -1,7 +1,7 @@
 Require Import EquivDec List.
 Generalizable All Variables.
 
-Program Definition list_eqdec `(eqa : EqDec A eq) : EqDec (list A) eq := 
+Program Definition list_eqdec `(eqa : EqDec A eq) : EqDec (list A) eq :=
  (fun (x y : list A) => _).
 Admit Obligations of list_eqdec.
 
diff --git a/test-suite/bugs/closed/2350.v b/test-suite/bugs/closed/bug_2350.v
index e91f22e267..e91f22e267 100644
--- a/test-suite/bugs/closed/2350.v
+++ b/test-suite/bugs/closed/bug_2350.v
diff --git a/test-suite/bugs/closed/2353.v b/test-suite/bugs/closed/bug_2353.v
index baae9a6ece..baae9a6ece 100644
--- a/test-suite/bugs/closed/2353.v
+++ b/test-suite/bugs/closed/bug_2353.v
diff --git a/test-suite/bugs/closed/2360.v b/test-suite/bugs/closed/bug_2360.v
index 4ae97c97bb..9aea5f3615 100644
--- a/test-suite/bugs/closed/2360.v
+++ b/test-suite/bugs/closed/bug_2360.v
@@ -2,7 +2,7 @@
 Definition interp (etyp : nat -> Type) (p: nat) := etyp p.
 
 Record Value (etyp : nat -> Type) := Mk {
-  typ : nat; 
+  typ : nat;
   value : interp etyp typ
 }.
 
@@ -10,4 +10,3 @@ Definition some_value (etyp : nat -> Type) :  (Value etyp).
 Proof.
   intros.
   Fail apply Mk. (* Check that it does not raise an anomaly *)
-
diff --git a/test-suite/bugs/closed/2362.v b/test-suite/bugs/closed/bug_2362.v
index 10e86cd12d..ffd51a5dba 100644
--- a/test-suite/bugs/closed/2362.v
+++ b/test-suite/bugs/closed/bug_2362.v
@@ -1,6 +1,6 @@
 Set Implicit Arguments.
 
-Class Pointed (M:Type -> Type) := 
+Class Pointed (M:Type -> Type) :=
 {
   creturn: forall {A: Type}, A -> M A
 }.
@@ -34,5 +34,3 @@ Instance Pointed_FPair_mono:
 
 Definition blah (x:bool) : FPair bool nat O :=
   creturn x.
-
-
diff --git a/test-suite/bugs/closed/2375.v b/test-suite/bugs/closed/bug_2375.v
index c17c426cda..f1ca269646 100644
--- a/test-suite/bugs/closed/2375.v
+++ b/test-suite/bugs/closed/bug_2375.v
@@ -1,4 +1,4 @@
-(* In the following code, the (superfluous) lemma [lem] is responsible 
+(* In the following code, the (superfluous) lemma [lem] is responsible
 for the failure of congruence. *)
 
 Definition  f : nat -> Prop := fun x => True.
@@ -15,4 +15,3 @@ Proof.
   (*clear ax.*)
   congruence.
 Qed.
-
diff --git a/test-suite/bugs/closed/2378.v b/test-suite/bugs/closed/bug_2378.v
index b9dd654057..b9dd654057 100644
--- a/test-suite/bugs/closed/2378.v
+++ b/test-suite/bugs/closed/bug_2378.v
diff --git a/test-suite/bugs/closed/2388.v b/test-suite/bugs/closed/bug_2388.v
index c792671193..fbe5e20f2f 100644
--- a/test-suite/bugs/closed/2388.v
+++ b/test-suite/bugs/closed/bug_2388.v
@@ -4,7 +4,6 @@ Fail Parameters (A:Prop) (a:A A).
 
 (* This is a variant (reported as part of bug #2347) *)
 
-Require Import EquivDec.                                              
-Fail Program Instance bool_eq_eqdec : EqDec bool eq := 
+Require Import EquivDec.
+Fail Program Instance bool_eq_eqdec : EqDec bool eq :=
    {equiv_dec x y := (fix aux (x y : bool) {struct x}:= aux _ y) x y}.
-
diff --git a/test-suite/bugs/closed/2393.v b/test-suite/bugs/closed/bug_2393.v
index fb4f92619f..fb4f92619f 100644
--- a/test-suite/bugs/closed/2393.v
+++ b/test-suite/bugs/closed/bug_2393.v
diff --git a/test-suite/bugs/closed/2404.v b/test-suite/bugs/closed/bug_2404.v
index f6ec676014..f6ec676014 100644
--- a/test-suite/bugs/closed/2404.v
+++ b/test-suite/bugs/closed/bug_2404.v
diff --git a/test-suite/bugs/closed/2406.v b/test-suite/bugs/closed/bug_2406.v
index 3766e795a0..3766e795a0 100644
--- a/test-suite/bugs/closed/2406.v
+++ b/test-suite/bugs/closed/bug_2406.v
diff --git a/test-suite/bugs/closed/2417.v b/test-suite/bugs/closed/bug_2417.v
index b2f00ffc65..b2f00ffc65 100644
--- a/test-suite/bugs/closed/2417.v
+++ b/test-suite/bugs/closed/bug_2417.v
diff --git a/test-suite/bugs/closed/2428.v b/test-suite/bugs/closed/bug_2428.v
index b398a76d91..b398a76d91 100644
--- a/test-suite/bugs/closed/2428.v
+++ b/test-suite/bugs/closed/bug_2428.v
diff --git a/test-suite/bugs/closed/2447.v b/test-suite/bugs/closed/bug_2447.v
index fdeb69fcc7..fdeb69fcc7 100644
--- a/test-suite/bugs/closed/2447.v
+++ b/test-suite/bugs/closed/bug_2447.v
diff --git a/test-suite/bugs/closed/2456.v b/test-suite/bugs/closed/bug_2456.v
index e5a392c4d3..e5a392c4d3 100644
--- a/test-suite/bugs/closed/2456.v
+++ b/test-suite/bugs/closed/bug_2456.v
diff --git a/test-suite/bugs/closed/2464.v b/test-suite/bugs/closed/bug_2464.v
index b9db30359c..b9db30359c 100644
--- a/test-suite/bugs/closed/2464.v
+++ b/test-suite/bugs/closed/bug_2464.v
diff --git a/test-suite/bugs/closed/2467.v b/test-suite/bugs/closed/bug_2467.v
index ad17814a8f..ad17814a8f 100644
--- a/test-suite/bugs/closed/2467.v
+++ b/test-suite/bugs/closed/bug_2467.v
diff --git a/test-suite/bugs/closed/2473.v b/test-suite/bugs/closed/bug_2473.v
index 0e7c0c25fa..48987ea325 100644
--- a/test-suite/bugs/closed/2473.v
+++ b/test-suite/bugs/closed/bug_2473.v
@@ -8,7 +8,7 @@ Section S1.
   Instance HR2: forall n, Symmetric (R n).  Admitted.
   Hypothesis H: forall n a, R n (andb a a) a.
   Goal forall n a b, R n b a.
-   intros. 
+   intros.
    (* rewrite <- H. *) (* Anomaly: Evar ?.. was not declared. Please report. *)
    (* idem with setoid_rewrite *)
 (*    assert (HR2' := HR2 n). *)
@@ -33,7 +33,7 @@ Section S3.
   Instance HR2': Symmetric R.  Admitted.
   Hypothesis H: forall a, R (andb a a) a.
   Goal forall a b, R b a.
-   intros. 
+   intros.
    rewrite <- H.                (* ok *)
    admit.
   Qed.
diff --git a/test-suite/bugs/closed/2584.v b/test-suite/bugs/closed/bug_2584.v
index b5a723b47f..fe3967ff67 100644
--- a/test-suite/bugs/closed/2584.v
+++ b/test-suite/bugs/closed/bug_2584.v
@@ -2,11 +2,11 @@ Require Import List.
 
 Set Implicit Arguments.
 
-Definition err : Type := unit. 
+Definition err : Type := unit.
 
 Inductive res (A: Type) : Type :=
 | OK: A -> res A
-| Error: err -> res A. 
+| Error: err -> res A.
 
 Arguments Error [A].
 
@@ -15,11 +15,11 @@ Set Printing Universes.
 Section FOO.
 
 Inductive ftyp : Type :=
-  | Funit : ftyp 
-  | Ffun : list ftyp -> ftyp 
+  | Funit : ftyp
+  | Ffun : list ftyp -> ftyp
   | Fref : area -> ftyp
-with area : Type := 
-  | Stored : ftyp -> area        
+with area : Type :=
+  | Stored : ftyp -> area
 .
 
 Print ftyp.
@@ -32,16 +32,16 @@ Inductive ftyp : Type (* Top.27429 *) :=
 Fixpoint tc_wf_type (ftype: ftyp) {struct ftype}: res unit :=
   match ftype with
     | Funit => OK tt
-    | Ffun args => 
+    | Ffun args =>
        ((fix tc_wf_types (ftypes: list ftyp){struct ftypes}: res unit :=
            match ftypes with
              | nil => OK tt
              | t::ts =>
                  match tc_wf_type t with
                    | OK tt => tc_wf_types ts
-                   | Error m => Error m 
-                 end 
-           end) args) 
+                   | Error m => Error m
+                 end
+           end) args)
      | Fref a => tc_wf_area a
    end
 with tc_wf_area (ar:area): res unit :=
@@ -61,16 +61,16 @@ Inductive ftyp : Type (* Top.27465 *) :=
 Fixpoint tc_wf_type' (ftype: ftyp) {struct ftype}: res unit :=
   match ftype with
     | Funit => OK tt
-    | Ffun args => 
+    | Ffun args =>
        ((fix tc_wf_types (ftypes: list ftyp){struct ftypes}: res unit :=
            match ftypes with
              | nil => OK tt
              | t::ts =>
                  match tc_wf_type' t with
                    | OK tt => tc_wf_types ts
-                   | Error m => Error m 
-                 end 
-           end) args) 
+                   | Error m => Error m
+                 end
+           end) args)
      | Fref a => tc_wf_area' a
    end
 with tc_wf_area' (ar:area): res unit :=
diff --git a/test-suite/bugs/closed/2586.v b/test-suite/bugs/closed/bug_2586.v
index e57bcc25bb..e57bcc25bb 100644
--- a/test-suite/bugs/closed/2586.v
+++ b/test-suite/bugs/closed/bug_2586.v
diff --git a/test-suite/bugs/closed/2590.v b/test-suite/bugs/closed/bug_2590.v
index 4300de16e0..504b453e92 100644
--- a/test-suite/bugs/closed/2590.v
+++ b/test-suite/bugs/closed/bug_2590.v
@@ -17,4 +17,3 @@ Section Bug.
     admit.
 Qed.
 End Bug.
-
diff --git a/test-suite/bugs/closed/2602.v b/test-suite/bugs/closed/bug_2602.v
index 29c8ac16b2..29c8ac16b2 100644
--- a/test-suite/bugs/closed/2602.v
+++ b/test-suite/bugs/closed/bug_2602.v
diff --git a/test-suite/bugs/closed/2603.v b/test-suite/bugs/closed/bug_2603.v
index 371bfdc575..371bfdc575 100644
--- a/test-suite/bugs/closed/2603.v
+++ b/test-suite/bugs/closed/bug_2603.v
diff --git a/test-suite/bugs/closed/2608.v b/test-suite/bugs/closed/bug_2608.v
index a4c95ff97c..a4c95ff97c 100644
--- a/test-suite/bugs/closed/2608.v
+++ b/test-suite/bugs/closed/bug_2608.v
diff --git a/test-suite/bugs/closed/2613.v b/test-suite/bugs/closed/bug_2613.v
index 15f3bf52c3..6307dae1b2 100644
--- a/test-suite/bugs/closed/2613.v
+++ b/test-suite/bugs/closed/bug_2613.v
@@ -15,4 +15,3 @@ Proof.
 Defined.
 
 Check eq_sym eq_refl : 0=0.
-
diff --git a/test-suite/bugs/closed/2615.v b/test-suite/bugs/closed/bug_2615.v
index 26c0f334d0..7197d917bd 100644
--- a/test-suite/bugs/closed/2615.v
+++ b/test-suite/bugs/closed/bug_2615.v
@@ -7,8 +7,8 @@ Inductive foo : forall A, A -> Prop :=
 Lemma bar A B f : foo (A -> B) f -> forall x : A, foo B (f x).
 Fail induction 1.
 
-(* Whether these examples should succeed with a non-dependent return predicate 
-   or fail because there is well-typed return predicate dependent in f 
+(* Whether these examples should succeed with a non-dependent return predicate
+   or fail because there is well-typed return predicate dependent in f
    is questionable. As of 25 oct 2011, they succeed *)
 refine (fun p => match p with _ => _ end).
 Undo.
diff --git a/test-suite/bugs/closed/2616.v b/test-suite/bugs/closed/bug_2616.v
index 8758e32dd8..0be5b6c2c5 100644
--- a/test-suite/bugs/closed/2616.v
+++ b/test-suite/bugs/closed/bug_2616.v
@@ -1,6 +1,6 @@
 (* Testing ill-typed rewrite which used to succeed in 8.3 *)
-Goal 
-  forall (N : nat -> Prop) (g : nat -> sig N) (IN : forall a : sig N, a = g 0), 
+Goal
+  forall (N : nat -> Prop) (g : nat -> sig N) (IN : forall a : sig N, a = g 0),
     N 0 -> False.
 Proof.
 intros.
diff --git a/test-suite/bugs/closed/2629.v b/test-suite/bugs/closed/bug_2629.v
index 759cd3dd28..759cd3dd28 100644
--- a/test-suite/bugs/closed/2629.v
+++ b/test-suite/bugs/closed/bug_2629.v
diff --git a/test-suite/bugs/closed/2667.v b/test-suite/bugs/closed/bug_2667.v
index 0e6d0108cc..0e6d0108cc 100644
--- a/test-suite/bugs/closed/2667.v
+++ b/test-suite/bugs/closed/bug_2667.v
diff --git a/test-suite/bugs/closed/2668.v b/test-suite/bugs/closed/bug_2668.v
index d5bbfd3f08..d5bbfd3f08 100644
--- a/test-suite/bugs/closed/2668.v
+++ b/test-suite/bugs/closed/bug_2668.v
diff --git a/test-suite/bugs/closed/2670.v b/test-suite/bugs/closed/bug_2670.v
index 791889b24b..791889b24b 100644
--- a/test-suite/bugs/closed/2670.v
+++ b/test-suite/bugs/closed/bug_2670.v
diff --git a/test-suite/bugs/closed/2680.v b/test-suite/bugs/closed/bug_2680.v
index 0f573a2898..e5319f3b4d 100644
--- a/test-suite/bugs/closed/2680.v
+++ b/test-suite/bugs/closed/bug_2680.v
@@ -13,5 +13,3 @@ Proof.
   intros.
   tauto.
 Qed.
-
-
diff --git a/test-suite/bugs/closed/2713.v b/test-suite/bugs/closed/bug_2713.v
index b5fc74bfa7..c8d4c6cecd 100644
--- a/test-suite/bugs/closed/2713.v
+++ b/test-suite/bugs/closed/bug_2713.v
@@ -1,6 +1,6 @@
 Set Implicit Arguments.
 
-Definition pred_le A (P Q : A->Prop) := 
+Definition pred_le A (P Q : A->Prop) :=
   forall x, P x -> Q x.
 
 Lemma pred_le_refl : forall A (P:A->Prop),
@@ -9,8 +9,8 @@ Proof. unfold pred_le. auto. Qed.
 
 Hint Resolve pred_le_refl.
 
-Lemma test : 
-  forall (P1 P2:nat->Prop), 
+Lemma test :
+  forall (P1 P2:nat->Prop),
   (forall Q, pred_le (fun a => P1 a /\ P2 a) Q -> True) ->
    True.
 Proof. intros. eapply H. eauto. (* used to work *)
diff --git a/test-suite/bugs/closed/2729.v b/test-suite/bugs/closed/bug_2729.v
index c9d65c12c7..c9d65c12c7 100644
--- a/test-suite/bugs/closed/2729.v
+++ b/test-suite/bugs/closed/bug_2729.v
diff --git a/test-suite/bugs/closed/2732.v b/test-suite/bugs/closed/bug_2732.v
index f22a8cccc5..f22a8cccc5 100644
--- a/test-suite/bugs/closed/2732.v
+++ b/test-suite/bugs/closed/bug_2732.v
diff --git a/test-suite/bugs/closed/2733.v b/test-suite/bugs/closed/bug_2733.v
index 24dd30b32e..24dd30b32e 100644
--- a/test-suite/bugs/closed/2733.v
+++ b/test-suite/bugs/closed/bug_2733.v
diff --git a/test-suite/bugs/closed/2734.v b/test-suite/bugs/closed/bug_2734.v
index 3210214ea1..3210214ea1 100644
--- a/test-suite/bugs/closed/2734.v
+++ b/test-suite/bugs/closed/bug_2734.v
diff --git a/test-suite/bugs/closed/2750.v b/test-suite/bugs/closed/bug_2750.v
index 9d65e51f63..9d65e51f63 100644
--- a/test-suite/bugs/closed/2750.v
+++ b/test-suite/bugs/closed/bug_2750.v
diff --git a/test-suite/bugs/closed/2775.v b/test-suite/bugs/closed/bug_2775.v
index f1f384bdf7..484ac6fd38 100644
--- a/test-suite/bugs/closed/2775.v
+++ b/test-suite/bugs/closed/bug_2775.v
@@ -2,5 +2,5 @@ Inductive typ : forall (T:Type), list T ->  Type -> Prop :=
   | Get : forall (T:Type) (l:list T), typ T l T.
 
 
-Derive Inversion inv with 
+Derive Inversion inv with
 (forall (X: Type) (y: list nat), typ nat y X)  Sort Prop.
diff --git a/test-suite/bugs/closed/2800.v b/test-suite/bugs/closed/bug_2800.v
index 54c75e344c..54c75e344c 100644
--- a/test-suite/bugs/closed/2800.v
+++ b/test-suite/bugs/closed/bug_2800.v
diff --git a/test-suite/bugs/closed/2810.v b/test-suite/bugs/closed/bug_2810.v
index a66078c60a..a66078c60a 100644
--- a/test-suite/bugs/closed/2810.v
+++ b/test-suite/bugs/closed/bug_2810.v
diff --git a/test-suite/bugs/closed/2814.v b/test-suite/bugs/closed/bug_2814.v
index 99da1e3e44..99da1e3e44 100644
--- a/test-suite/bugs/closed/2814.v
+++ b/test-suite/bugs/closed/bug_2814.v
diff --git a/test-suite/bugs/closed/2817.v b/test-suite/bugs/closed/bug_2817.v
index 08dff99287..08dff99287 100644
--- a/test-suite/bugs/closed/2817.v
+++ b/test-suite/bugs/closed/bug_2817.v
diff --git a/test-suite/bugs/closed/2818.v b/test-suite/bugs/closed/bug_2818.v
index 010855cfb7..010855cfb7 100644
--- a/test-suite/bugs/closed/2818.v
+++ b/test-suite/bugs/closed/bug_2818.v
diff --git a/test-suite/bugs/closed/2828.v b/test-suite/bugs/closed/bug_2828.v
index 0b8abace22..0b8abace22 100644
--- a/test-suite/bugs/closed/2828.v
+++ b/test-suite/bugs/closed/bug_2828.v
diff --git a/test-suite/bugs/closed/2830.v b/test-suite/bugs/closed/bug_2830.v
index 07a5cf91a5..801c61b132 100644
--- a/test-suite/bugs/closed/2830.v
+++ b/test-suite/bugs/closed/bug_2830.v
@@ -166,7 +166,7 @@ Class Functor `(C:Category) `(D:Category) (im : C -> D) := {
   ; fmap : forall {a b}, `(a ~> b) -> im a ~> im b
   ; fmap_respects : forall a b (f f' : a ~> b), f ≈ f' -> fmap f ≈ fmap f'
   ; fmap_preserves_id : forall a, fmap (id a) ≈ id (im a)
-  ; fmap_preserves_comp : forall `(f:a~>b) `(g:b~>c), 
+  ; fmap_preserves_comp : forall `(f:a~>b) `(g:b~>c),
     fmap g ∘ fmap f ≈ fmap (g ∘ f)
 }.
 Coercion functor_im : Functor >-> Funclass.
@@ -174,13 +174,13 @@ Arguments fmap [Object Hom C Object0 Hom0 D im] _ [a b].
 
 Add Parametric Morphism `(C:Category) `(D:Category)
   (Im:C->D) (F:Functor C D Im) (a b:C) : (@fmap _ _ C _ _ D Im F a b)
-  with signature (@eqv C _ C a b ==> @eqv D _ D (Im a) (Im b)) 
+  with signature (@eqv C _ C a b ==> @eqv D _ D (Im a) (Im b))
   as parametric_morphism_fmap.
 intros. apply fmap_respects. assumption. Qed.
 
 (* HERE IS THE PROBLEMATIC INSTANCE. If we change this to a regular Definition,
    then the problem goes away. *)
-Instance functor_comp `{C:Category} `{D:Category} `{E:Category} 
+Instance functor_comp `{C:Category} `{D:Category} `{E:Category}
   {Gim} (G:Functor D E Gim) {Fim} (F:Functor C D Fim)
   : Functor C E (Basics.compose Gim Fim).
 intros. apply Build_Functor with (fmap := fun a b f => fmap G (fmap F f)).
@@ -211,7 +211,7 @@ Definition setList (A:set_cat) := list A.
 Instance list_functor : Functor set_cat set_cat setList.
 apply Build_Functor with (fmap := @map).
 intros. rewrite H. reflexivity.
-intros; simpl; apply functional_extensionality. 
+intros; simpl; apply functional_extensionality.
   induction x; [auto|simpl]. rewrite IHx. reflexivity.
 intros; simpl; apply functional_extensionality.
   induction x; [auto|simpl]. rewrite IHx. reflexivity.
diff --git a/test-suite/bugs/closed/2834.v b/test-suite/bugs/closed/bug_2834.v
index 6015c53b8a..6015c53b8a 100644
--- a/test-suite/bugs/closed/2834.v
+++ b/test-suite/bugs/closed/bug_2834.v
diff --git a/test-suite/bugs/closed/2836.v b/test-suite/bugs/closed/bug_2836.v
index a948b75e27..a948b75e27 100644
--- a/test-suite/bugs/closed/2836.v
+++ b/test-suite/bugs/closed/bug_2836.v
diff --git a/test-suite/bugs/closed/2837.v b/test-suite/bugs/closed/bug_2837.v
index 52a56c2cff..52a56c2cff 100644
--- a/test-suite/bugs/closed/2837.v
+++ b/test-suite/bugs/closed/bug_2837.v
diff --git a/test-suite/bugs/closed/2839.v b/test-suite/bugs/closed/bug_2839.v
index e727e26061..e727e26061 100644
--- a/test-suite/bugs/closed/2839.v
+++ b/test-suite/bugs/closed/bug_2839.v
diff --git a/test-suite/bugs/closed/2846.v b/test-suite/bugs/closed/bug_2846.v
index 8d6d348a2e..8d6d348a2e 100644
--- a/test-suite/bugs/closed/2846.v
+++ b/test-suite/bugs/closed/bug_2846.v
diff --git a/test-suite/bugs/closed/2848.v b/test-suite/bugs/closed/bug_2848.v
index e234630332..e234630332 100644
--- a/test-suite/bugs/closed/2848.v
+++ b/test-suite/bugs/closed/bug_2848.v
diff --git a/test-suite/bugs/closed/2854.v b/test-suite/bugs/closed/bug_2854.v
index 14aee17ff0..14aee17ff0 100644
--- a/test-suite/bugs/closed/2854.v
+++ b/test-suite/bugs/closed/bug_2854.v
diff --git a/test-suite/bugs/closed/2876.v b/test-suite/bugs/closed/bug_2876.v
index a66ee6b3fa..c7df59e86b 100644
--- a/test-suite/bugs/closed/2876.v
+++ b/test-suite/bugs/closed/bug_2876.v
@@ -2,10 +2,10 @@ Lemma test_bug : forall (R:nat->nat->Prop) n m m' (P: Prop),
   P ->
   (P -> R n m) ->
   (P -> R n m') ->
-  (forall u, R n u -> u = u -> True) -> 
+  (forall u, R n u -> u = u -> True) ->
   True.
 Proof.
-  intros * HP H1 H2 H3. eapply H3. 
+  intros * HP H1 H2 H3. eapply H3.
   eauto. (* H1 is used, but H2 should be used since it is the last hypothesis *)
   auto.
 Qed.
diff --git a/test-suite/bugs/closed/2881.v b/test-suite/bugs/closed/bug_2881.v
index b4f09305b4..b4f09305b4 100644
--- a/test-suite/bugs/closed/2881.v
+++ b/test-suite/bugs/closed/bug_2881.v
diff --git a/test-suite/bugs/closed/2883.v b/test-suite/bugs/closed/bug_2883.v
index f027b5eb29..f027b5eb29 100644
--- a/test-suite/bugs/closed/2883.v
+++ b/test-suite/bugs/closed/bug_2883.v
diff --git a/test-suite/bugs/closed/2900.v b/test-suite/bugs/closed/bug_2900.v
index 8f4264e910..8f4264e910 100644
--- a/test-suite/bugs/closed/2900.v
+++ b/test-suite/bugs/closed/bug_2900.v
diff --git a/test-suite/bugs/closed/2920.v b/test-suite/bugs/closed/bug_2920.v
index 13548b9e44..13548b9e44 100644
--- a/test-suite/bugs/closed/2920.v
+++ b/test-suite/bugs/closed/bug_2920.v
diff --git a/test-suite/bugs/closed/2923.v b/test-suite/bugs/closed/bug_2923.v
index 8a0003a397..8a0003a397 100644
--- a/test-suite/bugs/closed/2923.v
+++ b/test-suite/bugs/closed/bug_2923.v
diff --git a/test-suite/bugs/closed/2928.v b/test-suite/bugs/closed/bug_2928.v
index 21e92ae20c..21e92ae20c 100644
--- a/test-suite/bugs/closed/2928.v
+++ b/test-suite/bugs/closed/bug_2928.v
diff --git a/test-suite/bugs/closed/2930.v b/test-suite/bugs/closed/bug_2930.v
index 0994b6fb23..0994b6fb23 100644
--- a/test-suite/bugs/closed/2930.v
+++ b/test-suite/bugs/closed/bug_2930.v
diff --git a/test-suite/bugs/closed/2945.v b/test-suite/bugs/closed/bug_2945.v
index 59b57c07b7..59b57c07b7 100644
--- a/test-suite/bugs/closed/2945.v
+++ b/test-suite/bugs/closed/bug_2945.v
diff --git a/test-suite/bugs/closed/bug_2946.v b/test-suite/bugs/closed/bug_2946.v
new file mode 100644
index 0000000000..c8b7255e7b
--- /dev/null
+++ b/test-suite/bugs/closed/bug_2946.v
@@ -0,0 +1,8 @@
+Lemma toto (E : nat -> nat -> Prop) (x y : nat)
+  (Ex_ : forall z, E x z) (E_y : forall z, E z y) : True.
+
+(* OK *)
+assert (pairE1 := let Exy := _ in (Ex_ y, E_y _) : Exy * Exy).
+
+(* FAIL *)
+assert (pairE2 := let Exy := _ in (Ex_ _, E_y x) : Exy * Exy).
diff --git a/test-suite/bugs/closed/2951.v b/test-suite/bugs/closed/bug_2951.v
index 87d544416d..87d544416d 100644
--- a/test-suite/bugs/closed/2951.v
+++ b/test-suite/bugs/closed/bug_2951.v
diff --git a/test-suite/bugs/closed/2955.v b/test-suite/bugs/closed/bug_2955.v
index 11fd7bada7..8b024f0730 100644
--- a/test-suite/bugs/closed/2955.v
+++ b/test-suite/bugs/closed/bug_2955.v
@@ -25,7 +25,7 @@ End A.
 
 
 Module B.
-  
+
   Module A := A.
   Import A.
 
diff --git a/test-suite/bugs/closed/2966.v b/test-suite/bugs/closed/bug_2966.v
index debada8539..92d5b9cdc9 100644
--- a/test-suite/bugs/closed/2966.v
+++ b/test-suite/bugs/closed/bug_2966.v
@@ -6,7 +6,7 @@ Set Asymmetric Patterns.
 
 Module MemSig.
   Definition t: Type := list Type.
-  
+
   Definition Nth (sig: t) (n: nat) :=
     nth n sig unit.
 End MemSig.
@@ -23,7 +23,7 @@ End Mem.
 Module Ref.
   Inductive t (sig: MemSig.t) (T: Type): Type :=
   | Input: t sig T.
-  
+
   Definition Read (sig: MemSig.t) (T: Type) (ref: t sig T) (s: Mem.t sig)
     : option T :=
     match ref with
@@ -34,11 +34,11 @@ End Ref.
 Module Monad.
   Definition t (sig: MemSig.t) (A: Type) :=
     Mem.t sig -> option A * Mem.t sig.
-  
+
   Definition Return (sig: MemSig.t) (A: Type) (x: A): t sig A :=
     fun s =>
       (Some x, s).
-  
+
   Definition Bind (sig: MemSig.t) (A B: Type) (x: t sig A) (f: A -> t sig B)
     : t sig B :=
     fun s =>
@@ -49,7 +49,7 @@ Module Monad.
 
   Definition Select (T: Type) (f g: unit -> T): T :=
     f tt.
-  
+
   (** Read in a reference. *)
   Definition Read (sig: MemSig.t) (T: Type) (ref: Ref.t sig T)
     : t sig T :=
diff --git a/test-suite/bugs/closed/2969.v b/test-suite/bugs/closed/bug_2969.v
index 7b1a261789..7b1a261789 100644
--- a/test-suite/bugs/closed/2969.v
+++ b/test-suite/bugs/closed/bug_2969.v
diff --git a/test-suite/bugs/closed/2981.v b/test-suite/bugs/closed/bug_2981.v
index 1facd9b7e9..44e53ca46c 100644
--- a/test-suite/bugs/closed/2981.v
+++ b/test-suite/bugs/closed/bug_2981.v
@@ -12,4 +12,3 @@ Check let TTT := Type in (fun (a b : @sigT TTT (fun A : TTT => A))
              (@projT1 TTT (fun A : TTT => A) a ->
               @projT1 TTT (fun A : TTT => A) b)
              (fun x : @projT1 TTT (fun A : TTT => A) a => f x) f.
-
diff --git a/test-suite/bugs/closed/2983.v b/test-suite/bugs/closed/bug_2983.v
index ad76350949..ad76350949 100644
--- a/test-suite/bugs/closed/2983.v
+++ b/test-suite/bugs/closed/bug_2983.v
diff --git a/test-suite/bugs/closed/2990.v b/test-suite/bugs/closed/bug_2990.v
index 5f832626bc..5f832626bc 100644
--- a/test-suite/bugs/closed/2990.v
+++ b/test-suite/bugs/closed/bug_2990.v
diff --git a/test-suite/bugs/closed/2994.v b/test-suite/bugs/closed/bug_2994.v
index 457b1893de..457b1893de 100644
--- a/test-suite/bugs/closed/2994.v
+++ b/test-suite/bugs/closed/bug_2994.v
diff --git a/test-suite/bugs/closed/2995.v b/test-suite/bugs/closed/bug_2995.v
index b6c5b6df44..b6c5b6df44 100644
--- a/test-suite/bugs/closed/2995.v
+++ b/test-suite/bugs/closed/bug_2995.v
diff --git a/test-suite/bugs/closed/2996.v b/test-suite/bugs/closed/bug_2996.v
index d5409289c5..d5409289c5 100644
--- a/test-suite/bugs/closed/2996.v
+++ b/test-suite/bugs/closed/bug_2996.v
diff --git a/test-suite/bugs/closed/3000.v b/test-suite/bugs/closed/bug_3000.v
index 27de34ed17..27de34ed17 100644
--- a/test-suite/bugs/closed/3000.v
+++ b/test-suite/bugs/closed/bug_3000.v
diff --git a/test-suite/bugs/closed/3001.v b/test-suite/bugs/closed/bug_3001.v
index 6e56555499..6e56555499 100644
--- a/test-suite/bugs/closed/3001.v
+++ b/test-suite/bugs/closed/bug_3001.v
diff --git a/test-suite/bugs/closed/3003.v b/test-suite/bugs/closed/bug_3003.v
index 2f8bcdae7a..2f8bcdae7a 100644
--- a/test-suite/bugs/closed/3003.v
+++ b/test-suite/bugs/closed/bug_3003.v
diff --git a/test-suite/bugs/closed/3004.v b/test-suite/bugs/closed/bug_3004.v
index 896b1958b0..896b1958b0 100644
--- a/test-suite/bugs/closed/3004.v
+++ b/test-suite/bugs/closed/bug_3004.v
diff --git a/test-suite/bugs/closed/3008.v b/test-suite/bugs/closed/bug_3008.v
index 1979eda820..1979eda820 100644
--- a/test-suite/bugs/closed/3008.v
+++ b/test-suite/bugs/closed/bug_3008.v
diff --git a/test-suite/bugs/closed/3010b.v b/test-suite/bugs/closed/bug_3010b.v
index 65fea42489..65fea42489 100644
--- a/test-suite/bugs/closed/3010b.v
+++ b/test-suite/bugs/closed/bug_3010b.v
diff --git a/test-suite/bugs/closed/3016.v b/test-suite/bugs/closed/bug_3016.v
index bd4f1dd805..bd4f1dd805 100644
--- a/test-suite/bugs/closed/3016.v
+++ b/test-suite/bugs/closed/bug_3016.v
diff --git a/test-suite/bugs/closed/3017.v b/test-suite/bugs/closed/bug_3017.v
index 63a06bd3d6..63a06bd3d6 100644
--- a/test-suite/bugs/closed/3017.v
+++ b/test-suite/bugs/closed/bug_3017.v
diff --git a/test-suite/bugs/closed/3022.v b/test-suite/bugs/closed/bug_3022.v
index dcfe733974..dcfe733974 100644
--- a/test-suite/bugs/closed/3022.v
+++ b/test-suite/bugs/closed/bug_3022.v
diff --git a/test-suite/bugs/closed/3023.v b/test-suite/bugs/closed/bug_3023.v
index 70a1491e15..70a1491e15 100644
--- a/test-suite/bugs/closed/3023.v
+++ b/test-suite/bugs/closed/bug_3023.v
diff --git a/test-suite/bugs/closed/3036.v b/test-suite/bugs/closed/bug_3036.v
index 3b57310d6e..d60987a9e6 100644
--- a/test-suite/bugs/closed/3036.v
+++ b/test-suite/bugs/closed/bug_3036.v
@@ -165,5 +165,5 @@ Section Stack.
     | None => [False]
     end) * emp.
   Proof.
-    intros. 
+    intros.
     try apply himp_ex_conc_trivial.
diff --git a/test-suite/bugs/closed/3037.v b/test-suite/bugs/closed/bug_3037.v
index baa7eff549..baa7eff549 100644
--- a/test-suite/bugs/closed/3037.v
+++ b/test-suite/bugs/closed/bug_3037.v
diff --git a/test-suite/bugs/closed/3043.v b/test-suite/bugs/closed/bug_3043.v
index 654663b4fc..654663b4fc 100644
--- a/test-suite/bugs/closed/3043.v
+++ b/test-suite/bugs/closed/bug_3043.v
diff --git a/test-suite/bugs/closed/3045.v b/test-suite/bugs/closed/bug_3045.v
index 5f80013df2..b3c8bfecbc 100644
--- a/test-suite/bugs/closed/3045.v
+++ b/test-suite/bugs/closed/bug_3045.v
@@ -28,7 +28,7 @@ Fixpoint ReifiedMorphismSimplifyWithProof objC C s d (m : @ReifiedMorphism objC
 refine match m with
          | ReifiedComposedMorphism _ _ s0 d0 d0' m1 m2 => _
        end; clear m.
-(* This fails with an error rather than an anomaly, but morally 
+(* This fails with an error rather than an anomaly, but morally
    it should work, if destruct were able to do the good generalization
    in advance, before doing the "intros []". *)
 Fail destruct (@ReifiedMorphismSimplifyWithProof T s1 d0 d0' m1) as [ [] ? ].
diff --git a/test-suite/bugs/closed/3050.v b/test-suite/bugs/closed/bug_3050.v
index 4b18722431..4b18722431 100644
--- a/test-suite/bugs/closed/3050.v
+++ b/test-suite/bugs/closed/bug_3050.v
diff --git a/test-suite/bugs/closed/3054.v b/test-suite/bugs/closed/bug_3054.v
index 936e58e197..936e58e197 100644
--- a/test-suite/bugs/closed/3054.v
+++ b/test-suite/bugs/closed/bug_3054.v
diff --git a/test-suite/bugs/closed/3062.v b/test-suite/bugs/closed/bug_3062.v
index a7b5fab03e..a7b5fab03e 100644
--- a/test-suite/bugs/closed/3062.v
+++ b/test-suite/bugs/closed/bug_3062.v
diff --git a/test-suite/bugs/closed/3068.v b/test-suite/bugs/closed/bug_3068.v
index 9811733dc6..04072ae305 100644
--- a/test-suite/bugs/closed/3068.v
+++ b/test-suite/bugs/closed/bug_3068.v
@@ -5,7 +5,7 @@ Section Counted_list.
 
   Inductive counted_list : nat -> Type :=
     | counted_nil : counted_list 0
-    | counted_cons : forall(n : nat), 
+    | counted_cons : forall(n : nat),
         A -> counted_list n -> counted_list (S n).
 
 
@@ -23,7 +23,7 @@ Section Counted_list.
     end.
 
 
-  Lemma counted_list_equal_nth_char : 
+  Lemma counted_list_equal_nth_char :
     forall(n : nat)(l1 l2 : counted_list n)(def : A),
       (forall(i : nat), counted_def_nth l1 i def = counted_def_nth l2 i def) ->
         l1 = l2.
@@ -41,7 +41,7 @@ Section Finite_nat_set.
 
   Definition fnat_subset : Type := counted_list bool set_size.
 
-  Definition fnat_member(fs : fnat_subset)(n : nat) : Prop := 
+  Definition fnat_member(fs : fnat_subset)(n : nat) : Prop :=
     is_true (counted_def_nth fs n false).
 
 
diff --git a/test-suite/bugs/closed/3070.v b/test-suite/bugs/closed/bug_3070.v
index 7a8feca587..7a8feca587 100644
--- a/test-suite/bugs/closed/3070.v
+++ b/test-suite/bugs/closed/bug_3070.v
diff --git a/test-suite/bugs/closed/3071.v b/test-suite/bugs/closed/bug_3071.v
index 53c2ef7b71..53c2ef7b71 100644
--- a/test-suite/bugs/closed/3071.v
+++ b/test-suite/bugs/closed/bug_3071.v
diff --git a/test-suite/bugs/closed/3080.v b/test-suite/bugs/closed/bug_3080.v
index 36ab7ff599..36ab7ff599 100644
--- a/test-suite/bugs/closed/3080.v
+++ b/test-suite/bugs/closed/bug_3080.v
diff --git a/test-suite/bugs/closed/3088.v b/test-suite/bugs/closed/bug_3088.v
index 3c362510e3..3c362510e3 100644
--- a/test-suite/bugs/closed/3088.v
+++ b/test-suite/bugs/closed/bug_3088.v
diff --git a/test-suite/bugs/closed/3093.v b/test-suite/bugs/closed/bug_3093.v
index f6b4a03f3b..f6b4a03f3b 100644
--- a/test-suite/bugs/closed/3093.v
+++ b/test-suite/bugs/closed/bug_3093.v
diff --git a/test-suite/bugs/closed/3100.v b/test-suite/bugs/closed/bug_3100.v
index 6f35a74dc1..6f35a74dc1 100644
--- a/test-suite/bugs/closed/3100.v
+++ b/test-suite/bugs/closed/bug_3100.v
diff --git a/test-suite/bugs/closed/3125.v b/test-suite/bugs/closed/bug_3125.v
index 797146174d..797146174d 100644
--- a/test-suite/bugs/closed/3125.v
+++ b/test-suite/bugs/closed/bug_3125.v
diff --git a/test-suite/bugs/closed/3142.v b/test-suite/bugs/closed/bug_3142.v
index 988074e2f1..988074e2f1 100644
--- a/test-suite/bugs/closed/3142.v
+++ b/test-suite/bugs/closed/bug_3142.v
diff --git a/test-suite/bugs/closed/3164.v b/test-suite/bugs/closed/bug_3164.v
index 3c9af8d0f3..3c9af8d0f3 100644
--- a/test-suite/bugs/closed/3164.v
+++ b/test-suite/bugs/closed/bug_3164.v
diff --git a/test-suite/bugs/closed/3188.v b/test-suite/bugs/closed/bug_3188.v
index 0117602670..0117602670 100644
--- a/test-suite/bugs/closed/3188.v
+++ b/test-suite/bugs/closed/bug_3188.v
diff --git a/test-suite/bugs/closed/3199.v b/test-suite/bugs/closed/bug_3199.v
index 08bf62493d..08bf62493d 100644
--- a/test-suite/bugs/closed/3199.v
+++ b/test-suite/bugs/closed/bug_3199.v
diff --git a/test-suite/bugs/closed/3205.v b/test-suite/bugs/closed/bug_3205.v
index 5c44f07036..5c44f07036 100644
--- a/test-suite/bugs/closed/3205.v
+++ b/test-suite/bugs/closed/bug_3205.v
diff --git a/test-suite/bugs/closed/3209.v b/test-suite/bugs/closed/bug_3209.v
index 855058b011..b4075086d0 100644
--- a/test-suite/bugs/closed/3209.v
+++ b/test-suite/bugs/closed/bug_3209.v
@@ -72,4 +72,3 @@ Moreover, ?B' and ?P''' have to satisfy
 and this leads to define ?P' which was the initial existential
 variable to define.
 *)
-
diff --git a/test-suite/bugs/closed/3210.v b/test-suite/bugs/closed/bug_3210.v
index bb673f38c2..bb673f38c2 100644
--- a/test-suite/bugs/closed/3210.v
+++ b/test-suite/bugs/closed/bug_3210.v
diff --git a/test-suite/bugs/closed/3212.v b/test-suite/bugs/closed/bug_3212.v
index 53d8dfe326..53d8dfe326 100644
--- a/test-suite/bugs/closed/3212.v
+++ b/test-suite/bugs/closed/bug_3212.v
diff --git a/test-suite/bugs/closed/3217.v b/test-suite/bugs/closed/bug_3217.v
index ec846bf95b..ec846bf95b 100644
--- a/test-suite/bugs/closed/3217.v
+++ b/test-suite/bugs/closed/bug_3217.v
diff --git a/test-suite/bugs/closed/3228.v b/test-suite/bugs/closed/bug_3228.v
index 5d1a0ff88b..5d1a0ff88b 100644
--- a/test-suite/bugs/closed/3228.v
+++ b/test-suite/bugs/closed/bug_3228.v
diff --git a/test-suite/bugs/closed/3230.v b/test-suite/bugs/closed/bug_3230.v
index 265310b1a3..265310b1a3 100644
--- a/test-suite/bugs/closed/3230.v
+++ b/test-suite/bugs/closed/bug_3230.v
diff --git a/test-suite/bugs/closed/3242.v b/test-suite/bugs/closed/bug_3242.v
index 805baee153..145375c1ad 100644
--- a/test-suite/bugs/closed/3242.v
+++ b/test-suite/bugs/closed/bug_3242.v
@@ -1,2 +1 @@
 Inductive Foo (x := Type) := C : Foo -> Foo.
-
diff --git a/test-suite/bugs/closed/3249.v b/test-suite/bugs/closed/bug_3249.v
index 71d457b002..71d457b002 100644
--- a/test-suite/bugs/closed/3249.v
+++ b/test-suite/bugs/closed/bug_3249.v
diff --git a/test-suite/bugs/closed/3251.v b/test-suite/bugs/closed/bug_3251.v
index d4ce050c57..d4ce050c57 100644
--- a/test-suite/bugs/closed/3251.v
+++ b/test-suite/bugs/closed/bug_3251.v
diff --git a/test-suite/bugs/closed/3257.v b/test-suite/bugs/closed/bug_3257.v
index d8aa6a0479..d8aa6a0479 100644
--- a/test-suite/bugs/closed/3257.v
+++ b/test-suite/bugs/closed/bug_3257.v
diff --git a/test-suite/bugs/closed/3258.v b/test-suite/bugs/closed/bug_3258.v
index b263c6baf4..b263c6baf4 100644
--- a/test-suite/bugs/closed/3258.v
+++ b/test-suite/bugs/closed/bug_3258.v
diff --git a/test-suite/bugs/closed/3259.v b/test-suite/bugs/closed/bug_3259.v
index aa91fc3de7..aa91fc3de7 100644
--- a/test-suite/bugs/closed/3259.v
+++ b/test-suite/bugs/closed/bug_3259.v
diff --git a/test-suite/bugs/closed/3260.v b/test-suite/bugs/closed/bug_3260.v
index 9f0231d91b..9f0231d91b 100644
--- a/test-suite/bugs/closed/3260.v
+++ b/test-suite/bugs/closed/bug_3260.v
diff --git a/test-suite/bugs/closed/3262.v b/test-suite/bugs/closed/bug_3262.v
index 70bfde2990..70bfde2990 100644
--- a/test-suite/bugs/closed/3262.v
+++ b/test-suite/bugs/closed/bug_3262.v
diff --git a/test-suite/bugs/closed/3264.v b/test-suite/bugs/closed/bug_3264.v
index 4eb218906f..4eb218906f 100644
--- a/test-suite/bugs/closed/3264.v
+++ b/test-suite/bugs/closed/bug_3264.v
diff --git a/test-suite/bugs/closed/3265.v b/test-suite/bugs/closed/bug_3265.v
index 269c7b741e..269c7b741e 100644
--- a/test-suite/bugs/closed/3265.v
+++ b/test-suite/bugs/closed/bug_3265.v
diff --git a/test-suite/bugs/closed/3266.v b/test-suite/bugs/closed/bug_3266.v
index fd4cbff85c..fd4cbff85c 100644
--- a/test-suite/bugs/closed/3266.v
+++ b/test-suite/bugs/closed/bug_3266.v
diff --git a/test-suite/bugs/closed/3267.v b/test-suite/bugs/closed/bug_3267.v
index 8175d66ac7..8175d66ac7 100644
--- a/test-suite/bugs/closed/3267.v
+++ b/test-suite/bugs/closed/bug_3267.v
diff --git a/test-suite/bugs/closed/3281.v b/test-suite/bugs/closed/bug_3281.v
index d340f0ca48..d340f0ca48 100644
--- a/test-suite/bugs/closed/3281.v
+++ b/test-suite/bugs/closed/bug_3281.v
diff --git a/test-suite/bugs/closed/3282.v b/test-suite/bugs/closed/bug_3282.v
index ce7cab1cba..ce7cab1cba 100644
--- a/test-suite/bugs/closed/3282.v
+++ b/test-suite/bugs/closed/bug_3282.v
diff --git a/test-suite/bugs/closed/3284.v b/test-suite/bugs/closed/bug_3284.v
index 34cd09c6f4..34cd09c6f4 100644
--- a/test-suite/bugs/closed/3284.v
+++ b/test-suite/bugs/closed/bug_3284.v
diff --git a/test-suite/bugs/closed/3285.v b/test-suite/bugs/closed/bug_3285.v
index 68e6b7386f..68e6b7386f 100644
--- a/test-suite/bugs/closed/3285.v
+++ b/test-suite/bugs/closed/bug_3285.v
diff --git a/test-suite/bugs/closed/3286.v b/test-suite/bugs/closed/bug_3286.v
index 701480fc83..701480fc83 100644
--- a/test-suite/bugs/closed/3286.v
+++ b/test-suite/bugs/closed/bug_3286.v
diff --git a/test-suite/bugs/closed/3287.v b/test-suite/bugs/closed/bug_3287.v
index 4b3e7ff054..4b3e7ff054 100644
--- a/test-suite/bugs/closed/3287.v
+++ b/test-suite/bugs/closed/bug_3287.v
diff --git a/test-suite/bugs/closed/3289.v b/test-suite/bugs/closed/bug_3289.v
index 4542b015d0..4542b015d0 100644
--- a/test-suite/bugs/closed/3289.v
+++ b/test-suite/bugs/closed/bug_3289.v
diff --git a/test-suite/bugs/closed/3291.v b/test-suite/bugs/closed/bug_3291.v
index 4ea748c0fb..4ea748c0fb 100644
--- a/test-suite/bugs/closed/3291.v
+++ b/test-suite/bugs/closed/bug_3291.v
diff --git a/test-suite/bugs/closed/3294.v b/test-suite/bugs/closed/bug_3294.v
index ed1a0c29ae..ed1a0c29ae 100644
--- a/test-suite/bugs/closed/3294.v
+++ b/test-suite/bugs/closed/bug_3294.v
diff --git a/test-suite/bugs/closed/3297.v b/test-suite/bugs/closed/bug_3297.v
index 1cacb97ff3..1cacb97ff3 100644
--- a/test-suite/bugs/closed/3297.v
+++ b/test-suite/bugs/closed/bug_3297.v
diff --git a/test-suite/bugs/closed/3298.v b/test-suite/bugs/closed/bug_3298.v
index f07ee1e6cf..f07ee1e6cf 100644
--- a/test-suite/bugs/closed/3298.v
+++ b/test-suite/bugs/closed/bug_3298.v
diff --git a/test-suite/bugs/closed/3300.v b/test-suite/bugs/closed/bug_3300.v
index a28144b9ca..a28144b9ca 100644
--- a/test-suite/bugs/closed/3300.v
+++ b/test-suite/bugs/closed/bug_3300.v
diff --git a/test-suite/bugs/closed/3305.v b/test-suite/bugs/closed/bug_3305.v
index f3f2195228..f3f2195228 100644
--- a/test-suite/bugs/closed/3305.v
+++ b/test-suite/bugs/closed/bug_3305.v
diff --git a/test-suite/bugs/closed/3306.v b/test-suite/bugs/closed/bug_3306.v
index 599e8391ac..ae78a8e714 100644
--- a/test-suite/bugs/closed/3306.v
+++ b/test-suite/bugs/closed/bug_3306.v
@@ -9,4 +9,4 @@ Scheme Foo_elim := Induction for Foo Sort Prop.
 Goal forall (fn : Foo nat), { x: nat | foo x = fn }.
 intro fn.
 Fail induction fn as [n] using Foo_elim. (* should fail in a non-Prop context *)
-Admitted. 
+Admitted.
diff --git a/test-suite/bugs/closed/3310.v b/test-suite/bugs/closed/bug_3310.v
index d6c31c6b41..d6c31c6b41 100644
--- a/test-suite/bugs/closed/3310.v
+++ b/test-suite/bugs/closed/bug_3310.v
diff --git a/test-suite/bugs/closed/3314.v b/test-suite/bugs/closed/bug_3314.v
index a5782298c3..a5782298c3 100644
--- a/test-suite/bugs/closed/3314.v
+++ b/test-suite/bugs/closed/bug_3314.v
diff --git a/test-suite/bugs/closed/3315.v b/test-suite/bugs/closed/bug_3315.v
index b69097f921..b69097f921 100644
--- a/test-suite/bugs/closed/3315.v
+++ b/test-suite/bugs/closed/bug_3315.v
diff --git a/test-suite/bugs/closed/3317.v b/test-suite/bugs/closed/bug_3317.v
index 8d152894ef..7419916645 100644
--- a/test-suite/bugs/closed/3317.v
+++ b/test-suite/bugs/closed/bug_3317.v
@@ -1,4 +1,4 @@
-Set Implicit Arguments. 
+Set Implicit Arguments.
 Module A.
   Set Universe Polymorphism.
   Set Primitive Projections.
diff --git a/test-suite/bugs/closed/3319.v b/test-suite/bugs/closed/bug_3319.v
index fbf5d86dcb..0b0aff29cb 100644
--- a/test-suite/bugs/closed/3319.v
+++ b/test-suite/bugs/closed/bug_3319.v
@@ -20,7 +20,7 @@ Section precategory.
   Lemma issig_morphism xa yb
   : { f : morphism X (projT1 xa) (projT1 yb)
     & is_structure_homomorphism _ _ _ f (projT2 xa) (projT2 yb) }
-    = morphism' xa yb. 
+    = morphism' xa yb.
   Proof.
     admit.
   Defined.
diff --git a/test-suite/bugs/closed/3320.v b/test-suite/bugs/closed/bug_3320.v
index a5c243d8e3..a5c243d8e3 100644
--- a/test-suite/bugs/closed/3320.v
+++ b/test-suite/bugs/closed/bug_3320.v
diff --git a/test-suite/bugs/closed/3321.v b/test-suite/bugs/closed/bug_3321.v
index b6f10e533e..b6f10e533e 100644
--- a/test-suite/bugs/closed/3321.v
+++ b/test-suite/bugs/closed/bug_3321.v
diff --git a/test-suite/bugs/closed/3322.v b/test-suite/bugs/closed/bug_3322.v
index ab3025a6aa..ab3025a6aa 100644
--- a/test-suite/bugs/closed/3322.v
+++ b/test-suite/bugs/closed/bug_3322.v
diff --git a/test-suite/bugs/closed/3323.v b/test-suite/bugs/closed/bug_3323.v
index 4622634eaa..4622634eaa 100644
--- a/test-suite/bugs/closed/3323.v
+++ b/test-suite/bugs/closed/bug_3323.v
diff --git a/test-suite/bugs/closed/3324.v b/test-suite/bugs/closed/bug_3324.v
index 45dbb57aa2..45dbb57aa2 100644
--- a/test-suite/bugs/closed/3324.v
+++ b/test-suite/bugs/closed/bug_3324.v
diff --git a/test-suite/bugs/closed/3325.v b/test-suite/bugs/closed/bug_3325.v
index 36c065ebe8..36c065ebe8 100644
--- a/test-suite/bugs/closed/3325.v
+++ b/test-suite/bugs/closed/bug_3325.v
diff --git a/test-suite/bugs/closed/3326.v b/test-suite/bugs/closed/bug_3326.v
index 4d7e9f77cb..f0d8cbf704 100644
--- a/test-suite/bugs/closed/3326.v
+++ b/test-suite/bugs/closed/bug_3326.v
@@ -1,5 +1,5 @@
 Class ORDER A := Order {
-  LEQ : A -> A -> bool; 
+  LEQ : A -> A -> bool;
   leqRefl: forall x, true = LEQ x x
 }.
 
diff --git a/test-suite/bugs/closed/3329.v b/test-suite/bugs/closed/bug_3329.v
index ecb09e8436..ecb09e8436 100644
--- a/test-suite/bugs/closed/3329.v
+++ b/test-suite/bugs/closed/bug_3329.v
diff --git a/test-suite/bugs/closed/3330.v b/test-suite/bugs/closed/bug_3330.v
index 672fb3f131..ae55ba59f6 100644
--- a/test-suite/bugs/closed/3330.v
+++ b/test-suite/bugs/closed/bug_3330.v
@@ -4,7 +4,7 @@ Require Import TestSuite.admit.
 Set Universe Polymorphism.
 Definition setleq (A : Type@{i}) (B : Type@{j}) := A : Type@{j}.
 
-Inductive foo : Type@{l} := bar : foo . 
+Inductive foo : Type@{l} := bar : foo .
 Section MakeEq.
   Variables (a : foo@{i}) (b : foo@{j}).
 
@@ -18,7 +18,7 @@ Section foo.
 
   Variables x : foo@{i}.
   Variables y : foo@{j}.
-  
+
   Let AleqB := let foo := make_eq x y in (Type * Type)%type.
 
   Definition baz := same x y.
@@ -1072,12 +1072,12 @@ Section Adjunction.
   Variable F : Functor C D.
   Variable G : Functor D C.
 
- Let Adjunction_Type := 
+ Let Adjunction_Type :=
     Eval simpl in (hom_functor D) o (F^op, 1) <~=~> (hom_functor C) o (1, G).
 
   Record AdjunctionHom :=
     {
-      mate_of : 
+      mate_of :
         @NaturalIsomorphism H
                          (Prod.prod (Category.Dual.opposite C) D)
                          (@set_cat H)
diff --git a/test-suite/bugs/closed/3331.v b/test-suite/bugs/closed/bug_3331.v
index b7dbb290e1..8594e45504 100644
--- a/test-suite/bugs/closed/3331.v
+++ b/test-suite/bugs/closed/bug_3331.v
@@ -27,5 +27,5 @@ Section groupoid_category.
     set (foo:=_ : Contr (idpath = idpath :> (@paths (@paths X d d) idpath idpath))). (* success *)
     clear H' foo.
     Set Typeclasses Debug.
-    pose (_ : Contr (idpath = idpath :> (@paths (@paths X d d) idpath idpath))). 
-Abort. 
+    pose (_ : Contr (idpath = idpath :> (@paths (@paths X d d) idpath idpath))).
+Abort.
diff --git a/test-suite/bugs/closed/3332.v b/test-suite/bugs/closed/bug_3332.v
index a3564bfcce..a3564bfcce 100644
--- a/test-suite/bugs/closed/3332.v
+++ b/test-suite/bugs/closed/bug_3332.v
diff --git a/test-suite/bugs/closed/3336.v b/test-suite/bugs/closed/bug_3336.v
index dc358c6004..dc358c6004 100644
--- a/test-suite/bugs/closed/3336.v
+++ b/test-suite/bugs/closed/bug_3336.v
diff --git a/test-suite/bugs/closed/3337.v b/test-suite/bugs/closed/bug_3337.v
index cd7891f112..cd7891f112 100644
--- a/test-suite/bugs/closed/3337.v
+++ b/test-suite/bugs/closed/bug_3337.v
diff --git a/test-suite/bugs/closed/3338.v b/test-suite/bugs/closed/bug_3338.v
index 076cd5e6ea..076cd5e6ea 100644
--- a/test-suite/bugs/closed/3338.v
+++ b/test-suite/bugs/closed/bug_3338.v
diff --git a/test-suite/bugs/closed/3344.v b/test-suite/bugs/closed/bug_3344.v
index 880851c565..880851c565 100644
--- a/test-suite/bugs/closed/3344.v
+++ b/test-suite/bugs/closed/bug_3344.v
diff --git a/test-suite/bugs/closed/3346.v b/test-suite/bugs/closed/bug_3346.v
index 09bd789345..09bd789345 100644
--- a/test-suite/bugs/closed/3346.v
+++ b/test-suite/bugs/closed/bug_3346.v
diff --git a/test-suite/bugs/closed/3347.v b/test-suite/bugs/closed/bug_3347.v
index dcf5394eaf..dcf5394eaf 100644
--- a/test-suite/bugs/closed/3347.v
+++ b/test-suite/bugs/closed/bug_3347.v
diff --git a/test-suite/bugs/closed/3348.v b/test-suite/bugs/closed/bug_3348.v
index 904de68964..904de68964 100644
--- a/test-suite/bugs/closed/3348.v
+++ b/test-suite/bugs/closed/bug_3348.v
diff --git a/test-suite/bugs/closed/3350.v b/test-suite/bugs/closed/bug_3350.v
index c1ff292b3e..c1ff292b3e 100644
--- a/test-suite/bugs/closed/3350.v
+++ b/test-suite/bugs/closed/bug_3350.v
diff --git a/test-suite/bugs/closed/3352.v b/test-suite/bugs/closed/bug_3352.v
index bf2f7a9d19..bf2f7a9d19 100644
--- a/test-suite/bugs/closed/3352.v
+++ b/test-suite/bugs/closed/bug_3352.v
diff --git a/test-suite/bugs/closed/3354.v b/test-suite/bugs/closed/bug_3354.v
index a635285f2c..a635285f2c 100644
--- a/test-suite/bugs/closed/3354.v
+++ b/test-suite/bugs/closed/bug_3354.v
diff --git a/test-suite/bugs/closed/3355.v b/test-suite/bugs/closed/bug_3355.v
index 46a5714781..46a5714781 100644
--- a/test-suite/bugs/closed/3355.v
+++ b/test-suite/bugs/closed/bug_3355.v
diff --git a/test-suite/bugs/closed/3368.v b/test-suite/bugs/closed/bug_3368.v
index 1eff1dba8a..e22b4118c8 100644
--- a/test-suite/bugs/closed/3368.v
+++ b/test-suite/bugs/closed/bug_3368.v
@@ -1,6 +1,6 @@
 (* File reduced by coq-bug-finder from 7411 lines to 2271 lines., then from 889 lines to 119 lines, then from 76 lines to 19 lines *)
 Set Universe Polymorphism.
-Set Implicit Arguments. 
+Set Implicit Arguments.
 Set Primitive Projections.
 Record PreCategory := { object :> Type; morphism : object -> object -> Type }.
 Record Functor (C D : PreCategory) :=
diff --git a/test-suite/bugs/closed/3372.v b/test-suite/bugs/closed/bug_3372.v
index 91e3df76dd..91e3df76dd 100644
--- a/test-suite/bugs/closed/3372.v
+++ b/test-suite/bugs/closed/bug_3372.v
diff --git a/test-suite/bugs/closed/3373.v b/test-suite/bugs/closed/bug_3373.v
index 051e695203..051e695203 100644
--- a/test-suite/bugs/closed/3373.v
+++ b/test-suite/bugs/closed/bug_3373.v
diff --git a/test-suite/bugs/closed/3374.v b/test-suite/bugs/closed/bug_3374.v
index d8e72f4f20..d8e72f4f20 100644
--- a/test-suite/bugs/closed/3374.v
+++ b/test-suite/bugs/closed/bug_3374.v
diff --git a/test-suite/bugs/closed/3375.v b/test-suite/bugs/closed/bug_3375.v
index 1e0c8e61f4..1e0c8e61f4 100644
--- a/test-suite/bugs/closed/3375.v
+++ b/test-suite/bugs/closed/bug_3375.v
diff --git a/test-suite/bugs/closed/3377.v b/test-suite/bugs/closed/bug_3377.v
index abfcf1d355..abfcf1d355 100644
--- a/test-suite/bugs/closed/3377.v
+++ b/test-suite/bugs/closed/bug_3377.v
diff --git a/test-suite/bugs/closed/3382.v b/test-suite/bugs/closed/bug_3382.v
index 3e374d9077..3e374d9077 100644
--- a/test-suite/bugs/closed/3382.v
+++ b/test-suite/bugs/closed/bug_3382.v
diff --git a/test-suite/bugs/closed/3383.v b/test-suite/bugs/closed/bug_3383.v
index 25257644a6..25257644a6 100644
--- a/test-suite/bugs/closed/3383.v
+++ b/test-suite/bugs/closed/bug_3383.v
diff --git a/test-suite/bugs/closed/3386.v b/test-suite/bugs/closed/bug_3386.v
index b8bb8bce09..b8bb8bce09 100644
--- a/test-suite/bugs/closed/3386.v
+++ b/test-suite/bugs/closed/bug_3386.v
diff --git a/test-suite/bugs/closed/3387.v b/test-suite/bugs/closed/bug_3387.v
index 1d9e783374..1d9e783374 100644
--- a/test-suite/bugs/closed/3387.v
+++ b/test-suite/bugs/closed/bug_3387.v
diff --git a/test-suite/bugs/closed/3388.v b/test-suite/bugs/closed/bug_3388.v
index 7826280498..7826280498 100644
--- a/test-suite/bugs/closed/3388.v
+++ b/test-suite/bugs/closed/bug_3388.v
diff --git a/test-suite/bugs/closed/3390.v b/test-suite/bugs/closed/bug_3390.v
index eb3c4f4b9c..eb3c4f4b9c 100644
--- a/test-suite/bugs/closed/3390.v
+++ b/test-suite/bugs/closed/bug_3390.v
diff --git a/test-suite/bugs/closed/3392.v b/test-suite/bugs/closed/bug_3392.v
index a03db77544..a03db77544 100644
--- a/test-suite/bugs/closed/3392.v
+++ b/test-suite/bugs/closed/bug_3392.v
diff --git a/test-suite/bugs/closed/3393.v b/test-suite/bugs/closed/bug_3393.v
index ae8e41e29e..ae8e41e29e 100644
--- a/test-suite/bugs/closed/3393.v
+++ b/test-suite/bugs/closed/bug_3393.v
diff --git a/test-suite/bugs/closed/3402.v b/test-suite/bugs/closed/bug_3402.v
index b4705780db..b4705780db 100644
--- a/test-suite/bugs/closed/3402.v
+++ b/test-suite/bugs/closed/bug_3402.v
diff --git a/test-suite/bugs/closed/3408.v b/test-suite/bugs/closed/bug_3408.v
index b12b8c1afb..62f5382bd1 100644
--- a/test-suite/bugs/closed/3408.v
+++ b/test-suite/bugs/closed/bug_3408.v
@@ -101,7 +101,7 @@ Proof.
                                             | acc_Abs f x => fun pf => pf tt
                                             | _ => I
                                           end (fun _ => rec e))
-            end); 
+            end);
     try solve [ inversion _H ].
 Defined.
 
diff --git a/test-suite/bugs/closed/3416.v b/test-suite/bugs/closed/bug_3416.v
index 5cfb8f1ff4..5cfb8f1ff4 100644
--- a/test-suite/bugs/closed/3416.v
+++ b/test-suite/bugs/closed/bug_3416.v
diff --git a/test-suite/bugs/closed/3417.v b/test-suite/bugs/closed/bug_3417.v
index 9d7c6f013d..9d7c6f013d 100644
--- a/test-suite/bugs/closed/3417.v
+++ b/test-suite/bugs/closed/bug_3417.v
diff --git a/test-suite/bugs/closed/3422.v b/test-suite/bugs/closed/bug_3422.v
index 460ae8f110..460ae8f110 100644
--- a/test-suite/bugs/closed/3422.v
+++ b/test-suite/bugs/closed/bug_3422.v
diff --git a/test-suite/bugs/closed/3427.v b/test-suite/bugs/closed/bug_3427.v
index 9a57ca7703..9a57ca7703 100644
--- a/test-suite/bugs/closed/3427.v
+++ b/test-suite/bugs/closed/bug_3427.v
diff --git a/test-suite/bugs/closed/3428.v b/test-suite/bugs/closed/bug_3428.v
index 16ace90af3..4192be6d2d 100644
--- a/test-suite/bugs/closed/3428.v
+++ b/test-suite/bugs/closed/bug_3428.v
@@ -1,6 +1,6 @@
 (* File reduced by coq-bug-finder from original input, then from 2809 lines to 39 lines *)
 Set Primitive Projections.
-Set Implicit Arguments. 
+Set Implicit Arguments.
 Module Export foo.
   Record prod (A B : Type) := pair { fst : A ; snd : B }.
 End foo.
diff --git a/test-suite/bugs/closed/3439.v b/test-suite/bugs/closed/bug_3439.v
index e8c2d8b8ca..e8c2d8b8ca 100644
--- a/test-suite/bugs/closed/3439.v
+++ b/test-suite/bugs/closed/bug_3439.v
diff --git a/test-suite/bugs/closed/3441.v b/test-suite/bugs/closed/bug_3441.v
index ddfb339443..d48c059acb 100644
--- a/test-suite/bugs/closed/3441.v
+++ b/test-suite/bugs/closed/bug_3441.v
@@ -10,7 +10,7 @@ Axiom k : nat.
 Goal True.
 Timeout 1 let H := fresh "H" in
      let x := constr:(let n := 17 in do_n n = do_n n) in
-     let y := (eval lazy in x) in 
+     let y := (eval lazy in x) in
      pose proof y as H. (* Finished transaction in 1.102 secs (1.084u,0.016s) (successful) *)
 Timeout 1 let H := fresh "H" in
      let x := constr:(let n := 17 in do_n n = do_n n) in
diff --git a/test-suite/bugs/closed/3446.v b/test-suite/bugs/closed/bug_3446.v
index 8a0c98c333..57e0efea8e 100644
--- a/test-suite/bugs/closed/3446.v
+++ b/test-suite/bugs/closed/bug_3446.v
@@ -47,5 +47,5 @@ Axiom path_sigma_uncurried : forall {A : Type} (P : A -> Type) (u v : sigT P) (p
 Instance isequiv_pr1_contr {A} {P : A -> Type} : IsEquiv (@pr1 A P) | 100.
 Admitted.
 
-Definition path_sigma_hprop {A : Type} {P : A -> Type} (u v : sigT P) : u.1 = v.1 -> u = v := 
+Definition path_sigma_hprop {A : Type} {P : A -> Type} (u v : sigT P) : u.1 = v.1 -> u = v :=
   path_sigma_uncurried P u v o pr1^-1.
diff --git a/test-suite/bugs/closed/3453.v b/test-suite/bugs/closed/bug_3453.v
index 4ee9b400a3..4ee9b400a3 100644
--- a/test-suite/bugs/closed/3453.v
+++ b/test-suite/bugs/closed/bug_3453.v
diff --git a/test-suite/bugs/closed/3454.v b/test-suite/bugs/closed/bug_3454.v
index ca4d23803e..e4cd60cb24 100644
--- a/test-suite/bugs/closed/3454.v
+++ b/test-suite/bugs/closed/bug_3454.v
@@ -10,7 +10,7 @@ Arguments prod : clear implicits.
 Check (@projT1 _ (fun x : nat => x = x)).
 Check (fun s : @sigT nat (fun x : nat => x = x) => s.(projT1)).
 
-Record rimpl {b : bool} {n : nat} := { foo : forall {x : nat}, x = n }. 
+Record rimpl {b : bool} {n : nat} := { foo : forall {x : nat}, x = n }.
 
 Check (fun r : @rimpl true 0 => r.(foo) (x:=0)).
 Check (fun r : @rimpl true 0 => @foo true 0 r 0).
@@ -51,7 +51,7 @@ Local Instance isequiv_tgt_compose' A B
 Local Instance isequiv_tgt_compose'' A B
 : @IsEquiv (A -> {xy : B * B & fst xy = snd xy})
            (A -> B)
-           (@compose A {xy : B * B & fst xy = snd xy} B (@compose {xy : B * B & fst xy = snd xy} _ B (@snd _ _) 
+           (@compose A {xy : B * B & fst xy = snd xy} B (@compose {xy : B * B & fst xy = snd xy} _ B (@snd _ _)
                                                                   (fun s => s.(projT1)))).
 (* Toplevel input, characters 15-241:
 Error:
diff --git a/test-suite/bugs/closed/3461.v b/test-suite/bugs/closed/bug_3461.v
index 1b625e6a15..1885568bd2 100644
--- a/test-suite/bugs/closed/3461.v
+++ b/test-suite/bugs/closed/bug_3461.v
@@ -1,5 +1,5 @@
 Lemma foo (b : bool) :
   exists x : nat, x = x.
 Proof.
-eexists. 
+eexists.
 Fail eexact (eq_refl b).
diff --git a/test-suite/bugs/closed/3467.v b/test-suite/bugs/closed/bug_3467.v
index 88ae030578..88ae030578 100644
--- a/test-suite/bugs/closed/3467.v
+++ b/test-suite/bugs/closed/bug_3467.v
diff --git a/test-suite/bugs/closed/3469.v b/test-suite/bugs/closed/bug_3469.v
index b09edc65b0..6aa3b56f8b 100644
--- a/test-suite/bugs/closed/3469.v
+++ b/test-suite/bugs/closed/bug_3469.v
@@ -22,8 +22,8 @@ Proof.
   clear.
   apply (proj2_sig (H x0)).
   Undo.
-  apply @proj2_sig. 
-  
+  apply @proj2_sig.
+
 
 (* Toplevel input, characters 21-31:
 Error: Found no subterm matching "proj1_sig ?206" in the current *)
diff --git a/test-suite/bugs/closed/3477.v b/test-suite/bugs/closed/bug_3477.v
index 3ed63604ea..3ed63604ea 100644
--- a/test-suite/bugs/closed/3477.v
+++ b/test-suite/bugs/closed/bug_3477.v
diff --git a/test-suite/bugs/closed/3480.v b/test-suite/bugs/closed/bug_3480.v
index 35e0c51a93..35e0c51a93 100644
--- a/test-suite/bugs/closed/3480.v
+++ b/test-suite/bugs/closed/bug_3480.v
diff --git a/test-suite/bugs/closed/3481.v b/test-suite/bugs/closed/bug_3481.v
index 38f03b166b..41e1a8e959 100644
--- a/test-suite/bugs/closed/3481.v
+++ b/test-suite/bugs/closed/bug_3481.v
@@ -65,6 +65,3 @@ while it is expected to have type "prod_rect = prod_rect'"
 
 Record sigma (A : Type) (B : A -> Type) : Type :=
   dpair { pi1 : A ; pi2 : B pi1 }.
-
-
-
diff --git a/test-suite/bugs/closed/3482.v b/test-suite/bugs/closed/bug_3482.v
index 87fd2723c9..87fd2723c9 100644
--- a/test-suite/bugs/closed/3482.v
+++ b/test-suite/bugs/closed/bug_3482.v
diff --git a/test-suite/bugs/closed/3483.v b/test-suite/bugs/closed/bug_3483.v
index 2cc6618620..970363f00a 100644
--- a/test-suite/bugs/closed/3483.v
+++ b/test-suite/bugs/closed/bug_3483.v
@@ -2,4 +2,3 @@
    pattern-bmatching *)
 
 Fail Definition nonsense ( x : False ) := match x with y + 2 => 0 end.
-
diff --git a/test-suite/bugs/closed/3484.v b/test-suite/bugs/closed/bug_3484.v
index a0e157303f..aa25bde9cd 100644
--- a/test-suite/bugs/closed/3484.v
+++ b/test-suite/bugs/closed/bug_3484.v
@@ -15,10 +15,10 @@ Proof.
   apply (@ap _ _ pr1 _ y).
   Undo.
   Unset Printing Notations.
-  apply (ap pr1). 
+  apply (ap pr1).
   Undo.
   refine (ap pr1 _).
-admit. 
+admit.
 Defined.
 
 (* Toplevel input, characters 22-28:
diff --git a/test-suite/bugs/closed/3485.v b/test-suite/bugs/closed/bug_3485.v
index ede6b3cb27..ede6b3cb27 100644
--- a/test-suite/bugs/closed/3485.v
+++ b/test-suite/bugs/closed/bug_3485.v
diff --git a/test-suite/bugs/closed/3487.v b/test-suite/bugs/closed/bug_3487.v
index 1321a8598c..1321a8598c 100644
--- a/test-suite/bugs/closed/3487.v
+++ b/test-suite/bugs/closed/bug_3487.v
diff --git a/test-suite/bugs/closed/3490.v b/test-suite/bugs/closed/bug_3490.v
index e7a5caa1de..957736d0b9 100644
--- a/test-suite/bugs/closed/3490.v
+++ b/test-suite/bugs/closed/bug_3490.v
@@ -1,10 +1,10 @@
-Inductive T : Type :=                                                                                        
-| Var : nat -> T                                                                                                 
-| Arr : T -> T -> T.                                                                                             
+Inductive T : Type :=
+| Var : nat -> T
+| Arr : T -> T -> T.
 
-Inductive Tele : list T -> Type :=                                                                               
-| Tnil  : @Tele nil                                                                                              
-| Tcons : forall ls, forall (t : @Tele ls) (l : T), @Tele (l :: ls). 
+Inductive Tele : list T -> Type :=
+| Tnil  : @Tele nil
+| Tcons : forall ls, forall (t : @Tele ls) (l : T), @Tele (l :: ls).
 
 Fail Fixpoint TeleD (ls : list T) (t : Tele ls) {struct t}
    : { x : Type & x -> nat -> Type } :=
diff --git a/test-suite/bugs/closed/3491.v b/test-suite/bugs/closed/bug_3491.v
index fd394ddbc3..fd394ddbc3 100644
--- a/test-suite/bugs/closed/3491.v
+++ b/test-suite/bugs/closed/bug_3491.v
diff --git a/test-suite/bugs/closed/3495.v b/test-suite/bugs/closed/bug_3495.v
index 102a2aba0d..102a2aba0d 100644
--- a/test-suite/bugs/closed/3495.v
+++ b/test-suite/bugs/closed/bug_3495.v
diff --git a/test-suite/bugs/closed/3505.v b/test-suite/bugs/closed/bug_3505.v
index 2695bc796e..2695bc796e 100644
--- a/test-suite/bugs/closed/3505.v
+++ b/test-suite/bugs/closed/bug_3505.v
diff --git a/test-suite/bugs/closed/3509.v b/test-suite/bugs/closed/bug_3509.v
index 8226622670..8226622670 100644
--- a/test-suite/bugs/closed/3509.v
+++ b/test-suite/bugs/closed/bug_3509.v
diff --git a/test-suite/bugs/closed/3510.v b/test-suite/bugs/closed/bug_3510.v
index 4cbae33590..4cbae33590 100644
--- a/test-suite/bugs/closed/3510.v
+++ b/test-suite/bugs/closed/bug_3510.v
diff --git a/test-suite/bugs/closed/3513.v b/test-suite/bugs/closed/bug_3513.v
index a1d0b9107b..f17fb2d9d0 100644
--- a/test-suite/bugs/closed/3513.v
+++ b/test-suite/bugs/closed/bug_3513.v
@@ -71,4 +71,3 @@ Goal forall (T : Type) (O0 : T -> OPred) (O1 : T -> PointedOPred)
   Focus 2.
   (* As in 8.5, allow a shelved subgoal to remain *)
   apply reflexivity.
-  
diff --git a/test-suite/bugs/closed/3520.v b/test-suite/bugs/closed/bug_3520.v
index ea122e521f..01bf6667f2 100644
--- a/test-suite/bugs/closed/3520.v
+++ b/test-suite/bugs/closed/bug_3520.v
@@ -1,12 +1,9 @@
 Set Primitive Projections.
 
-Record foo (A : Type) := 
+Record foo (A : Type) :=
   { bar : Type ; baz := Set; bad : baz = bar }.
 
 Set Nonrecursive Elimination Schemes.
 
 Record notprim : Prop :=
   { irrel : True; relevant : nat }.
-
-
-
diff --git a/test-suite/bugs/closed/3531.v b/test-suite/bugs/closed/bug_3531.v
index 3502b4f549..552092bc39 100644
--- a/test-suite/bugs/closed/3531.v
+++ b/test-suite/bugs/closed/bug_3531.v
@@ -38,10 +38,10 @@ Admitted.
 Goal forall b, (exists e1 e2 e3,
       (exists (m : mem) (v : nat) (F : pred), b)
         <==> (exists x : e1, stars (e2 x) * [[e3 x]])).
- intros. 
+ intros.
  Set Printing Universes.
  Show Universes.
- do 3 eapply ex_intro.  
+ do 3 eapply ex_intro.
  eapply piff_trans; [ apply flatten_exists | apply piff_refl ]; intros.
  eapply piff_trans; [ apply flatten_exists | apply piff_refl ]; intros.
  eapply piff_trans; [ apply flatten_exists | apply piff_refl ]; intros.
diff --git a/test-suite/bugs/closed/3537.v b/test-suite/bugs/closed/bug_3537.v
index 158642f01d..158642f01d 100644
--- a/test-suite/bugs/closed/3537.v
+++ b/test-suite/bugs/closed/bug_3537.v
diff --git a/test-suite/bugs/closed/3539.v b/test-suite/bugs/closed/bug_3539.v
index b0c4b23702..b0c4b23702 100644
--- a/test-suite/bugs/closed/3539.v
+++ b/test-suite/bugs/closed/bug_3539.v
diff --git a/test-suite/bugs/closed/3542.v b/test-suite/bugs/closed/bug_3542.v
index b6837a0c33..b6837a0c33 100644
--- a/test-suite/bugs/closed/3542.v
+++ b/test-suite/bugs/closed/bug_3542.v
diff --git a/test-suite/bugs/closed/3546.v b/test-suite/bugs/closed/bug_3546.v
index 55d718bd03..55d718bd03 100644
--- a/test-suite/bugs/closed/3546.v
+++ b/test-suite/bugs/closed/bug_3546.v
diff --git a/test-suite/bugs/closed/3554.v b/test-suite/bugs/closed/bug_3554.v
index 13a79cc840..13a79cc840 100644
--- a/test-suite/bugs/closed/3554.v
+++ b/test-suite/bugs/closed/bug_3554.v
diff --git a/test-suite/bugs/closed/3559.v b/test-suite/bugs/closed/bug_3559.v
index 5210b27032..e26945c3bb 100644
--- a/test-suite/bugs/closed/3559.v
+++ b/test-suite/bugs/closed/bug_3559.v
@@ -45,20 +45,20 @@ Lemma paths_change (A : Type@{i}) (x y : A) : paths@{j} x y = paths@{i} x y.
 Proof. (* require Univalence *)
   apply cheat.
 Defined.
-  
+
 Lemma IsTrunc_lift (n : trunc_index) :
   forall (A : Type@{i}), IsTrunc_internal@{i} n A -> IsTrunc_internal@{j} n A.
 Proof.
-  induction n; simpl; intros. 
+  induction n; simpl; intros.
   destruct X. exists center0. intros. apply (paths_lift _ _ _  (contr0 y)).
 
-  rewrite paths_change. 
-  apply IHn, X. 
+  rewrite paths_change.
+  apply IHn, X.
 Defined.
 
 Notation IsHProp := (IsTrunc minus_one).
 (* Record hProp := hp { hproptype :> Type ; isp : IsTrunc minus_one hproptype}. *)
-(* Make the truncation proof polymorphic, i.e., available at any level greater or equal 
+(* Make the truncation proof polymorphic, i.e., available at any level greater or equal
    to the carrier type level j *)
 Record hProp := hp { hproptype :> Type@{j} ; isp : IsTrunc minus_one hproptype}.
 Axiom path_iff_hprop_uncurried : forall `{IsHProp A, IsHProp B}, (A <-> B) -> A
@@ -81,7 +81,7 @@ Proof.
 (*    Top.78 |= Top.74 < Top.78 *)
 (*                *) *)
 
- Show Universes. 
+ Show Universes.
  exact (isp _).
  split; intros. destruct X. apply bisimulation_refl.
  apply bisimulation_eq, X.
diff --git a/test-suite/bugs/closed/3560.v b/test-suite/bugs/closed/bug_3560.v
index a740675f30..a740675f30 100644
--- a/test-suite/bugs/closed/3560.v
+++ b/test-suite/bugs/closed/bug_3560.v
diff --git a/test-suite/bugs/closed/3561.v b/test-suite/bugs/closed/bug_3561.v
index ef4422eeac..06ffef6829 100644
--- a/test-suite/bugs/closed/3561.v
+++ b/test-suite/bugs/closed/bug_3561.v
@@ -18,7 +18,7 @@ Admitted.
 Goal forall (H0 H2 : Type) x p,
        @transport (prod H0 H2)
                   (fun GO : prod H0 H2 => x (fst GO)) = p.
-  intros. 
+  intros.
   match goal with
     | [ |- context[x (?f _)] ] => set(foo':=f)
   end.
diff --git a/test-suite/bugs/closed/3562.v b/test-suite/bugs/closed/bug_3562.v
index 1a1410a3b1..1a1410a3b1 100644
--- a/test-suite/bugs/closed/3562.v
+++ b/test-suite/bugs/closed/bug_3562.v
diff --git a/test-suite/bugs/closed/3563.v b/test-suite/bugs/closed/bug_3563.v
index 961563ed4a..961563ed4a 100644
--- a/test-suite/bugs/closed/3563.v
+++ b/test-suite/bugs/closed/bug_3563.v
diff --git a/test-suite/bugs/closed/3566.v b/test-suite/bugs/closed/bug_3566.v
index e2d7976981..84743e48f6 100644
--- a/test-suite/bugs/closed/3566.v
+++ b/test-suite/bugs/closed/bug_3566.v
@@ -19,5 +19,5 @@ Definition lift {T} : T -> Lift T := fun x => x.
 
 Goal forall x y : Type, x = y.
   intros.
-  pose proof ((fun H0 : idmap _ => (@path_universe _ _ (@lift x) (H0 x) @ 
+  pose proof ((fun H0 : idmap _ => (@path_universe _ _ (@lift x) (H0 x) @
                                                    (@path_universe _ _ (@lift x) (H0 x))^)))%path as H''.
diff --git a/test-suite/bugs/closed/3567.v b/test-suite/bugs/closed/bug_3567.v
index 00c9c05469..00c9c05469 100644
--- a/test-suite/bugs/closed/3567.v
+++ b/test-suite/bugs/closed/bug_3567.v
diff --git a/test-suite/bugs/closed/3584.v b/test-suite/bugs/closed/bug_3584.v
index 37fe46376e..37fe46376e 100644
--- a/test-suite/bugs/closed/3584.v
+++ b/test-suite/bugs/closed/bug_3584.v
diff --git a/test-suite/bugs/closed/3590.v b/test-suite/bugs/closed/bug_3590.v
index 9fded85a8d..2f15aa9ea1 100644
--- a/test-suite/bugs/closed/3590.v
+++ b/test-suite/bugs/closed/bug_3590.v
@@ -6,7 +6,7 @@ Goal forall x y : prod Set Set, forall H : fst x = fst y, fst x = fst y.
   change (@fst _ _ ?z) with (@fst Set idS z) at 2.
   apply H.
 Qed.
-  
+
 (* Toplevel input, characters 20-58:
 Error: Failed to get enough information from the left-hand side to type the
 right-hand side. *)
diff --git a/test-suite/bugs/closed/3593.v b/test-suite/bugs/closed/bug_3593.v
index 378db68570..0d7e93ee02 100644
--- a/test-suite/bugs/closed/3593.v
+++ b/test-suite/bugs/closed/bug_3593.v
@@ -4,7 +4,7 @@ Set Implicit Arguments.
 Record prod A B := pair { fst : A ; snd : B }.
 Goal forall x : prod Set Set, let f := @fst _ in f _ x = @fst _ _ x.
 simpl; intros.
-  constr_eq (@fst Set Set x) (fst (A := Set) (B := Set) x).   
+  constr_eq (@fst Set Set x) (fst (A := Set) (B := Set) x).
   Fail progress change (@fst Set Set x) with (fst (A := Set) (B := Set) x).
   reflexivity.
 Qed.
diff --git a/test-suite/bugs/closed/3594.v b/test-suite/bugs/closed/bug_3594.v
index 1f86f4bd70..221fc99bfa 100644
--- a/test-suite/bugs/closed/3594.v
+++ b/test-suite/bugs/closed/bug_3594.v
@@ -27,7 +27,7 @@ Goal forall C D : PreCategory,
 (*                     (opposite D).(morphism) d s) =  *)
 (*                    @Build_PreCategory D (fun s d => morphism D d s)). *)
 (* opposite D). *)
-  exact (path_forall (fun F => (F^op)^op) _ (@oppositeF_involutive _ _)). 
+  exact (path_forall (fun F => (F^op)^op) _ (@oppositeF_involutive _ _)).
 Qed.
  (* Toplevel input, characters 22-101:
 Error:
diff --git a/test-suite/bugs/closed/3596.v b/test-suite/bugs/closed/bug_3596.v
index 1ee9a5d8c1..69db360838 100644
--- a/test-suite/bugs/closed/3596.v
+++ b/test-suite/bugs/closed/bug_3596.v
@@ -11,7 +11,7 @@ Definition Bar (b : bar) : b = b.
 Defined.
 Goal forall f b, Bar b = Bar b -> Foo f = Foo f.
   intros f b.
-  destruct f, b. 
+  destruct f, b.
   simpl.
   Fail progress unfold Bar. (* success *)
   Fail progress unfold Foo. (* failed to progress *)
diff --git a/test-suite/bugs/closed/3612.v b/test-suite/bugs/closed/bug_3612.v
index 33e5d532ad..33e5d532ad 100644
--- a/test-suite/bugs/closed/3612.v
+++ b/test-suite/bugs/closed/bug_3612.v
diff --git a/test-suite/bugs/closed/3616.v b/test-suite/bugs/closed/bug_3616.v
index 688700260c..688700260c 100644
--- a/test-suite/bugs/closed/3616.v
+++ b/test-suite/bugs/closed/bug_3616.v
diff --git a/test-suite/bugs/closed/3618.v b/test-suite/bugs/closed/bug_3618.v
index 674b4cc2f4..4b5171c082 100644
--- a/test-suite/bugs/closed/3618.v
+++ b/test-suite/bugs/closed/bug_3618.v
@@ -96,7 +96,7 @@ Global Instance hprop_inO {fs : Funext} {subU : ReflectiveSubuniverse} (T : Type
 Admitted.
 
 (* To avoid looping class resolution *)
-Hint Mode IsEquiv - - + : typeclass_instances. 
+Hint Mode IsEquiv - - + : typeclass_instances.
 
 Fail Definition equiv_O_rectnd {fs : Funext} {subU : ReflectiveSubuniverse}
            (P Q : Type) {Q_inO : inO_internal Q}
diff --git a/test-suite/bugs/closed/3623.v b/test-suite/bugs/closed/bug_3623.v
index 202b900164..202b900164 100644
--- a/test-suite/bugs/closed/3623.v
+++ b/test-suite/bugs/closed/bug_3623.v
diff --git a/test-suite/bugs/closed/3624.v b/test-suite/bugs/closed/bug_3624.v
index 024243cfd3..024243cfd3 100644
--- a/test-suite/bugs/closed/3624.v
+++ b/test-suite/bugs/closed/bug_3624.v
diff --git a/test-suite/bugs/closed/3625.v b/test-suite/bugs/closed/bug_3625.v
index d4b2cc5ccc..d4b2cc5ccc 100644
--- a/test-suite/bugs/closed/3625.v
+++ b/test-suite/bugs/closed/bug_3625.v
diff --git a/test-suite/bugs/closed/3628.v b/test-suite/bugs/closed/bug_3628.v
index 4001cf7c2b..4001cf7c2b 100644
--- a/test-suite/bugs/closed/3628.v
+++ b/test-suite/bugs/closed/bug_3628.v
diff --git a/test-suite/bugs/closed/3633.v b/test-suite/bugs/closed/bug_3633.v
index 52bb307271..7a82a2685e 100644
--- a/test-suite/bugs/closed/3633.v
+++ b/test-suite/bugs/closed/bug_3633.v
@@ -4,7 +4,7 @@ Definition foo {A} `{Contr A} : A.
 Proof.
   apply center.
   Undo.
-  (* Ensure the constraints are solved independently, otherwise a frozen ?A 
+  (* Ensure the constraints are solved independently, otherwise a frozen ?A
   makes a search for Contr ?A fail when finishing to apply (fun x => x) *)
-  apply (fun x => x), center. 
+  apply (fun x => x), center.
 Qed.
diff --git a/test-suite/bugs/closed/3637.v b/test-suite/bugs/closed/bug_3637.v
index 868f45c89a..868f45c89a 100644
--- a/test-suite/bugs/closed/3637.v
+++ b/test-suite/bugs/closed/bug_3637.v
diff --git a/test-suite/bugs/closed/3638.v b/test-suite/bugs/closed/bug_3638.v
index 5441fbedce..4f1fcfecd3 100644
--- a/test-suite/bugs/closed/3638.v
+++ b/test-suite/bugs/closed/bug_3638.v
@@ -15,11 +15,11 @@ Goal forall (A B : Type) (x : O A * O B) (x0 : B),
                           (O_rectnd (fun a : A => O_unit (a, x0)) (fst x)) =
                  g x0 }.
   eexists.
-  Show Existentials. Set Printing Existential Instances. 
+  Show Existentials. Set Printing Existential Instances.
   match goal with
     | [ |- context[?e] ] => is_evar e; let e' := fresh "e'" in set (e' := e)
   end.
-  
+
 
 (* Toplevel input, characters 15-114:
 Anomaly: Bad recursive type. Please report. *)
diff --git a/test-suite/bugs/closed/3640.v b/test-suite/bugs/closed/bug_3640.v
index 5dff98ba23..5dff98ba23 100644
--- a/test-suite/bugs/closed/3640.v
+++ b/test-suite/bugs/closed/bug_3640.v
diff --git a/test-suite/bugs/closed/3641.v b/test-suite/bugs/closed/bug_3641.v
index 730ab3f431..730ab3f431 100644
--- a/test-suite/bugs/closed/3641.v
+++ b/test-suite/bugs/closed/bug_3641.v
diff --git a/test-suite/bugs/closed/3647.v b/test-suite/bugs/closed/bug_3647.v
index e91c004c77..e91c004c77 100644
--- a/test-suite/bugs/closed/3647.v
+++ b/test-suite/bugs/closed/bug_3647.v
diff --git a/test-suite/bugs/closed/3648.v b/test-suite/bugs/closed/bug_3648.v
index 58aa161403..58aa161403 100644
--- a/test-suite/bugs/closed/3648.v
+++ b/test-suite/bugs/closed/bug_3648.v
diff --git a/test-suite/bugs/closed/3649.v b/test-suite/bugs/closed/bug_3649.v
index a664a1ef1d..a664a1ef1d 100644
--- a/test-suite/bugs/closed/3649.v
+++ b/test-suite/bugs/closed/bug_3649.v
diff --git a/test-suite/bugs/closed/3652.v b/test-suite/bugs/closed/bug_3652.v
index 86e061376d..915cfcac27 100644
--- a/test-suite/bugs/closed/3652.v
+++ b/test-suite/bugs/closed/bug_3652.v
@@ -39,8 +39,8 @@ Notation "f |# v <- x" := (#f ; v <- x)
 Notation "f |# < v" := (#f ; < v)
                           (at level 199, left associativity) : Erasable_scope.
 
-Ltac name_evars id := 
-  repeat match goal with |- context[?V] => 
+Ltac name_evars id :=
+  repeat match goal with |- context[?V] =>
                          is_evar V; let H := fresh id in set (H:=V) in * end.
 
 Lemma Twoto0 : 2^0 = 1.
@@ -69,7 +69,7 @@ Inductive zot'(eis2 : ##bool)(value : ##Z) : Set :=
 Definition de2{eis2 value}(z : zot' eis2 value) : zot' #false value.
 Proof.
   case z.
-  intros is2 iseq next_is2 ok next_value n1s veq next. 
+  intros is2 iseq next_is2 ok next_value n1s veq next.
   subst.
   destruct is2.
   2:trivial.
@@ -98,4 +98,3 @@ Proof.
     Unshelve.
     all:case_eq next.
 Abort.
-
diff --git a/test-suite/bugs/closed/3653.v b/test-suite/bugs/closed/bug_3653.v
index b97689676b..b97689676b 100644
--- a/test-suite/bugs/closed/3653.v
+++ b/test-suite/bugs/closed/bug_3653.v
diff --git a/test-suite/bugs/closed/3654.v b/test-suite/bugs/closed/bug_3654.v
index 15277235b1..15277235b1 100644
--- a/test-suite/bugs/closed/3654.v
+++ b/test-suite/bugs/closed/bug_3654.v
diff --git a/test-suite/bugs/closed/3656.v b/test-suite/bugs/closed/bug_3656.v
index cbd773d079..fb92e11630 100644
--- a/test-suite/bugs/closed/3656.v
+++ b/test-suite/bugs/closed/bug_3656.v
@@ -8,10 +8,10 @@ Module A.
     | ?y => y
   end.
 Goal forall s : hSet, True.
-intros. 
+intros.
 let x := head_hnf_under_binders setT in pose x.
 
-set (foo := eq_refl (@setT )). generalize foo. simpl. cbn. 
+set (foo := eq_refl (@setT )). generalize foo. simpl. cbn.
 Abort.
 End A.
 
@@ -29,7 +29,7 @@ Goal forall s : @hSet nat, True.
 intros.
 let x := head_hnf_under_binders setT in pose x.
 
-set (foo := eq_refl (@setT nat)). generalize foo. simpl. cbn. 
+set (foo := eq_refl (@setT nat)). generalize foo. simpl. cbn.
 Abort.
 End A'.
 
@@ -50,4 +50,4 @@ Goal setT = setT.
 Abort.
 
 Goal forall h, setT h = setT h.
-Proof. intro. progress unfold setT. 
+Proof. intro. progress unfold setT.
diff --git a/test-suite/bugs/closed/3657.v b/test-suite/bugs/closed/bug_3657.v
index 778fdab190..778fdab190 100644
--- a/test-suite/bugs/closed/3657.v
+++ b/test-suite/bugs/closed/bug_3657.v
diff --git a/test-suite/bugs/closed/3658.v b/test-suite/bugs/closed/bug_3658.v
index 74f4e82dbb..74f4e82dbb 100644
--- a/test-suite/bugs/closed/3658.v
+++ b/test-suite/bugs/closed/bug_3658.v
diff --git a/test-suite/bugs/closed/3660.v b/test-suite/bugs/closed/bug_3660.v
index 39eb89c402..be693886e6 100644
--- a/test-suite/bugs/closed/3660.v
+++ b/test-suite/bugs/closed/bug_3660.v
@@ -24,5 +24,5 @@ Goal forall (C D : hSet), IsEquiv (fun x : C = D => (equiv_path C D (ap setT x))
   intros.
   change (IsEquiv (equiv_path C D o @ap _ _ setT C D)).
   apply @isequiv_compose; [ | admit ].
-  Set Typeclasses Debug. 
+  Set Typeclasses Debug.
   typeclasses eauto.
diff --git a/test-suite/bugs/closed/3661.v b/test-suite/bugs/closed/bug_3661.v
index 1f13ffcf34..1f13ffcf34 100644
--- a/test-suite/bugs/closed/3661.v
+++ b/test-suite/bugs/closed/bug_3661.v
diff --git a/test-suite/bugs/closed/3662.v b/test-suite/bugs/closed/bug_3662.v
index b8754bce98..3f6d879bc0 100644
--- a/test-suite/bugs/closed/3662.v
+++ b/test-suite/bugs/closed/bug_3662.v
@@ -28,7 +28,7 @@ compute.
 Defined.
 
 Goal fst (pair nat nat) = nat.
-  unfold fst. 
+  unfold fst.
   match goal with
     | [ |- fst ?x = nat ] => fail 1 "compute failed"
     | [ |- nat = nat ] => idtac
@@ -44,4 +44,3 @@ Goal forall x : prod nat nat, fst x = 0.
     | [ |- fst ?x = 0 ] => idtac
   end.
 Abort.
-
diff --git a/test-suite/bugs/closed/3664.v b/test-suite/bugs/closed/bug_3664.v
index cd1427a143..cd1427a143 100644
--- a/test-suite/bugs/closed/3664.v
+++ b/test-suite/bugs/closed/bug_3664.v
diff --git a/test-suite/bugs/closed/3665.v b/test-suite/bugs/closed/bug_3665.v
index f6a13596ca..f6a13596ca 100644
--- a/test-suite/bugs/closed/3665.v
+++ b/test-suite/bugs/closed/bug_3665.v
diff --git a/test-suite/bugs/closed/3666.v b/test-suite/bugs/closed/bug_3666.v
index c7bc2f22a8..c7bc2f22a8 100644
--- a/test-suite/bugs/closed/3666.v
+++ b/test-suite/bugs/closed/bug_3666.v
diff --git a/test-suite/bugs/closed/3667.v b/test-suite/bugs/closed/bug_3667.v
index d2fc4d9bf9..14a641f018 100644
--- a/test-suite/bugs/closed/3667.v
+++ b/test-suite/bugs/closed/bug_3667.v
@@ -19,7 +19,5 @@ Definition set_cat : PreCategory.
 Defined.
 Goal forall (A : PreCategory) (F : Functor A set_cat)
             (a : A) (x : F a) (nt :NaturalTransformation F F), x = x.
-  intros. 
+  intros.
   pose (fun c d m => ap10 (commutes nt c d m)).
-
-
diff --git a/test-suite/bugs/closed/3668.v b/test-suite/bugs/closed/bug_3668.v
index 1add3dba1e..3ce37d4f85 100644
--- a/test-suite/bugs/closed/3668.v
+++ b/test-suite/bugs/closed/bug_3668.v
@@ -44,7 +44,7 @@ Module Prim.
   Lemma Book_6_9_not_id b : Book_6_9 Bool b = negb b.
   Proof.
     unfold Book_6_9.
-    destruct (@LEM (Contr { f : Bool <~> Bool & ~(forall x, f x = x) }) _) as [[f H']|H']. 
+    destruct (@LEM (Contr { f : Bool <~> Bool & ~(forall x, f x = x) }) _) as [[f H']|H'].
     match goal with
       | [ |- equiv_fun Bool Bool f.1 b  = negb b ] => idtac
       | [ |- equiv_fun Bool Bool center.1 b = negb b ] => fail 1 "bad"
diff --git a/test-suite/bugs/closed/3670.v b/test-suite/bugs/closed/bug_3670.v
index c0f03261a9..a4d5978b48 100644
--- a/test-suite/bugs/closed/3670.v
+++ b/test-suite/bugs/closed/bug_3670.v
@@ -14,7 +14,7 @@ End BAZ.
 
 Module BAR_FROM_BAZ (baz : BAZ) <: BAR.
 
-  Definition f : Type -> Type. 
+  Definition f : Type -> Type.
   Proof. exact baz.f. Defined.
 
   Definition h : forall T, f T.
diff --git a/test-suite/bugs/closed/3672.v b/test-suite/bugs/closed/bug_3672.v
index b355e7e9db..5573b818b3 100644
--- a/test-suite/bugs/closed/3672.v
+++ b/test-suite/bugs/closed/bug_3672.v
@@ -15,11 +15,11 @@ Definition t' := forall C A a X, ar C A a X X.
 => Error: The term "ar C A a X X" has type "atype A" which is not a (co-)inductive type.
 *)
 
-Record Ar2 C (A:AT) := 
+Record Ar2 C (A:AT) :=
 { ar2 : forall (X Y : C), A
 ; id2 : forall X, coerce _ (ar2 X X) }.
 
-Record Ar3 C (A:AT) := 
+Record Ar3 C (A:AT) :=
 { ar3 : forall (X Y : C), A
 ; id3 : forall X, ar3 X X }.
 (* The command has indeed failed with message:
diff --git a/test-suite/bugs/closed/3675.v b/test-suite/bugs/closed/bug_3675.v
index 93227ab852..93227ab852 100644
--- a/test-suite/bugs/closed/3675.v
+++ b/test-suite/bugs/closed/bug_3675.v
diff --git a/test-suite/bugs/closed/3681.v b/test-suite/bugs/closed/bug_3681.v
index 194113c6ed..194113c6ed 100644
--- a/test-suite/bugs/closed/3681.v
+++ b/test-suite/bugs/closed/bug_3681.v
diff --git a/test-suite/bugs/closed/3682.v b/test-suite/bugs/closed/bug_3682.v
index 9d37d1a2d0..9d37d1a2d0 100644
--- a/test-suite/bugs/closed/3682.v
+++ b/test-suite/bugs/closed/bug_3682.v
diff --git a/test-suite/bugs/closed/3684.v b/test-suite/bugs/closed/bug_3684.v
index 130d57779d..130d57779d 100644
--- a/test-suite/bugs/closed/3684.v
+++ b/test-suite/bugs/closed/bug_3684.v
diff --git a/test-suite/bugs/closed/3685.v b/test-suite/bugs/closed/bug_3685.v
index 7a0c3e6f1d..7a0c3e6f1d 100644
--- a/test-suite/bugs/closed/3685.v
+++ b/test-suite/bugs/closed/bug_3685.v
diff --git a/test-suite/bugs/closed/3686.v b/test-suite/bugs/closed/bug_3686.v
index df5f667480..df5f667480 100644
--- a/test-suite/bugs/closed/3686.v
+++ b/test-suite/bugs/closed/bug_3686.v
diff --git a/test-suite/bugs/closed/3690.v b/test-suite/bugs/closed/bug_3690.v
index fa30132ab5..fa30132ab5 100644
--- a/test-suite/bugs/closed/3690.v
+++ b/test-suite/bugs/closed/bug_3690.v
diff --git a/test-suite/bugs/closed/3692.v b/test-suite/bugs/closed/bug_3692.v
index 72973a8d81..72973a8d81 100644
--- a/test-suite/bugs/closed/3692.v
+++ b/test-suite/bugs/closed/bug_3692.v
diff --git a/test-suite/bugs/closed/3698.v b/test-suite/bugs/closed/bug_3698.v
index 3882eee97c..3882eee97c 100644
--- a/test-suite/bugs/closed/3698.v
+++ b/test-suite/bugs/closed/bug_3698.v
diff --git a/test-suite/bugs/closed/3699.v b/test-suite/bugs/closed/bug_3699.v
index dbb10f94f2..dbb10f94f2 100644
--- a/test-suite/bugs/closed/3699.v
+++ b/test-suite/bugs/closed/bug_3699.v
diff --git a/test-suite/bugs/closed/3700.v b/test-suite/bugs/closed/bug_3700.v
index bac443e337..bac443e337 100644
--- a/test-suite/bugs/closed/3700.v
+++ b/test-suite/bugs/closed/bug_3700.v
diff --git a/test-suite/bugs/closed/3703.v b/test-suite/bugs/closed/bug_3703.v
index feeb04d64e..feeb04d64e 100644
--- a/test-suite/bugs/closed/3703.v
+++ b/test-suite/bugs/closed/bug_3703.v
diff --git a/test-suite/bugs/closed/3709.v b/test-suite/bugs/closed/bug_3709.v
index 815f5b9507..815f5b9507 100644
--- a/test-suite/bugs/closed/3709.v
+++ b/test-suite/bugs/closed/bug_3709.v
diff --git a/test-suite/bugs/closed/3710.v b/test-suite/bugs/closed/bug_3710.v
index b9e2798d88..b9e2798d88 100644
--- a/test-suite/bugs/closed/3710.v
+++ b/test-suite/bugs/closed/bug_3710.v
diff --git a/test-suite/bugs/closed/3723.v b/test-suite/bugs/closed/bug_3723.v
index d0b77c451b..d0b77c451b 100644
--- a/test-suite/bugs/closed/3723.v
+++ b/test-suite/bugs/closed/bug_3723.v
diff --git a/test-suite/bugs/closed/3732.v b/test-suite/bugs/closed/bug_3732.v
index 13d62b8ff6..e6715ee44e 100644
--- a/test-suite/bugs/closed/3732.v
+++ b/test-suite/bugs/closed/bug_3732.v
@@ -91,7 +91,7 @@ Goal    forall (G : list Type) (A : Type) (p : propX pc state (@cons Type A G))
               (fun a : forall _ : A, PropX pc state => P (@SPush G A s a)).
   intros ? ? ? ? H ? H'.
   apply simplify_fwd_ExistsX in H.
-  firstorder. 
+  firstorder.
 Qed.
  (* Toplevel input, characters 15-19:
 Error: Illegal application:
diff --git a/test-suite/bugs/closed/3735.v b/test-suite/bugs/closed/bug_3735.v
index aced9615ee..00886cbc60 100644
--- a/test-suite/bugs/closed/3735.v
+++ b/test-suite/bugs/closed/bug_3735.v
@@ -1,4 +1,4 @@
 Require Import Coq.Program.Tactics.
 Class Foo := { bar : Type }.
 Fail Lemma foo : Foo -> bar. (* 'Command has indeed failed.' in both 8.4 and trunk *)
-Fail Program Lemma foo : Foo -> bar. 
+Fail Program Lemma foo : Foo -> bar.
diff --git a/test-suite/bugs/closed/3736.v b/test-suite/bugs/closed/bug_3736.v
index 637b77cc58..637b77cc58 100644
--- a/test-suite/bugs/closed/3736.v
+++ b/test-suite/bugs/closed/bug_3736.v
diff --git a/test-suite/bugs/closed/3743.v b/test-suite/bugs/closed/bug_3743.v
index ca78987bf3..ca78987bf3 100644
--- a/test-suite/bugs/closed/3743.v
+++ b/test-suite/bugs/closed/bug_3743.v
diff --git a/test-suite/bugs/closed/3746.v b/test-suite/bugs/closed/bug_3746.v
index a9463f94bb..a9463f94bb 100644
--- a/test-suite/bugs/closed/3746.v
+++ b/test-suite/bugs/closed/bug_3746.v
diff --git a/test-suite/bugs/closed/3753.v b/test-suite/bugs/closed/bug_3753.v
index f586438cdd..f586438cdd 100644
--- a/test-suite/bugs/closed/3753.v
+++ b/test-suite/bugs/closed/bug_3753.v
diff --git a/test-suite/bugs/closed/3755.v b/test-suite/bugs/closed/bug_3755.v
index 77427ace58..f0b542d31e 100644
--- a/test-suite/bugs/closed/3755.v
+++ b/test-suite/bugs/closed/bug_3755.v
@@ -1,10 +1,10 @@
-(* File reduced by coq-bug-finder from original input, then from 6729 lines to 
-411 lines, then from 148 lines to 115 lines, then from 99 lines to 70 lines, 
-then from 85 lines to 63 lines, then from 76 lines to 55 lines, then from 61 
+(* File reduced by coq-bug-finder from original input, then from 6729 lines to
+411 lines, then from 148 lines to 115 lines, then from 99 lines to 70 lines,
+then from 85 lines to 63 lines, then from 76 lines to 55 lines, then from 61
 lines to 17 lines *)
-(* coqc version trunk (January 2015) compiled on Jan 17 2015 21:58:5 with OCaml 
+(* coqc version trunk (January 2015) compiled on Jan 17 2015 21:58:5 with OCaml
 4.01.0
-   coqtop version cagnode15:/afs/csail.mit.edu/u/j/jgross/coq-trunk,trunk 
+   coqtop version cagnode15:/afs/csail.mit.edu/u/j/jgross/coq-trunk,trunk
 (9e6b28c04ad98369a012faf3bd4d630cf123a473) *)
 Set Printing Universes.
 Section param.
diff --git a/test-suite/bugs/closed/3777.v b/test-suite/bugs/closed/bug_3777.v
index e203528fcc..e203528fcc 100644
--- a/test-suite/bugs/closed/3777.v
+++ b/test-suite/bugs/closed/bug_3777.v
diff --git a/test-suite/bugs/closed/3779.v b/test-suite/bugs/closed/bug_3779.v
index 2b44e225e8..2b44e225e8 100644
--- a/test-suite/bugs/closed/3779.v
+++ b/test-suite/bugs/closed/bug_3779.v
diff --git a/test-suite/bugs/closed/3782.v b/test-suite/bugs/closed/bug_3782.v
index 16b0b8b603..16b0b8b603 100644
--- a/test-suite/bugs/closed/3782.v
+++ b/test-suite/bugs/closed/bug_3782.v
diff --git a/test-suite/bugs/closed/3783.v b/test-suite/bugs/closed/bug_3783.v
index f7e2b54353..f7e2b54353 100644
--- a/test-suite/bugs/closed/3783.v
+++ b/test-suite/bugs/closed/bug_3783.v
diff --git a/test-suite/bugs/closed/3786.v b/test-suite/bugs/closed/bug_3786.v
index 23d19e946f..23d19e946f 100644
--- a/test-suite/bugs/closed/3786.v
+++ b/test-suite/bugs/closed/bug_3786.v
diff --git a/test-suite/bugs/closed/3788.v b/test-suite/bugs/closed/bug_3788.v
index 2c5b9cb018..2c5b9cb018 100644
--- a/test-suite/bugs/closed/3788.v
+++ b/test-suite/bugs/closed/bug_3788.v
diff --git a/test-suite/bugs/closed/3792.v b/test-suite/bugs/closed/bug_3792.v
index 39057b9c52..39057b9c52 100644
--- a/test-suite/bugs/closed/3792.v
+++ b/test-suite/bugs/closed/bug_3792.v
diff --git a/test-suite/bugs/closed/3798.v b/test-suite/bugs/closed/bug_3798.v
index b9f0daa71c..b9f0daa71c 100644
--- a/test-suite/bugs/closed/3798.v
+++ b/test-suite/bugs/closed/bug_3798.v
diff --git a/test-suite/bugs/closed/3804.v b/test-suite/bugs/closed/bug_3804.v
index da9290cbad..da9290cbad 100644
--- a/test-suite/bugs/closed/3804.v
+++ b/test-suite/bugs/closed/bug_3804.v
diff --git a/test-suite/bugs/closed/3807.v b/test-suite/bugs/closed/bug_3807.v
index a6286f0377..a6286f0377 100644
--- a/test-suite/bugs/closed/3807.v
+++ b/test-suite/bugs/closed/bug_3807.v
diff --git a/test-suite/bugs/closed/3808.v b/test-suite/bugs/closed/bug_3808.v
index ac6a850193..ac6a850193 100644
--- a/test-suite/bugs/closed/3808.v
+++ b/test-suite/bugs/closed/bug_3808.v
diff --git a/test-suite/bugs/closed/3815.v b/test-suite/bugs/closed/bug_3815.v
index 5fb4839847..5fb4839847 100644
--- a/test-suite/bugs/closed/3815.v
+++ b/test-suite/bugs/closed/bug_3815.v
diff --git a/test-suite/bugs/closed/3819.v b/test-suite/bugs/closed/bug_3819.v
index 0b9c3183cc..0b9c3183cc 100644
--- a/test-suite/bugs/closed/3819.v
+++ b/test-suite/bugs/closed/bug_3819.v
diff --git a/test-suite/bugs/closed/3821.v b/test-suite/bugs/closed/bug_3821.v
index 30261ed266..f6056c51d3 100644
--- a/test-suite/bugs/closed/3821.v
+++ b/test-suite/bugs/closed/bug_3821.v
@@ -1,3 +1,2 @@
 Unset Strict Universe Declaration.
 Inductive quotient {A : Type@{i}} {B : Type@{j}} : Type@{max(i, j)} := .
-
diff --git a/test-suite/bugs/closed/3825.v b/test-suite/bugs/closed/bug_3825.v
index 666c64631f..b141965f0f 100644
--- a/test-suite/bugs/closed/3825.v
+++ b/test-suite/bugs/closed/bug_3825.v
@@ -21,4 +21,3 @@ Notation hProp := (0)-Type.
 
 Check hProp.
 Check hProp@{i}.
-
diff --git a/test-suite/bugs/closed/3828.v b/test-suite/bugs/closed/bug_3828.v
index ae11c6c96c..ae11c6c96c 100644
--- a/test-suite/bugs/closed/3828.v
+++ b/test-suite/bugs/closed/bug_3828.v
diff --git a/test-suite/bugs/closed/3848.v b/test-suite/bugs/closed/bug_3848.v
index c0ef02f1e8..c0ef02f1e8 100644
--- a/test-suite/bugs/closed/3848.v
+++ b/test-suite/bugs/closed/bug_3848.v
diff --git a/test-suite/bugs/closed/3849.v b/test-suite/bugs/closed/bug_3849.v
index a8dc3af9cf..a8dc3af9cf 100644
--- a/test-suite/bugs/closed/3849.v
+++ b/test-suite/bugs/closed/bug_3849.v
diff --git a/test-suite/bugs/closed/3854.v b/test-suite/bugs/closed/bug_3854.v
index 7e915f202b..7e915f202b 100644
--- a/test-suite/bugs/closed/3854.v
+++ b/test-suite/bugs/closed/bug_3854.v
diff --git a/test-suite/bugs/closed/3881.v b/test-suite/bugs/closed/bug_3881.v
index 7c60ddf347..d7e097e326 100644
--- a/test-suite/bugs/closed/3881.v
+++ b/test-suite/bugs/closed/bug_3881.v
@@ -28,8 +28,7 @@ Proof.
   pose (x _).
   pose (@isequiv_homotopic _ _ ((g o f) o f^-1) g _
                            (fun b => ap g (eisretr f b))).
-  Undo. 
+  Undo.
   apply (@isequiv_homotopic _ _ ((g o f) o f^-1) g _
                            (fun b => ap g (eisretr f b))).
 Qed.
-  
diff --git a/test-suite/bugs/closed/3886.v b/test-suite/bugs/closed/bug_3886.v
index b523b117e5..b523b117e5 100644
--- a/test-suite/bugs/closed/3886.v
+++ b/test-suite/bugs/closed/bug_3886.v
diff --git a/test-suite/bugs/closed/3892.v b/test-suite/bugs/closed/bug_3892.v
index 833722ba9a..833722ba9a 100644
--- a/test-suite/bugs/closed/3892.v
+++ b/test-suite/bugs/closed/bug_3892.v
diff --git a/test-suite/bugs/closed/3895.v b/test-suite/bugs/closed/bug_3895.v
index 8659ca2cbd..8659ca2cbd 100644
--- a/test-suite/bugs/closed/3895.v
+++ b/test-suite/bugs/closed/bug_3895.v
diff --git a/test-suite/bugs/closed/3896.v b/test-suite/bugs/closed/bug_3896.v
index b433922a21..b433922a21 100644
--- a/test-suite/bugs/closed/3896.v
+++ b/test-suite/bugs/closed/bug_3896.v
diff --git a/test-suite/bugs/closed/3899.v b/test-suite/bugs/closed/bug_3899.v
index 7754934c0b..7754934c0b 100644
--- a/test-suite/bugs/closed/3899.v
+++ b/test-suite/bugs/closed/bug_3899.v
diff --git a/test-suite/bugs/closed/3900.v b/test-suite/bugs/closed/bug_3900.v
index 6be2161c2f..6be2161c2f 100644
--- a/test-suite/bugs/closed/3900.v
+++ b/test-suite/bugs/closed/bug_3900.v
diff --git a/test-suite/bugs/closed/3911.v b/test-suite/bugs/closed/bug_3911.v
index b289eafbf4..de728213d4 100644
--- a/test-suite/bugs/closed/3911.v
+++ b/test-suite/bugs/closed/bug_3911.v
@@ -1,26 +1,26 @@
 (* Tested against coq ee596bc *)
- 
+
 Set Nonrecursive Elimination Schemes.
 Set Primitive Projections.
 Set Universe Polymorphism.
- 
+
 Record setoid := { base : Type }.
- 
+
 Definition catdata (Obj Arr : Type) : Type := nat.
   (* [nat] can be replaced by any other type, it seems,
      without changing the error *)
- 
+
 Record cat : Type :=
   {
     obj : setoid;
     arr : Type;
     dta : catdata (base obj) arr
   }.
- 
+
 Definition bcwa (C:cat) (B:setoid) :Type := nat.
   (* As above, nothing special about [nat] here. *)
- 
+
 Record temp {C}{B} (e:bcwa C B) :=
   { fld : base (obj C) }.
- 
+
 Print temp_rect.
diff --git a/test-suite/bugs/closed/3916.v b/test-suite/bugs/closed/bug_3916.v
index 55c3a35c3a..9d8da11017 100644
--- a/test-suite/bugs/closed/3916.v
+++ b/test-suite/bugs/closed/bug_3916.v
@@ -1,3 +1,2 @@
 Require Import List.
 Fail Hint Resolve -> in_map.
-
diff --git a/test-suite/bugs/closed/3920.v b/test-suite/bugs/closed/bug_3920.v
index a4adb23cc2..a4adb23cc2 100644
--- a/test-suite/bugs/closed/3920.v
+++ b/test-suite/bugs/closed/bug_3920.v
diff --git a/test-suite/bugs/closed/3922.v b/test-suite/bugs/closed/bug_3922.v
index d88e8c3325..d88e8c3325 100644
--- a/test-suite/bugs/closed/3922.v
+++ b/test-suite/bugs/closed/bug_3922.v
diff --git a/test-suite/bugs/closed/3923.v b/test-suite/bugs/closed/bug_3923.v
index 1d9488c6e1..1d9488c6e1 100644
--- a/test-suite/bugs/closed/3923.v
+++ b/test-suite/bugs/closed/bug_3923.v
diff --git a/test-suite/bugs/closed/3929.v b/test-suite/bugs/closed/bug_3929.v
index 955581ef26..e65a8252cc 100644
--- a/test-suite/bugs/closed/3929.v
+++ b/test-suite/bugs/closed/bug_3929.v
@@ -14,7 +14,7 @@ Fail pose (lt@{i j}).
 let Zv:=eval cbv [Z] in Z in
 let Tv:=eval cbv [T] in T in
 constr_eq Zv Tv.
-exact I. 
+exact I.
 Defined.
 
 Goal True.
diff --git a/test-suite/bugs/closed/3938.v b/test-suite/bugs/closed/bug_3938.v
index 859e9f0177..35db82bd4c 100644
--- a/test-suite/bugs/closed/3938.v
+++ b/test-suite/bugs/closed/bug_3938.v
@@ -2,7 +2,7 @@ Require Import TestSuite.admit.
 Require Import Coq.Arith.PeanoNat.
 Hint Extern 1 => admit : typeclass_instances.
 Require Import Setoid.
-Goal forall a b (f : nat -> Set) (R : nat -> nat -> Prop), 
+Goal forall a b (f : nat -> Set) (R : nat -> nat -> Prop),
        Equivalence R -> R a b -> f a = f b.
   intros a b f H.
-  intros. Fail rewrite H1. 
+  intros. Fail rewrite H1.
diff --git a/test-suite/bugs/closed/3943.v b/test-suite/bugs/closed/bug_3943.v
index ac9c50369b..ac9c50369b 100644
--- a/test-suite/bugs/closed/3943.v
+++ b/test-suite/bugs/closed/bug_3943.v
diff --git a/test-suite/bugs/closed/3944.v b/test-suite/bugs/closed/bug_3944.v
index 58e60f4f2e..58e60f4f2e 100644
--- a/test-suite/bugs/closed/3944.v
+++ b/test-suite/bugs/closed/bug_3944.v
diff --git a/test-suite/bugs/closed/3948.v b/test-suite/bugs/closed/bug_3948.v
index 56b1e3ffb4..56b1e3ffb4 100644
--- a/test-suite/bugs/closed/3948.v
+++ b/test-suite/bugs/closed/bug_3948.v
diff --git a/test-suite/bugs/closed/3953.v b/test-suite/bugs/closed/bug_3953.v
index 167cecea8e..167cecea8e 100644
--- a/test-suite/bugs/closed/3953.v
+++ b/test-suite/bugs/closed/bug_3953.v
diff --git a/test-suite/bugs/closed/3956.v b/test-suite/bugs/closed/bug_3956.v
index 4957cc740d..115284ec02 100644
--- a/test-suite/bugs/closed/3956.v
+++ b/test-suite/bugs/closed/bug_3956.v
@@ -26,7 +26,7 @@ Definition path_prod {A B : Type} (z z' : A * B)
 : (fst z = fst z') -> (snd z = snd z') -> (z = z').
 Proof.
   destruct z, z'; simpl; intros [] []; reflexivity.
-Defined.  
+Defined.
 
 Module Type TypeM.
   Parameter m : Type2.
diff --git a/test-suite/bugs/closed/3957.v b/test-suite/bugs/closed/bug_3957.v
index e20a6e97f0..e20a6e97f0 100644
--- a/test-suite/bugs/closed/3957.v
+++ b/test-suite/bugs/closed/bug_3957.v
diff --git a/test-suite/bugs/closed/3960.v b/test-suite/bugs/closed/bug_3960.v
index 3527312486..3527312486 100644
--- a/test-suite/bugs/closed/3960.v
+++ b/test-suite/bugs/closed/bug_3960.v
diff --git a/test-suite/bugs/closed/3974.v b/test-suite/bugs/closed/bug_3974.v
index 3d9e06b612..3d9e06b612 100644
--- a/test-suite/bugs/closed/3974.v
+++ b/test-suite/bugs/closed/bug_3974.v
diff --git a/test-suite/bugs/closed/3975.v b/test-suite/bugs/closed/bug_3975.v
index c7616b3ab6..c7616b3ab6 100644
--- a/test-suite/bugs/closed/3975.v
+++ b/test-suite/bugs/closed/bug_3975.v
diff --git a/test-suite/bugs/closed/3978.v b/test-suite/bugs/closed/bug_3978.v
index 26e021e719..5606bf1c7e 100644
--- a/test-suite/bugs/closed/3978.v
+++ b/test-suite/bugs/closed/bug_3978.v
@@ -1,7 +1,7 @@
-Require Import Structures.OrderedType.  
+Require Import Structures.OrderedType.
 Require Import Structures.OrderedTypeEx.
 
-Module Type M. Parameter X : Type.      
+Module Type M. Parameter X : Type.
 
 Declare Module Export XOrd : OrderedType
   with Definition t := X
@@ -19,7 +19,7 @@ Module Type MyOt.
   Parameter eq : t -> t -> Prop.
 End MyOt.
 
-Module Type M2. Parameter X : Type.      
+Module Type M2. Parameter X : Type.
 
 Declare Module Export XOrd : MyOt
   with Definition t := X
diff --git a/test-suite/bugs/closed/3993.v b/test-suite/bugs/closed/bug_3993.v
index 086d8dd0f3..086d8dd0f3 100644
--- a/test-suite/bugs/closed/3993.v
+++ b/test-suite/bugs/closed/bug_3993.v
diff --git a/test-suite/bugs/closed/3998.v b/test-suite/bugs/closed/bug_3998.v
index e17550e904..e17550e904 100644
--- a/test-suite/bugs/closed/3998.v
+++ b/test-suite/bugs/closed/bug_3998.v
diff --git a/test-suite/bugs/closed/4001.v b/test-suite/bugs/closed/bug_4001.v
index 25d78f4b0e..25ce692318 100644
--- a/test-suite/bugs/closed/4001.v
+++ b/test-suite/bugs/closed/bug_4001.v
@@ -3,7 +3,7 @@
 
 Set Implicit Arguments.
 Set Asymmetric Patterns.
-  
+
 Variable A : Type.
 Variable typ : A -> Type.
 
diff --git a/test-suite/bugs/closed/4012.v b/test-suite/bugs/closed/bug_4012.v
index 1748e3baad..1748e3baad 100644
--- a/test-suite/bugs/closed/4012.v
+++ b/test-suite/bugs/closed/bug_4012.v
diff --git a/test-suite/bugs/closed/4016.v b/test-suite/bugs/closed/bug_4016.v
index 41cb1a8884..c1c9aa673c 100644
--- a/test-suite/bugs/closed/4016.v
+++ b/test-suite/bugs/closed/bug_4016.v
@@ -9,4 +9,3 @@ intros z Hz x Hx.
 rewrite <- Hx in Hz.
 destruct z.
 Abort.
-
diff --git a/test-suite/bugs/closed/4017.v b/test-suite/bugs/closed/bug_4017.v
index aa810f4f0e..90d4fc7d22 100644
--- a/test-suite/bugs/closed/4017.v
+++ b/test-suite/bugs/closed/bug_4017.v
@@ -1,8 +1,8 @@
 Set Implicit Arguments.
 
 (* Use of implicit arguments was lost in multiple variable declarations *)
-Variables 
+Variables
   (A1 : Type)
-  (A2 : forall (x1 : A1), Type) 
+  (A2 : forall (x1 : A1), Type)
   (A3 : forall (x1 : A1) (x2 : A2 x1), Type)
   (A4 : forall (x1 : A1) (x2 : A2 x1) (x3 : A3 x2), Type).
diff --git a/test-suite/bugs/closed/4018.v b/test-suite/bugs/closed/bug_4018.v
index 8895e09e02..8895e09e02 100644
--- a/test-suite/bugs/closed/4018.v
+++ b/test-suite/bugs/closed/bug_4018.v
diff --git a/test-suite/bugs/closed/4031.v b/test-suite/bugs/closed/bug_4031.v
index 6c23baffa0..d2d86a9d13 100644
--- a/test-suite/bugs/closed/4031.v
+++ b/test-suite/bugs/closed/bug_4031.v
@@ -4,7 +4,7 @@ Inductive myunit : Set := mytt.
   (* Proof below works when definition is in Type,
      however builtin types such as unit are in Set. *)
 
-Lemma demo_hide_generic : 
+Lemma demo_hide_generic :
    let x := mytt in x = x.
 Proof.
   intros.
diff --git a/test-suite/bugs/closed/4034.v b/test-suite/bugs/closed/bug_4034.v
index 3f7be4d1c7..3f7be4d1c7 100644
--- a/test-suite/bugs/closed/4034.v
+++ b/test-suite/bugs/closed/bug_4034.v
diff --git a/test-suite/bugs/closed/4035.v b/test-suite/bugs/closed/bug_4035.v
index ec246d097b..ec246d097b 100644
--- a/test-suite/bugs/closed/4035.v
+++ b/test-suite/bugs/closed/bug_4035.v
diff --git a/test-suite/bugs/closed/4046.v b/test-suite/bugs/closed/bug_4046.v
index 8f8779b7b2..c33e2b9feb 100644
--- a/test-suite/bugs/closed/4046.v
+++ b/test-suite/bugs/closed/bug_4046.v
@@ -3,4 +3,4 @@ Module Import Foo.
 End Foo.
 
 Instance f : Foo := { foo := nat }. (* works fine *)
-Instance f' : Foo.Foo := { Foo.foo := nat }. 
+Instance f' : Foo.Foo := { Foo.foo := nat }.
diff --git a/test-suite/bugs/closed/4057.v b/test-suite/bugs/closed/bug_4057.v
index 4f0e696c9a..5b2e56f261 100644
--- a/test-suite/bugs/closed/4057.v
+++ b/test-suite/bugs/closed/bug_4057.v
@@ -65,7 +65,7 @@ Module Export ContextFreeGrammar.
                                 -> parse_of_production (str ++ strs) (pat::pats)
       with parse_of_item : String -> item -> Type :=
       | ParseNonTerminal : forall name str, parse_of str (Lookup G name)
-                                            -> parse_of_item str (NonTerminal 
+                                            -> parse_of_item str (NonTerminal
 name).
     End parse.
   End cfg.
@@ -84,9 +84,9 @@ Module Export ContextFreeGrammarProperties.
            | @ParseTail _ _ _ _ _ _ p'
              => Forall_parse_of p'
          end
-    with Forall_parse_of_production {str pat} (p : parse_of_production String G 
+    with Forall_parse_of_production {str pat} (p : parse_of_production String G
 str pat)
-         := let Forall_parse_of_item {str it} (p : parse_of_item String G str 
+         := let Forall_parse_of_item {str it} (p : parse_of_item String G str
 it)
                 := match p return Type with
                      | @ParseNonTerminal _ _ _ name str p'
@@ -94,7 +94,7 @@ it)
                    end in
             match p return Type with
               | @ParseProductionCons _ _ _ str pat strs pats p' p''
-                => (Forall_parse_of_item p' * Forall_parse_of_production 
+                => (Forall_parse_of_item p' * Forall_parse_of_production
 p'')%type
             end.
 
@@ -116,7 +116,7 @@ Module Export DependentlyTyped.
       { nonterminal_names_listT : Type;
         initial_nonterminal_names_data : nonterminal_names_listT;
         is_valid_nonterminal_name : nonterminal_names_listT -> string -> bool;
-        remove_nonterminal_name : nonterminal_names_listT -> string -> 
+        remove_nonterminal_name : nonterminal_names_listT -> string ->
 nonterminal_names_listT }.
 
   End recursive_descent_parser.
@@ -147,14 +147,14 @@ Section cfg.
                 (str : String),
            production -> Type :=
   | MinParseProductionNil : forall str0 valid,
-                              @minimal_parse_of_production str0 valid (Empty _) 
+                              @minimal_parse_of_production str0 valid (Empty _)
 nil
   | MinParseProductionCons : forall str0 valid str strs pat pats,
                                str ++ strs ≤s str0
                                -> @minimal_parse_of_item str0 valid str pat
-                               -> @minimal_parse_of_production str0 valid strs 
+                               -> @minimal_parse_of_production str0 valid strs
 pats
-                               -> @minimal_parse_of_production str0 valid (str 
+                               -> @minimal_parse_of_production str0 valid (str
 ++ strs) (pat::pats)
   with minimal_parse_of_item
        : forall (str0 : String) (valid : names_listT)
@@ -177,7 +177,7 @@ pats
         @minimal_parse_of str (remove_name valid name) str (Lookup G name)
         -> @minimal_parse_of_name str valid str name.
   Definition parse_of_item_name__of__minimal_parse_of_name
-  : forall {str0 valid str name} (p : @minimal_parse_of_name str0 valid str 
+  : forall {str0 valid str name} (p : @minimal_parse_of_name str0 valid str
 name),
       parse_of_item String G str (NonTerminal name).
   Proof.
@@ -197,8 +197,8 @@ Section recursive_descent_parser.
   Defined.
 
   Let mp_parse_nonterminal_name str0 valid str nonterminal_name
-    := { p' : minimal_parse_of_name String G initial_nonterminal_names_data 
-remove_nonterminal_name str0 valid str nonterminal_name & Forall_parse_of_item 
+    := { p' : minimal_parse_of_name String G initial_nonterminal_names_data
+remove_nonterminal_name str0 valid str nonterminal_name & Forall_parse_of_item
 P (parse_of_item_name__of__minimal_parse_of_name p') }.
 
   Goal False.
diff --git a/test-suite/bugs/closed/4069.v b/test-suite/bugs/closed/bug_4069.v
index 668f6bb428..69d5bc6c03 100644
--- a/test-suite/bugs/closed/4069.v
+++ b/test-suite/bugs/closed/bug_4069.v
@@ -1,20 +1,20 @@
 
-Lemma test1 : 
+Lemma test1 :
 forall (v : nat) (f g : nat -> nat),
 f v = g v.
 intros. f_equal.
-(* 
+(*
 Goal in v8.5: f v = g v
 Goal in v8.4: v = v -> f v = g v
 Expected: f = g
 *)
 Admitted.
 
-Lemma test2 : 
+Lemma test2 :
 forall (v u : nat) (f g : nat -> nat),
 f v = g u.
 intros. f_equal.
-(* 
+(*
 In both v8.4 And v8.5
 Goal 1: v = u -> f v = g u
 Goal 2: v = u
@@ -24,11 +24,11 @@ Expected Goal 2: v = u
 *)
 Admitted.
 
-Lemma test3 : 
+Lemma test3 :
 forall (v : nat) (u : list nat) (f : nat -> nat) (g : list nat -> nat),
 f v = g u.
 intros. f_equal.
-(* 
+(*
 In both v8.4 And v8.5, the goal is unchanged.
 *)
 Admitted.
@@ -46,7 +46,7 @@ Abort.
 Require Import List.
 Fixpoint replicate {A} (n : nat) (x : A) : list A :=
   match n with 0 => nil | S n => x :: replicate n x end.
-Lemma bar {A} n m (x : A) : 
+Lemma bar {A} n m (x : A) :
   skipn n (replicate m x) = replicate (m - n) x ->
   skipn n (replicate m x) = replicate (m - n) x.
 Proof. intros. f_equal.
@@ -83,7 +83,7 @@ eexists.
 Set Printing All.
 unshelve refine (sequator (X _)); revgoals.
 2:exact 0. reflexivity.
-Undo 3. 
+Undo 3.
 unshelve refine (pequator (X _)); revgoals.
 f_equal.
 Undo 2.
@@ -96,7 +96,7 @@ congruence.
 Qed.
 
 Goal @eq Type nat nat.
-congruence. 
+congruence.
 Qed.
 
 Variable T : Type.
diff --git a/test-suite/bugs/closed/4078.v b/test-suite/bugs/closed/bug_4078.v
index 236cd2fbb1..236cd2fbb1 100644
--- a/test-suite/bugs/closed/4078.v
+++ b/test-suite/bugs/closed/bug_4078.v
diff --git a/test-suite/bugs/closed/4089.v b/test-suite/bugs/closed/bug_4089.v
index fc1c504f14..fc1c504f14 100644
--- a/test-suite/bugs/closed/4089.v
+++ b/test-suite/bugs/closed/bug_4089.v
diff --git a/test-suite/bugs/closed/4095.v b/test-suite/bugs/closed/bug_4095.v
index bc9380f90d..bc9380f90d 100644
--- a/test-suite/bugs/closed/4095.v
+++ b/test-suite/bugs/closed/bug_4095.v
diff --git a/test-suite/bugs/closed/4097.v b/test-suite/bugs/closed/bug_4097.v
index 183b860d1f..183b860d1f 100644
--- a/test-suite/bugs/closed/4097.v
+++ b/test-suite/bugs/closed/bug_4097.v
diff --git a/test-suite/bugs/closed/4101.v b/test-suite/bugs/closed/bug_4101.v
index 75a26a0670..b7c3e372aa 100644
--- a/test-suite/bugs/closed/4101.v
+++ b/test-suite/bugs/closed/bug_4101.v
@@ -16,4 +16,4 @@ Lemma sigT_obj_eq
 Proof.
   intros.
   Set Debug Tactic Unification.
-  apply path_forall. 
+  apply path_forall.
diff --git a/test-suite/bugs/closed/4103.v b/test-suite/bugs/closed/bug_4103.v
index 92cc0279ac..92cc0279ac 100644
--- a/test-suite/bugs/closed/4103.v
+++ b/test-suite/bugs/closed/bug_4103.v
diff --git a/test-suite/bugs/closed/4116.v b/test-suite/bugs/closed/bug_4116.v
index 5932c9c56e..5932c9c56e 100644
--- a/test-suite/bugs/closed/4116.v
+++ b/test-suite/bugs/closed/bug_4116.v
diff --git a/test-suite/bugs/closed/4120.v b/test-suite/bugs/closed/bug_4120.v
index 315dc0d242..315dc0d242 100644
--- a/test-suite/bugs/closed/4120.v
+++ b/test-suite/bugs/closed/bug_4120.v
diff --git a/test-suite/bugs/closed/4121.v b/test-suite/bugs/closed/bug_4121.v
index b236846710..b236846710 100644
--- a/test-suite/bugs/closed/4121.v
+++ b/test-suite/bugs/closed/bug_4121.v
diff --git a/test-suite/bugs/closed/4132.v b/test-suite/bugs/closed/bug_4132.v
index 806ffb771f..806ffb771f 100644
--- a/test-suite/bugs/closed/4132.v
+++ b/test-suite/bugs/closed/bug_4132.v
diff --git a/test-suite/bugs/closed/4149.v b/test-suite/bugs/closed/bug_4149.v
index b81c680cd7..b81c680cd7 100644
--- a/test-suite/bugs/closed/4149.v
+++ b/test-suite/bugs/closed/bug_4149.v
diff --git a/test-suite/bugs/closed/4151.v b/test-suite/bugs/closed/bug_4151.v
index fc0b58cfe1..fc0b58cfe1 100644
--- a/test-suite/bugs/closed/4151.v
+++ b/test-suite/bugs/closed/bug_4151.v
diff --git a/test-suite/bugs/closed/4161.v b/test-suite/bugs/closed/bug_4161.v
index d2003ab1f0..d2003ab1f0 100644
--- a/test-suite/bugs/closed/4161.v
+++ b/test-suite/bugs/closed/bug_4161.v
diff --git a/test-suite/bugs/closed/4165.v b/test-suite/bugs/closed/bug_4165.v
index 8e0a62d35c..8e0a62d35c 100644
--- a/test-suite/bugs/closed/4165.v
+++ b/test-suite/bugs/closed/bug_4165.v
diff --git a/test-suite/bugs/closed/4187.v b/test-suite/bugs/closed/bug_4187.v
index b13ca36a37..b13ca36a37 100644
--- a/test-suite/bugs/closed/4187.v
+++ b/test-suite/bugs/closed/bug_4187.v
diff --git a/test-suite/bugs/closed/4190.v b/test-suite/bugs/closed/bug_4190.v
index 2843488ba0..2843488ba0 100644
--- a/test-suite/bugs/closed/4190.v
+++ b/test-suite/bugs/closed/bug_4190.v
diff --git a/test-suite/bugs/closed/4191.v b/test-suite/bugs/closed/bug_4191.v
index 290bb384d9..d9268dbe2f 100644
--- a/test-suite/bugs/closed/4191.v
+++ b/test-suite/bugs/closed/bug_4191.v
@@ -2,4 +2,4 @@
 Definition foo (x := 1) {y : nat} (H : y = y) : True := I.
 Definition bar {y : nat} (x := 1) (H : y = y) : True := I.
 Check bar (eq_refl 1).
-Check foo (eq_refl 1). 
+Check foo (eq_refl 1).
diff --git a/test-suite/bugs/closed/4193.v b/test-suite/bugs/closed/bug_4193.v
index 885d04a927..885d04a927 100644
--- a/test-suite/bugs/closed/4193.v
+++ b/test-suite/bugs/closed/bug_4193.v
diff --git a/test-suite/bugs/closed/4198.v b/test-suite/bugs/closed/bug_4198.v
index 28800ac05a..53381b10a5 100644
--- a/test-suite/bugs/closed/4198.v
+++ b/test-suite/bugs/closed/bug_4198.v
@@ -21,15 +21,15 @@ Abort.
    construct for generically matching a "match") *)
 
 Ltac find_head_of_head_match T :=
-  match T with context [?E] => 
-    match T with  
-    | E => fail 1 
-    | _ => constr:(E) 
-    end 
+  match T with context [?E] =>
+    match T with
+    | E => fail 1
+    | _ => constr:(E)
+    end
   end.
 
 Ltac mydestruct :=
-  match goal with 
+  match goal with
   | |- ?T1 = _ => let E := find_head_of_head_match T1 in destruct E
   end.
 
diff --git a/test-suite/bugs/closed/4202.v b/test-suite/bugs/closed/bug_4202.v
index 522a3604a3..522a3604a3 100644
--- a/test-suite/bugs/closed/4202.v
+++ b/test-suite/bugs/closed/bug_4202.v
diff --git a/test-suite/bugs/closed/4203.v b/test-suite/bugs/closed/bug_4203.v
index eb6867a033..eb6867a033 100644
--- a/test-suite/bugs/closed/4203.v
+++ b/test-suite/bugs/closed/bug_4203.v
diff --git a/test-suite/bugs/closed/4205.v b/test-suite/bugs/closed/bug_4205.v
index c40dfcc1f3..c40dfcc1f3 100644
--- a/test-suite/bugs/closed/4205.v
+++ b/test-suite/bugs/closed/bug_4205.v
diff --git a/test-suite/bugs/closed/4214.v b/test-suite/bugs/closed/bug_4214.v
index 2e620fce2a..2e620fce2a 100644
--- a/test-suite/bugs/closed/4214.v
+++ b/test-suite/bugs/closed/bug_4214.v
diff --git a/test-suite/bugs/closed/4216.v b/test-suite/bugs/closed/bug_4216.v
index ae7f746778..60b1311ace 100644
--- a/test-suite/bugs/closed/4216.v
+++ b/test-suite/bugs/closed/bug_4216.v
@@ -13,8 +13,7 @@ Let T_fzip `{TMonad T} := fun (A B: Type) (f: T (A -> B)) (t: T A)
                   => bind t (fun a => bind f (fun g => ret (g a) )).
 Let T_pure `{TMonad T} := @ret _ _.
 
-Let T_pure_id `{TMonad T} {A: Type} (t: A -> A) (x: T A): 
+Let T_pure_id `{TMonad T} {A: Type} (t: A -> A) (x: T A):
         path (T_fzip A A (T_pure (A -> A) t) x) x.
   unfold T_fzip, T_pure.
   Fail rewrite (ret_unit_left (fun g a => ret (g a)) (fun x => x)).
-
diff --git a/test-suite/bugs/closed/4217.v b/test-suite/bugs/closed/bug_4217.v
index 19973f30a7..19973f30a7 100644
--- a/test-suite/bugs/closed/4217.v
+++ b/test-suite/bugs/closed/bug_4217.v
diff --git a/test-suite/bugs/closed/4221.v b/test-suite/bugs/closed/bug_4221.v
index bc120fb1ff..bc120fb1ff 100644
--- a/test-suite/bugs/closed/4221.v
+++ b/test-suite/bugs/closed/bug_4221.v
diff --git a/test-suite/bugs/closed/4232.v b/test-suite/bugs/closed/bug_4232.v
index 61e544a914..61e544a914 100644
--- a/test-suite/bugs/closed/4232.v
+++ b/test-suite/bugs/closed/bug_4232.v
diff --git a/test-suite/bugs/closed/4234.v b/test-suite/bugs/closed/bug_4234.v
index 348dd49d93..348dd49d93 100644
--- a/test-suite/bugs/closed/4234.v
+++ b/test-suite/bugs/closed/bug_4234.v
diff --git a/test-suite/bugs/closed/4240.v b/test-suite/bugs/closed/bug_4240.v
index 083c59fe68..083c59fe68 100644
--- a/test-suite/bugs/closed/4240.v
+++ b/test-suite/bugs/closed/bug_4240.v
diff --git a/test-suite/bugs/closed/4250.v b/test-suite/bugs/closed/bug_4250.v
index f5d0d1a523..f5d0d1a523 100644
--- a/test-suite/bugs/closed/4250.v
+++ b/test-suite/bugs/closed/bug_4250.v
diff --git a/test-suite/bugs/closed/4251.v b/test-suite/bugs/closed/bug_4251.v
index f112e7b4d5..776851cebb 100644
--- a/test-suite/bugs/closed/4251.v
+++ b/test-suite/bugs/closed/bug_4251.v
@@ -8,7 +8,7 @@ Inductive Mtac : Type -> Prop :=
 
 Definition Ref := array.
 
-Definition ref : forall {A}, A -> Mtac (Ref A) := 
+Definition ref : forall {A}, A -> Mtac (Ref A) :=
   fun A x=> array_make x.
 Check array Type.
 Check fun A : Type => Ref A.
diff --git a/test-suite/bugs/closed/4254.v b/test-suite/bugs/closed/bug_4254.v
index ef219973df..ef219973df 100644
--- a/test-suite/bugs/closed/4254.v
+++ b/test-suite/bugs/closed/bug_4254.v
diff --git a/test-suite/bugs/closed/4256.v b/test-suite/bugs/closed/bug_4256.v
index 3cdc4ada02..3e5438cd46 100644
--- a/test-suite/bugs/closed/4256.v
+++ b/test-suite/bugs/closed/bug_4256.v
@@ -1,4 +1,4 @@
-(* Testing 8.5 regression with type classes not solving evars 
+(* Testing 8.5 regression with type classes not solving evars
    redefined while trying to solve them with the type class mechanism *)
 
 Global Set Universe Polymorphism.
diff --git a/test-suite/bugs/closed/4272.v b/test-suite/bugs/closed/bug_4272.v
index aeb4c9bb95..aeb4c9bb95 100644
--- a/test-suite/bugs/closed/4272.v
+++ b/test-suite/bugs/closed/bug_4272.v
diff --git a/test-suite/bugs/closed/4273.v b/test-suite/bugs/closed/bug_4273.v
index 401e86649b..5ff78b1ef2 100644
--- a/test-suite/bugs/closed/4273.v
+++ b/test-suite/bugs/closed/bug_4273.v
@@ -1,5 +1,5 @@
 
-  
+
 Set Primitive Projections.
 Record total2 (P : nat -> Prop) := tpair { pr1 : nat; pr2 : P pr1 }.
 Theorem onefiber' (q : total2 (fun y => y = 0)) : True.
diff --git a/test-suite/bugs/closed/4276.v b/test-suite/bugs/closed/bug_4276.v
index ea9cbb210f..f0da3e490a 100644
--- a/test-suite/bugs/closed/4276.v
+++ b/test-suite/bugs/closed/bug_4276.v
@@ -4,7 +4,7 @@ Record box (T U : Type) (x := T) := wrap { unwrap : T }.
 Definition mybox : box True False := wrap _ _ I.
 Definition unwrap' := @unwrap.
 
-Definition bad' : True := mybox.(unwrap _ _). 
+Definition bad' : True := mybox.(unwrap _ _).
 
 Fail Definition bad : False := unwrap _ _ mybox.
 
diff --git a/test-suite/bugs/closed/4280.v b/test-suite/bugs/closed/bug_4280.v
index fd7897509e..fd7897509e 100644
--- a/test-suite/bugs/closed/4280.v
+++ b/test-suite/bugs/closed/bug_4280.v
diff --git a/test-suite/bugs/closed/4283.v b/test-suite/bugs/closed/bug_4283.v
index e06998b711..2a8b517bd4 100644
--- a/test-suite/bugs/closed/4283.v
+++ b/test-suite/bugs/closed/bug_4283.v
@@ -5,4 +5,3 @@ Polymorphic Record box (X : Type) (T := Type) : Type := wrap { unwrap : T }.
 Definition unwrap' := fun (X : Type) (b : box X) => let (unwrap) := b in unwrap.
 
 Fail Definition bad : False := TypeNeqSmallType.paradox (unwrap' Type (wrap _ Type)) eq_refl.
-
diff --git a/test-suite/bugs/closed/4284.v b/test-suite/bugs/closed/bug_4284.v
index 0fff3026ff..0fff3026ff 100644
--- a/test-suite/bugs/closed/4284.v
+++ b/test-suite/bugs/closed/bug_4284.v
diff --git a/test-suite/bugs/closed/4287.v b/test-suite/bugs/closed/bug_4287.v
index 757b71b2dd..757b71b2dd 100644
--- a/test-suite/bugs/closed/4287.v
+++ b/test-suite/bugs/closed/bug_4287.v
diff --git a/test-suite/bugs/closed/4292.v b/test-suite/bugs/closed/bug_4292.v
index 403e155eaf..403e155eaf 100644
--- a/test-suite/bugs/closed/4292.v
+++ b/test-suite/bugs/closed/bug_4292.v
diff --git a/test-suite/bugs/closed/4293.v b/test-suite/bugs/closed/bug_4293.v
index 21d333fa63..21d333fa63 100644
--- a/test-suite/bugs/closed/4293.v
+++ b/test-suite/bugs/closed/bug_4293.v
diff --git a/test-suite/bugs/closed/4294.v b/test-suite/bugs/closed/bug_4294.v
index 1d5e3c71b8..1d5e3c71b8 100644
--- a/test-suite/bugs/closed/4294.v
+++ b/test-suite/bugs/closed/bug_4294.v
diff --git a/test-suite/bugs/closed/4298.v b/test-suite/bugs/closed/bug_4298.v
index 875612ddf4..875612ddf4 100644
--- a/test-suite/bugs/closed/4298.v
+++ b/test-suite/bugs/closed/bug_4298.v
diff --git a/test-suite/bugs/closed/4299.v b/test-suite/bugs/closed/bug_4299.v
index a1daa193ae..a1daa193ae 100644
--- a/test-suite/bugs/closed/4299.v
+++ b/test-suite/bugs/closed/bug_4299.v
diff --git a/test-suite/bugs/closed/4301.v b/test-suite/bugs/closed/bug_4301.v
index b4e17c2231..2b942371fe 100644
--- a/test-suite/bugs/closed/4301.v
+++ b/test-suite/bugs/closed/bug_4301.v
@@ -9,5 +9,5 @@ Module Lower (X : Foo with Definition U := True : Type).
 End Lower.
 
 Module M : Foo.
-  Definition U := nat : Type@{i}. 
+  Definition U := nat : Type@{i}.
 End M.
diff --git a/test-suite/bugs/closed/4305.v b/test-suite/bugs/closed/bug_4305.v
index 39fc02d22b..39fc02d22b 100644
--- a/test-suite/bugs/closed/4305.v
+++ b/test-suite/bugs/closed/bug_4305.v
diff --git a/test-suite/bugs/closed/4306.v b/test-suite/bugs/closed/bug_4306.v
index 80c348d207..80c348d207 100644
--- a/test-suite/bugs/closed/4306.v
+++ b/test-suite/bugs/closed/bug_4306.v
diff --git a/test-suite/bugs/closed/4316.v b/test-suite/bugs/closed/bug_4316.v
index 68dec1334a..68dec1334a 100644
--- a/test-suite/bugs/closed/4316.v
+++ b/test-suite/bugs/closed/bug_4316.v
diff --git a/test-suite/bugs/closed/4318.v b/test-suite/bugs/closed/bug_4318.v
index e3140ed5ab..e3140ed5ab 100644
--- a/test-suite/bugs/closed/4318.v
+++ b/test-suite/bugs/closed/bug_4318.v
diff --git a/test-suite/bugs/closed/4325.v b/test-suite/bugs/closed/bug_4325.v
index af69ca04b6..af69ca04b6 100644
--- a/test-suite/bugs/closed/4325.v
+++ b/test-suite/bugs/closed/bug_4325.v
diff --git a/test-suite/bugs/closed/4328.v b/test-suite/bugs/closed/bug_4328.v
index b40b3a4830..b40b3a4830 100644
--- a/test-suite/bugs/closed/4328.v
+++ b/test-suite/bugs/closed/bug_4328.v
diff --git a/test-suite/bugs/closed/4346.v b/test-suite/bugs/closed/bug_4346.v
index b50dff2411..b50dff2411 100644
--- a/test-suite/bugs/closed/4346.v
+++ b/test-suite/bugs/closed/bug_4346.v
diff --git a/test-suite/bugs/closed/4347.v b/test-suite/bugs/closed/bug_4347.v
index 29686a26c1..29686a26c1 100644
--- a/test-suite/bugs/closed/4347.v
+++ b/test-suite/bugs/closed/bug_4347.v
diff --git a/test-suite/bugs/closed/4354.v b/test-suite/bugs/closed/bug_4354.v
index c55b4cf02a..c55b4cf02a 100644
--- a/test-suite/bugs/closed/4354.v
+++ b/test-suite/bugs/closed/bug_4354.v
diff --git a/test-suite/bugs/closed/4363.v b/test-suite/bugs/closed/bug_4363.v
index 9895548c1d..9895548c1d 100644
--- a/test-suite/bugs/closed/4363.v
+++ b/test-suite/bugs/closed/bug_4363.v
diff --git a/test-suite/bugs/closed/4366.v b/test-suite/bugs/closed/bug_4366.v
index 403c2d2026..403c2d2026 100644
--- a/test-suite/bugs/closed/4366.v
+++ b/test-suite/bugs/closed/bug_4366.v
diff --git a/test-suite/bugs/closed/4372.v b/test-suite/bugs/closed/bug_4372.v
index 428192a344..428192a344 100644
--- a/test-suite/bugs/closed/4372.v
+++ b/test-suite/bugs/closed/bug_4372.v
diff --git a/test-suite/bugs/closed/4375.v b/test-suite/bugs/closed/bug_4375.v
index 468bade1cc..ef358b15e0 100644
--- a/test-suite/bugs/closed/4375.v
+++ b/test-suite/bugs/closed/bug_4375.v
@@ -104,4 +104,3 @@ with cb@{i} (t : Type@{i}) : foo@{i} t :=
 
 Print ca.
 Print cb.
-  
diff --git a/test-suite/bugs/closed/4378.v b/test-suite/bugs/closed/bug_4378.v
index 9d59165562..9d59165562 100644
--- a/test-suite/bugs/closed/4378.v
+++ b/test-suite/bugs/closed/bug_4378.v
diff --git a/test-suite/bugs/closed/4390.v b/test-suite/bugs/closed/bug_4390.v
index c069b2d9dc..c069b2d9dc 100644
--- a/test-suite/bugs/closed/4390.v
+++ b/test-suite/bugs/closed/bug_4390.v
diff --git a/test-suite/bugs/closed/4397.v b/test-suite/bugs/closed/bug_4397.v
index 3566353d84..3566353d84 100644
--- a/test-suite/bugs/closed/4397.v
+++ b/test-suite/bugs/closed/bug_4397.v
diff --git a/test-suite/bugs/closed/4403.v b/test-suite/bugs/closed/bug_4403.v
index a80f38fe2a..a80f38fe2a 100644
--- a/test-suite/bugs/closed/4403.v
+++ b/test-suite/bugs/closed/bug_4403.v
diff --git a/test-suite/bugs/closed/4404.v b/test-suite/bugs/closed/bug_4404.v
index 27b43a61d4..38fed1936c 100644
--- a/test-suite/bugs/closed/4404.v
+++ b/test-suite/bugs/closed/bug_4404.v
@@ -1,4 +1,3 @@
 Inductive Foo : Type -> Type := foo A : Foo A.
 Goal True.
   remember Foo.
-
diff --git a/test-suite/bugs/closed/4412.v b/test-suite/bugs/closed/bug_4412.v
index 4b2aae0c7b..4b2aae0c7b 100644
--- a/test-suite/bugs/closed/4412.v
+++ b/test-suite/bugs/closed/bug_4412.v
diff --git a/test-suite/bugs/closed/4416.v b/test-suite/bugs/closed/bug_4416.v
index 62b90b4286..62b90b4286 100644
--- a/test-suite/bugs/closed/4416.v
+++ b/test-suite/bugs/closed/bug_4416.v
diff --git a/test-suite/bugs/closed/4420.v b/test-suite/bugs/closed/bug_4420.v
index 0e16cb2399..b81185a555 100644
--- a/test-suite/bugs/closed/4420.v
+++ b/test-suite/bugs/closed/bug_4420.v
@@ -5,7 +5,7 @@ Module foo.
     change foo with (fun x => foo x).
     cbv beta.
     reflexivity.
-  Defined. 
+  Defined.
 End foo.
 
 Inductive foo (A : Type) : Prop := I. (*Top.1*)
@@ -16,4 +16,3 @@ change foo with (fun x : Type => foo x). (*Top.4*)
 cbv beta.
 apply I. (* I Type@{Top.3} : (fun x : Type@{Top.4} => foo x) Type@{Top.3} *)
 Defined.
-
diff --git a/test-suite/bugs/closed/4429.v b/test-suite/bugs/closed/bug_4429.v
index bf0e570ab8..bf0e570ab8 100644
--- a/test-suite/bugs/closed/4429.v
+++ b/test-suite/bugs/closed/bug_4429.v
diff --git a/test-suite/bugs/closed/4433.v b/test-suite/bugs/closed/bug_4433.v
index 83c0e3f81f..83c0e3f81f 100644
--- a/test-suite/bugs/closed/4433.v
+++ b/test-suite/bugs/closed/bug_4433.v
diff --git a/test-suite/bugs/closed/4443.v b/test-suite/bugs/closed/bug_4443.v
index a3a8717d98..a3a8717d98 100644
--- a/test-suite/bugs/closed/4443.v
+++ b/test-suite/bugs/closed/bug_4443.v
diff --git a/test-suite/bugs/closed/4450.v b/test-suite/bugs/closed/bug_4450.v
index c1fe44315a..c1fe44315a 100644
--- a/test-suite/bugs/closed/4450.v
+++ b/test-suite/bugs/closed/bug_4450.v
diff --git a/test-suite/bugs/closed/4453.v b/test-suite/bugs/closed/bug_4453.v
index 009dd5e3ca..009dd5e3ca 100644
--- a/test-suite/bugs/closed/4453.v
+++ b/test-suite/bugs/closed/bug_4453.v
diff --git a/test-suite/bugs/closed/4456.v b/test-suite/bugs/closed/bug_4456.v
index 56a7b4f6e9..56a7b4f6e9 100644
--- a/test-suite/bugs/closed/4456.v
+++ b/test-suite/bugs/closed/bug_4456.v
diff --git a/test-suite/bugs/closed/4462.v b/test-suite/bugs/closed/bug_4462.v
index c680518c6a..c680518c6a 100644
--- a/test-suite/bugs/closed/4462.v
+++ b/test-suite/bugs/closed/bug_4462.v
diff --git a/test-suite/bugs/closed/4464.v b/test-suite/bugs/closed/bug_4464.v
index f8e9405d93..f8e9405d93 100644
--- a/test-suite/bugs/closed/4464.v
+++ b/test-suite/bugs/closed/bug_4464.v
diff --git a/test-suite/bugs/closed/4467.v b/test-suite/bugs/closed/bug_4467.v
index 6f8631d458..6f8631d458 100644
--- a/test-suite/bugs/closed/4467.v
+++ b/test-suite/bugs/closed/bug_4467.v
diff --git a/test-suite/bugs/closed/4471.v b/test-suite/bugs/closed/bug_4471.v
index 36efc42d47..36efc42d47 100644
--- a/test-suite/bugs/closed/4471.v
+++ b/test-suite/bugs/closed/bug_4471.v
diff --git a/test-suite/bugs/closed/4479.v b/test-suite/bugs/closed/bug_4479.v
index 921579d1e1..921579d1e1 100644
--- a/test-suite/bugs/closed/4479.v
+++ b/test-suite/bugs/closed/bug_4479.v
diff --git a/test-suite/bugs/closed/4480.v b/test-suite/bugs/closed/bug_4480.v
index 98c05ee1a8..ec6ec7e5c2 100644
--- a/test-suite/bugs/closed/4480.v
+++ b/test-suite/bugs/closed/bug_4480.v
@@ -9,4 +9,3 @@ Admitted.
 Goal True.
   Fail setoid_rewrite foo.
   Fail setoid_rewrite trueI.
-  
diff --git a/test-suite/bugs/closed/4484.v b/test-suite/bugs/closed/bug_4484.v
index f988539d62..6231e2d3df 100644
--- a/test-suite/bugs/closed/4484.v
+++ b/test-suite/bugs/closed/bug_4484.v
@@ -1,4 +1,4 @@
-(* Testing 8.5 regression with type classes not solving evars 
+(* Testing 8.5 regression with type classes not solving evars
    redefined while trying to solve them with the type class mechanism *)
 
 Class A := {}.
diff --git a/test-suite/bugs/closed/4495.v b/test-suite/bugs/closed/bug_4495.v
index 8b032db5f5..8b032db5f5 100644
--- a/test-suite/bugs/closed/4495.v
+++ b/test-suite/bugs/closed/bug_4495.v
diff --git a/test-suite/bugs/closed/4498.v b/test-suite/bugs/closed/bug_4498.v
index 379e46b3e3..379e46b3e3 100644
--- a/test-suite/bugs/closed/4498.v
+++ b/test-suite/bugs/closed/bug_4498.v
diff --git a/test-suite/bugs/closed/4503.v b/test-suite/bugs/closed/bug_4503.v
index 5162f352df..5162f352df 100644
--- a/test-suite/bugs/closed/4503.v
+++ b/test-suite/bugs/closed/bug_4503.v
diff --git a/test-suite/bugs/closed/4511.v b/test-suite/bugs/closed/bug_4511.v
index 0cdb3aee4f..0027596e59 100644
--- a/test-suite/bugs/closed/4511.v
+++ b/test-suite/bugs/closed/bug_4511.v
@@ -1,3 +1,2 @@
 Goal True.
 Fail evar I.
-
diff --git a/test-suite/bugs/closed/4519.v b/test-suite/bugs/closed/bug_4519.v
index 945183fae7..2c984cad1c 100644
--- a/test-suite/bugs/closed/4519.v
+++ b/test-suite/bugs/closed/bug_4519.v
@@ -16,6 +16,6 @@ Argument scopes are [type_scope type_scope type_scope]
  *)
 Check qux nat nat nat : Set.
 Check qux nat nat Set : Set. (* Error:
-The term "qux@{Top.50 Top.51} ?T ?T0 Set" has type "Type@{Top.50}" while it is 
+The term "qux@{Top.50 Top.51} ?T ?T0 Set" has type "Type@{Top.50}" while it is
 expected to have type "Set"
 (universe inconsistency: Cannot enforce Top.50 = Set because Set < Top.50). *)
diff --git a/test-suite/bugs/closed/4527.v b/test-suite/bugs/closed/bug_4527.v
index f8cedfff6e..8749680e8d 100644
--- a/test-suite/bugs/closed/4527.v
+++ b/test-suite/bugs/closed/bug_4527.v
@@ -1,8 +1,8 @@
 (* -*- mode: coq; coq-prog-args: ("-nois" "-indices-matter" "-R" "." "Top" "-top" "bug_bad_univ_length_01") -*- *)
-(* File reduced by coq-bug-finder from original input, then from 1199 lines to 
-430 lines, then from 444 lines to 430 lines, then from 964 lines to 255 lines, 
+(* File reduced by coq-bug-finder from original input, then from 1199 lines to
+430 lines, then from 444 lines to 430 lines, then from 964 lines to 255 lines,
 then from 269 lines to 255 lines *)
-(* coqc version 8.5 (January 2016) compiled on Jan 23 2016 16:15:22 with OCaml 
+(* coqc version 8.5 (January 2016) compiled on Jan 23 2016 16:15:22 with OCaml
 4.01.0
    coqtop version 8.5 (January 2016) *)
 Declare ML Module "ltac_plugin".
@@ -38,7 +38,7 @@ Module Export Specif.
 
 Set Implicit Arguments.
 
-Record sig {A} (P : A -> Type) := exist { proj1_sig : A ; proj2_sig : P 
+Record sig {A} (P : A -> Type) := exist { proj1_sig : A ; proj2_sig : P
 proj1_sig }.
 
 Notation sigT := sig (only parsing).
@@ -51,11 +51,11 @@ Notation projT2 := proj2_sig (only parsing).
 End Specif.
 Definition Type1@{i} := Eval hnf in let gt := (Set : Type@{i}) in Type@{i}.
 
-Definition Type2@{i j} := Eval hnf in let gt := (Type1@{j} : Type@{i}) in 
+Definition Type2@{i j} := Eval hnf in let gt := (Type1@{j} : Type@{i}) in
 Type@{i}.
 
 Definition Type2le@{i j} := Eval hnf in let gt := (Set : Type@{i}) in
-                                        let ge := ((fun x => x) : Type1@{j} -> 
+                                        let ge := ((fun x => x) : Type1@{j} ->
 Type@{i}) in Type@{i}.
 
 Notation idmap := (fun x => x).
@@ -73,7 +73,7 @@ Notation "x .2" := (pr2 x) (at level 3, format "x '.2'") : fibration_scope.
 
 Notation compose := (fun g f x => g (f x)).
 
-Notation "g 'o' f" := (compose g%function f%function) (at level 40, left 
+Notation "g 'o' f" := (compose g%function f%function) (at level 40, left
 associativity) : function_scope.
 
 Inductive paths {A : Type} (a : A) : A -> Type :=
@@ -100,7 +100,7 @@ Definition ap {A B:Type} (f:A -> B) {x y:A} (p:x = y) : f x = f y
 Definition pointwise_paths {A} {P:A->Type} (f g:forall x:A, P x)
   := forall x:A, f x = g x.
 
-Notation "f == g" := (pointwise_paths f g) (at level 70, no associativity) : 
+Notation "f == g" := (pointwise_paths f g) (at level 70, no associativity) :
 type_scope.
 
 Definition Sect {A B : Type} (s : A -> B) (r : B -> A) :=
@@ -116,7 +116,7 @@ Class IsEquiv {A B : Type} (f : A -> B) := BuildIsEquiv {
 Arguments eisretr {A B}%type_scope f%function_scope {_} _.
 Arguments eissect {A B}%type_scope f%function_scope {_} _.
 
-Notation "f ^-1" := (@equiv_inv _ _ f _) (at level 3, format "f '^-1'") : 
+Notation "f ^-1" := (@equiv_inv _ _ f _) (at level 3, format "f '^-1'") :
 function_scope.
 
 Inductive Unit : Type1 :=
@@ -183,11 +183,11 @@ Module Type ReflectiveSubuniverses.
   Parameter In@{u a i} : forall (O : ReflectiveSubuniverse@{u a}),
                    Type2le@{i a} -> Type2le@{i a}.
 
-  Parameter O_inO@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T : 
+  Parameter O_inO@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T :
 Type@{i}),
                                In@{u a i} O (O_reflector@{u a i} O T).
 
-  Parameter to@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T : 
+  Parameter to@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T :
 Type@{i}),
                    T -> O_reflector@{u a i} O T.
 
@@ -200,7 +200,7 @@ Type@{i}),
         In@{u a j} O U.
 
   Parameter extendable_to_O@{u a i j k}
-  : forall (O : ReflectiveSubuniverse@{u a}) {P : Type2le@{i a}} {Q : 
+  : forall (O : ReflectiveSubuniverse@{u a}) {P : Type2le@{i a}} {Q :
 Type2le@{j a}} {Q_inO : In@{u a j} O Q},
       ooExtendableAlong@{i i j k} (to O P) (fun _ => Q).
 
@@ -252,7 +252,7 @@ Section Reflective_Subuniverse.
  exact H.
     Defined.
 
-    Definition inO_paths@{i} (S : Type@{i}) {S_inO : In@{Ou Oa i} O S} (x y : 
+    Definition inO_paths@{i} (S : Type@{i}) {S_inO : In@{Ou Oa i} O S} (x y :
 S)    : In@{Ou Oa i} O (x=y).
     Proof.
       simple refine (inO_to_O_retract@{i} _ _ _); intro u.
diff --git a/test-suite/bugs/closed/4529.v b/test-suite/bugs/closed/bug_4529.v
index 8b3c24fec6..b16d81bd7c 100644
--- a/test-suite/bugs/closed/4529.v
+++ b/test-suite/bugs/closed/bug_4529.v
@@ -42,4 +42,3 @@ End cofe_mixin.
     *
  intros x.
 apply equiv_dist.
-
diff --git a/test-suite/bugs/closed/4533.v b/test-suite/bugs/closed/bug_4533.v
index fd2380a070..f9cccd5a56 100644
--- a/test-suite/bugs/closed/4533.v
+++ b/test-suite/bugs/closed/bug_4533.v
@@ -1,8 +1,8 @@
 (* -*- mode: coq; coq-prog-args: ("-nois" "-indices-matter" "-R" "." "Top" "-top" "bug_lex_wrong_rewrite_02") -*- *)
-(* File reduced by coq-bug-finder from original input, then from 1125 lines to 
-346 lines, then from 360 lines to 346 lines, then from 822 lines to 271 lines, 
+(* File reduced by coq-bug-finder from original input, then from 1125 lines to
+346 lines, then from 360 lines to 346 lines, then from 822 lines to 271 lines,
 then from 285 lines to 271 lines *)
-(* coqc version 8.5 (January 2016) compiled on Jan 23 2016 16:15:22 with OCaml 
+(* coqc version 8.5 (January 2016) compiled on Jan 23 2016 16:15:22 with OCaml
 4.01.0
    coqtop version 8.5 (January 2016) *)
 Declare ML Module "ltac_plugin".
@@ -28,7 +28,7 @@ Module Export Datatypes.
 End Datatypes.
 Module Export Specif.
   Set Implicit Arguments.
-  Record sig {A} (P : A -> Type) := exist { proj1_sig : A ; proj2_sig : P 
+  Record sig {A} (P : A -> Type) := exist { proj1_sig : A ; proj2_sig : P
 proj1_sig }.
   Notation sigT := sig (only parsing).
   Notation "{ x : A  & P }" := (sigT (fun x:A => P)) : type_scope.
@@ -38,10 +38,10 @@ End Specif.
 Global Set Keyed Unification.
 Global Unset Strict Universe Declaration.
 Definition Type1@{i} := Eval hnf in let gt := (Set : Type@{i}) in Type@{i}.
-Definition Type2@{i j} := Eval hnf in let gt := (Type1@{j} : Type@{i}) in 
+Definition Type2@{i j} := Eval hnf in let gt := (Type1@{j} : Type@{i}) in
 Type@{i}.
 Definition Type2le@{i j} := Eval hnf in let gt := (Set : Type@{i}) in
-                                        let ge := ((fun x => x) : Type1@{j} -> 
+                                        let ge := ((fun x => x) : Type1@{j} ->
 Type@{i}) in Type@{i}.
 Notation idmap := (fun x => x).
 Delimit Scope function_scope with function.
@@ -54,7 +54,7 @@ Notation pr2 := projT2.
 Notation "x .1" := (pr1 x) (at level 3, format "x '.1'") : fibration_scope.
 Notation "x .2" := (pr2 x) (at level 3, format "x '.2'") : fibration_scope.
 Notation compose := (fun g f x => g (f x)).
-Notation "g 'o' f" := (compose g%function f%function) (at level 40, left 
+Notation "g 'o' f" := (compose g%function f%function) (at level 40, left
 associativity) : function_scope.
 Inductive paths {A : Type} (a : A) : A -> Type := idpath : paths a a.
 Arguments idpath {A a} , [A] a.
@@ -71,7 +71,7 @@ Definition ap {A B:Type} (f:A -> B) {x y:A} (p:x = y) : f x = f y
   := match p with idpath => idpath end.
 Definition pointwise_paths {A} {P:A->Type} (f g:forall x:A, P x)
   := forall x:A, f x = g x.
-Notation "f == g" := (pointwise_paths f g) (at level 70, no associativity) : 
+Notation "f == g" := (pointwise_paths f g) (at level 70, no associativity) :
 type_scope.
 Definition Sect {A B : Type} (s : A -> B) (r : B -> A) :=
   forall x : A, r (s x) = x.
@@ -79,13 +79,13 @@ Class IsEquiv {A B : Type} (f : A -> B) := BuildIsEquiv {
                                                equiv_inv : B -> A ;
                                                eisretr : Sect equiv_inv f;
                                                eissect : Sect f equiv_inv;
-                                               eisadj : forall x : A, eisretr 
+                                               eisadj : forall x : A, eisretr
 (f x) = ap f (eissect x)
                                              }.
 Arguments eissect {A B}%type_scope f%function_scope {_} _.
 Inductive Unit : Type1 := tt : Unit.
 Local Open Scope path_scope.
-Definition concat_p_pp {A : Type} {x y z t : A} (p : x = y) (q : y = z) (r : z 
+Definition concat_p_pp {A : Type} {x y z t : A} (p : x = y) (q : y = z) (r : z
 = t) :
   p @ (q @ r) = (p @ q) @ r :=
   match r with idpath =>
@@ -134,16 +134,16 @@ Module Type ReflectiveSubuniverses.
   Parameter In@{u a i} : forall (O : ReflectiveSubuniverse@{u a}),
       Type2le@{i a} -> Type2le@{i a}.
 
-  Parameter O_inO@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T : 
+  Parameter O_inO@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T :
 Type@{i}),
       In@{u a i} O (O_reflector@{u a i} O T).
 
-  Parameter to@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T : 
+  Parameter to@{u a i} : forall (O : ReflectiveSubuniverse@{u a}) (T :
 Type@{i}),
       T -> O_reflector@{u a i} O T.
 
   Parameter extendable_to_O@{u a i j k}
-    : forall (O : ReflectiveSubuniverse@{u a}) {P : Type2le@{i a}} {Q : 
+    : forall (O : ReflectiveSubuniverse@{u a}) {P : Type2le@{i a}} {Q :
 Type2le@{j a}} {Q_inO : In@{u a j} O Q},
       ooExtendableAlong@{i i j k} (to O P) (fun _ => Q).
 
@@ -181,7 +181,7 @@ Module ReflectiveSubuniverses_Theory (Os : ReflectiveSubuniverses).
   Section Reflective_Subuniverse.
     Context (O : ReflectiveSubuniverse@{Ou Oa}).
 
-    Definition isequiv_to_O_inO@{u a i} (T : Type@{i}) `{In@{u a i} O T} : 
+    Definition isequiv_to_O_inO@{u a i} (T : Type@{i}) `{In@{u a i} O T} :
 IsEquiv@{i i} (to O T).
     Proof.
 
@@ -210,11 +210,11 @@ Opaque eissect.
 Module Lex_Reflective_Subuniverses
        (Os : ReflectiveSubuniverses) (Opf : Preserves_Fibers Os).
   Import Opf.
-  Goal forall (O : ReflectiveSubuniverse) (A : Type) (B : A -> Type) (A_inO : 
+  Goal forall (O : ReflectiveSubuniverse) (A : Type) (B : A -> Type) (A_inO :
 In O A),
 
       forall g,
-      forall (x : O {x : A & B x}) v v' v'' (p2 : v'' = v') (p0 : v' = v) (p1 : 
+      forall (x : O {x : A & B x}) v v' v'' (p2 : v'' = v') (p0 : v' = v) (p1 :
 v = _) r,
         (p2
            @ (p0
diff --git a/test-suite/bugs/closed/4538.v b/test-suite/bugs/closed/bug_4538.v
index f925aae9e5..f925aae9e5 100644
--- a/test-suite/bugs/closed/4538.v
+++ b/test-suite/bugs/closed/bug_4538.v
diff --git a/test-suite/bugs/closed/4544.v b/test-suite/bugs/closed/bug_4544.v
index 13c47edc8f..13c47edc8f 100644
--- a/test-suite/bugs/closed/4544.v
+++ b/test-suite/bugs/closed/bug_4544.v
diff --git a/test-suite/bugs/closed/4574.v b/test-suite/bugs/closed/bug_4574.v
index 39ba190369..f166eb84a9 100644
--- a/test-suite/bugs/closed/4574.v
+++ b/test-suite/bugs/closed/bug_4574.v
@@ -5,4 +5,3 @@ Definition block A (a : A) := a.
 Goal forall A (a : A), block Type nat.
 Proof.
 Fail reflexivity.
-
diff --git a/test-suite/bugs/closed/4576.v b/test-suite/bugs/closed/bug_4576.v
index 2c643ea779..2c643ea779 100644
--- a/test-suite/bugs/closed/4576.v
+++ b/test-suite/bugs/closed/bug_4576.v
diff --git a/test-suite/bugs/closed/4580.v b/test-suite/bugs/closed/bug_4580.v
index 4ffd5f0f4b..4ffd5f0f4b 100644
--- a/test-suite/bugs/closed/4580.v
+++ b/test-suite/bugs/closed/bug_4580.v
diff --git a/test-suite/bugs/closed/4582.v b/test-suite/bugs/closed/bug_4582.v
index 0842fb8fa7..0842fb8fa7 100644
--- a/test-suite/bugs/closed/4582.v
+++ b/test-suite/bugs/closed/bug_4582.v
diff --git a/test-suite/bugs/closed/4588.v b/test-suite/bugs/closed/bug_4588.v
index ff66277e03..ff66277e03 100644
--- a/test-suite/bugs/closed/4588.v
+++ b/test-suite/bugs/closed/bug_4588.v
diff --git a/test-suite/bugs/closed/4596.v b/test-suite/bugs/closed/bug_4596.v
index 592fdb6580..592fdb6580 100644
--- a/test-suite/bugs/closed/4596.v
+++ b/test-suite/bugs/closed/bug_4596.v
diff --git a/test-suite/bugs/closed/4603.v b/test-suite/bugs/closed/bug_4603.v
index 2c90044dc7..1879c06d49 100644
--- a/test-suite/bugs/closed/4603.v
+++ b/test-suite/bugs/closed/bug_4603.v
@@ -5,6 +5,6 @@ Check (fun P => P A).
 Abort.
 
 Goal True.
-Definition foo (A : Type) : Prop:= True. 
+Definition foo (A : Type) : Prop:= True.
   set (x:=foo). split.
 Qed.
diff --git a/test-suite/bugs/closed/4612.v b/test-suite/bugs/closed/bug_4612.v
index ce95f26acc..ce95f26acc 100644
--- a/test-suite/bugs/closed/4612.v
+++ b/test-suite/bugs/closed/bug_4612.v
diff --git a/test-suite/bugs/closed/4616.v b/test-suite/bugs/closed/bug_4616.v
index d6660e3553..d6660e3553 100644
--- a/test-suite/bugs/closed/4616.v
+++ b/test-suite/bugs/closed/bug_4616.v
diff --git a/test-suite/bugs/closed/4622.v b/test-suite/bugs/closed/bug_4622.v
index ffa478cb87..ffa478cb87 100644
--- a/test-suite/bugs/closed/4622.v
+++ b/test-suite/bugs/closed/bug_4622.v
diff --git a/test-suite/bugs/closed/4623.v b/test-suite/bugs/closed/bug_4623.v
index 7ecfd98b67..7ecfd98b67 100644
--- a/test-suite/bugs/closed/4623.v
+++ b/test-suite/bugs/closed/bug_4623.v
diff --git a/test-suite/bugs/closed/4624.v b/test-suite/bugs/closed/bug_4624.v
index f5ce981cd0..f5ce981cd0 100644
--- a/test-suite/bugs/closed/4624.v
+++ b/test-suite/bugs/closed/bug_4624.v
diff --git a/test-suite/bugs/closed/4627.v b/test-suite/bugs/closed/bug_4627.v
index 4f56e19584..4f56e19584 100644
--- a/test-suite/bugs/closed/4627.v
+++ b/test-suite/bugs/closed/bug_4627.v
diff --git a/test-suite/bugs/closed/4628.v b/test-suite/bugs/closed/bug_4628.v
index 7d4a15d689..7d4a15d689 100644
--- a/test-suite/bugs/closed/4628.v
+++ b/test-suite/bugs/closed/bug_4628.v
diff --git a/test-suite/bugs/closed/4634.v b/test-suite/bugs/closed/bug_4634.v
index 77e31e108f..77e31e108f 100644
--- a/test-suite/bugs/closed/4634.v
+++ b/test-suite/bugs/closed/bug_4634.v
diff --git a/test-suite/bugs/closed/4644.v b/test-suite/bugs/closed/bug_4644.v
index f09b27c2b1..f09b27c2b1 100644
--- a/test-suite/bugs/closed/4644.v
+++ b/test-suite/bugs/closed/bug_4644.v
diff --git a/test-suite/bugs/closed/4653.v b/test-suite/bugs/closed/bug_4653.v
index 4514342c5e..4514342c5e 100644
--- a/test-suite/bugs/closed/4653.v
+++ b/test-suite/bugs/closed/bug_4653.v
diff --git a/test-suite/bugs/closed/4661.v b/test-suite/bugs/closed/bug_4661.v
index 03d2350a69..03d2350a69 100644
--- a/test-suite/bugs/closed/4661.v
+++ b/test-suite/bugs/closed/bug_4661.v
diff --git a/test-suite/bugs/closed/4663.v b/test-suite/bugs/closed/bug_4663.v
index b76619882a..b76619882a 100644
--- a/test-suite/bugs/closed/4663.v
+++ b/test-suite/bugs/closed/bug_4663.v
diff --git a/test-suite/bugs/closed/4670.v b/test-suite/bugs/closed/bug_4670.v
index 6113992953..6113992953 100644
--- a/test-suite/bugs/closed/4670.v
+++ b/test-suite/bugs/closed/bug_4670.v
diff --git a/test-suite/bugs/closed/4673.v b/test-suite/bugs/closed/bug_4673.v
index 10e48db6dd..0d49c6d9be 100644
--- a/test-suite/bugs/closed/4673.v
+++ b/test-suite/bugs/closed/bug_4673.v
@@ -30,21 +30,21 @@ Global Instance list_caset_Proper'' {A P}
 Admitted.
 
 Goal    forall (Char : Type) (P : forall _ : list bool, Prop) (l : list bool) (l0 : forall _ : forall _ : Char, bool, list bool)
-               
+
                (T : Type) (T0 : forall _ : T, Type) (t : T),
-    
+
     let predata := t in
 
     forall (splitdata : T0 predata) (l5 : forall _ : T0 t, list nat) (T1 : Type) (b : forall (_ : T1) (_ : Char), bool)
-           
+
            (T2 : Type) (a11 : T2) (xs : list T2) (T3 : Type) (i0 : T3) (P0 : Set) (b1 : forall (_ : nat) (_ : P0), bool)
-           
+
            (l2 : forall (_ : forall _ : T1, list bool) (_ : forall _ : P0, list bool) (_ : T2), list bool)
-           
+
            (l1 : forall (_ : forall _ : forall _ : Char, bool, list bool) (_ : forall _ : P0, list bool) (_ : T3), list bool)
-           
+
            (_ : forall NT : forall _ : P0, list bool, @eq (list bool) (l1 l0 NT i0) (l2 (fun f : T1 => l0 (b f)) NT a11)),
-      
+
       P
         (@list_caset T2 (fun _ : list T2 => list bool) l
                      (fun (_ : T2) (_ : list T2) => l1 l0 (fun a9 : P0 => @map nat bool (fun x0 : nat => b1 x0 a9) (l5 splitdata)) i0
diff --git a/test-suite/bugs/closed/4679.v b/test-suite/bugs/closed/bug_4679.v
index 3f41c5d6b1..3f41c5d6b1 100644
--- a/test-suite/bugs/closed/4679.v
+++ b/test-suite/bugs/closed/bug_4679.v
diff --git a/test-suite/bugs/closed/4684.v b/test-suite/bugs/closed/bug_4684.v
index 9c0bed42c4..9c0bed42c4 100644
--- a/test-suite/bugs/closed/4684.v
+++ b/test-suite/bugs/closed/bug_4684.v
diff --git a/test-suite/bugs/closed/4695.v b/test-suite/bugs/closed/bug_4695.v
index a42271811d..27e35c2ac0 100644
--- a/test-suite/bugs/closed/4695.v
+++ b/test-suite/bugs/closed/bug_4695.v
@@ -1,4 +1,4 @@
-(* 
+(*
 The Qed at the end of this file was slow in 8.5 and 8.5pl1 because the kernel
 term comparison after evaluation was done on constants according to their user
 names. The conversion still succeeded because delta applied, but was much
diff --git a/test-suite/bugs/closed/4708.v b/test-suite/bugs/closed/bug_4708.v
index ad2e581004..ad2e581004 100644
--- a/test-suite/bugs/closed/4708.v
+++ b/test-suite/bugs/closed/bug_4708.v
diff --git a/test-suite/bugs/closed/4709.v b/test-suite/bugs/closed/bug_4709.v
index a9edcc8043..a9edcc8043 100644
--- a/test-suite/bugs/closed/4709.v
+++ b/test-suite/bugs/closed/bug_4709.v
diff --git a/test-suite/bugs/closed/4710.v b/test-suite/bugs/closed/bug_4710.v
index e792a36234..e792a36234 100644
--- a/test-suite/bugs/closed/4710.v
+++ b/test-suite/bugs/closed/bug_4710.v
diff --git a/test-suite/bugs/closed/4713.v b/test-suite/bugs/closed/bug_4713.v
index 5d4d73be3f..5d4d73be3f 100644
--- a/test-suite/bugs/closed/4713.v
+++ b/test-suite/bugs/closed/bug_4713.v
diff --git a/test-suite/bugs/closed/4717.v b/test-suite/bugs/closed/bug_4717.v
index bd9bac37ef..bd9bac37ef 100644
--- a/test-suite/bugs/closed/4717.v
+++ b/test-suite/bugs/closed/bug_4717.v
diff --git a/test-suite/bugs/closed/4718.v b/test-suite/bugs/closed/bug_4718.v
index 12a4e8fc1a..12a4e8fc1a 100644
--- a/test-suite/bugs/closed/4718.v
+++ b/test-suite/bugs/closed/bug_4718.v
diff --git a/test-suite/bugs/closed/4720.v b/test-suite/bugs/closed/bug_4720.v
index 704331e784..704331e784 100644
--- a/test-suite/bugs/closed/4720.v
+++ b/test-suite/bugs/closed/bug_4720.v
diff --git a/test-suite/bugs/closed/4723.v b/test-suite/bugs/closed/bug_4723.v
index 5fb9696f3f..5fb9696f3f 100644
--- a/test-suite/bugs/closed/4723.v
+++ b/test-suite/bugs/closed/bug_4723.v
diff --git a/test-suite/bugs/closed/4725.v b/test-suite/bugs/closed/bug_4725.v
index fd5e0fb60d..fd5e0fb60d 100644
--- a/test-suite/bugs/closed/4725.v
+++ b/test-suite/bugs/closed/bug_4725.v
diff --git a/test-suite/bugs/closed/4726.v b/test-suite/bugs/closed/bug_4726.v
index 0037b6fdea..cb87e9e409 100644
--- a/test-suite/bugs/closed/4726.v
+++ b/test-suite/bugs/closed/bug_4726.v
@@ -2,7 +2,7 @@ Set Universe Polymorphism.
 
 Definition le@{i j} : Type@{j} :=
   (fun A : Type@{j} => A)
-  (unit : Type@{i}).  
+  (unit : Type@{i}).
 Definition eq@{i j} : Type@{j} := let x := le@{i j} in le@{j i}.
 
 Record Inj@{i j} (A : Type@{i}) (B : Type@{j}) : Type@{j} :=
diff --git a/test-suite/bugs/closed/4737.v b/test-suite/bugs/closed/bug_4737.v
index 84ed45e454..84ed45e454 100644
--- a/test-suite/bugs/closed/4737.v
+++ b/test-suite/bugs/closed/bug_4737.v
diff --git a/test-suite/bugs/closed/4745.v b/test-suite/bugs/closed/bug_4745.v
index c090125e64..c090125e64 100644
--- a/test-suite/bugs/closed/4745.v
+++ b/test-suite/bugs/closed/bug_4745.v
diff --git a/test-suite/bugs/closed/4746.v b/test-suite/bugs/closed/bug_4746.v
index d64cc6fe68..d64cc6fe68 100644
--- a/test-suite/bugs/closed/4746.v
+++ b/test-suite/bugs/closed/bug_4746.v
diff --git a/test-suite/bugs/closed/4754.v b/test-suite/bugs/closed/bug_4754.v
index 67d645a68f..67d645a68f 100644
--- a/test-suite/bugs/closed/4754.v
+++ b/test-suite/bugs/closed/bug_4754.v
diff --git a/test-suite/bugs/closed/4762.v b/test-suite/bugs/closed/bug_4762.v
index 7a87b07a8e..62e2abbf98 100644
--- a/test-suite/bugs/closed/4762.v
+++ b/test-suite/bugs/closed/bug_4762.v
@@ -21,4 +21,3 @@ Proof.
   intros.
   eauto with test2. (* works *)
 Qed.
-
diff --git a/test-suite/bugs/closed/4763.v b/test-suite/bugs/closed/bug_4763.v
index 9613b5c248..9613b5c248 100644
--- a/test-suite/bugs/closed/4763.v
+++ b/test-suite/bugs/closed/bug_4763.v
diff --git a/test-suite/bugs/closed/4764.v b/test-suite/bugs/closed/bug_4764.v
index e545cc1b71..e545cc1b71 100644
--- a/test-suite/bugs/closed/4764.v
+++ b/test-suite/bugs/closed/bug_4764.v
diff --git a/test-suite/bugs/closed/4769.v b/test-suite/bugs/closed/bug_4769.v
index f0c91f7b49..34ce03d231 100644
--- a/test-suite/bugs/closed/4769.v
+++ b/test-suite/bugs/closed/bug_4769.v
@@ -70,7 +70,7 @@ Section Adjunction.
   Variables C D : PreCategory.
   Variable F : Functor C D.
   Variable G : Functor D C.
-  
+
   Record AdjunctionHom :=
     {
       mate_of : @NaturalIsomorphism
diff --git a/test-suite/bugs/closed/4772.v b/test-suite/bugs/closed/bug_4772.v
index c3109fa31c..c3109fa31c 100644
--- a/test-suite/bugs/closed/4772.v
+++ b/test-suite/bugs/closed/bug_4772.v
diff --git a/test-suite/bugs/closed/4780.v b/test-suite/bugs/closed/bug_4780.v
index 71a51c6312..7ed56d2179 100644
--- a/test-suite/bugs/closed/4780.v
+++ b/test-suite/bugs/closed/bug_4780.v
@@ -103,4 +103,3 @@ Proof.
   induction p0.
   admit.
 Defined.
-
diff --git a/test-suite/bugs/closed/4782.v b/test-suite/bugs/closed/bug_4782.v
index 1e1a4cb9c2..be17a96f15 100644
--- a/test-suite/bugs/closed/4782.v
+++ b/test-suite/bugs/closed/bug_4782.v
@@ -7,7 +7,7 @@ Inductive p : Prop := consp : forall (e : r) (x : type e), cond e x -> p.
 Goal p.
 Fail apply consp with (fun _ : bool => mk_r unit (fun x => True)) nil.
 Abort.
- 
+
 (* A simplification of an example from coquelicot, which was failing
    at some time after a fix #4782 was committed. *)
 
@@ -23,4 +23,3 @@ Goal forall (A:T) (x:dom A), pairT A A = pairT A A.
 intros.
 apply (F _ _)  with (x,x).
 Abort.
-  
diff --git a/test-suite/bugs/closed/4785.v b/test-suite/bugs/closed/bug_4785.v
index 0d347b262d..0d347b262d 100644
--- a/test-suite/bugs/closed/4785.v
+++ b/test-suite/bugs/closed/bug_4785.v
diff --git a/test-suite/bugs/closed/4787.v b/test-suite/bugs/closed/bug_4787.v
index b586cba50f..a1444a4f63 100644
--- a/test-suite/bugs/closed/4787.v
+++ b/test-suite/bugs/closed/bug_4787.v
@@ -5,5 +5,3 @@ Unset Bracketing Last Introduction Pattern.
 Goal forall T (x y : T * T), fst x = fst y /\ snd x = snd y -> x = y.
 do 10 ((intros [] || intro); simpl); reflexivity.
 Qed.
-
-
diff --git a/test-suite/bugs/closed/4798.v b/test-suite/bugs/closed/bug_4798.v
index 41a1251ca5..41a1251ca5 100644
--- a/test-suite/bugs/closed/4798.v
+++ b/test-suite/bugs/closed/bug_4798.v
diff --git a/test-suite/bugs/closed/4811.v b/test-suite/bugs/closed/bug_4811.v
index fe6e65a0f0..fe6e65a0f0 100644
--- a/test-suite/bugs/closed/4811.v
+++ b/test-suite/bugs/closed/bug_4811.v
diff --git a/test-suite/bugs/closed/4813.v b/test-suite/bugs/closed/bug_4813.v
index 5f8ea74c1a..5f8ea74c1a 100644
--- a/test-suite/bugs/closed/4813.v
+++ b/test-suite/bugs/closed/bug_4813.v
diff --git a/test-suite/bugs/closed/4816.v b/test-suite/bugs/closed/bug_4816.v
index 00a523842e..00a523842e 100644
--- a/test-suite/bugs/closed/4816.v
+++ b/test-suite/bugs/closed/bug_4816.v
diff --git a/test-suite/bugs/closed/4818.v b/test-suite/bugs/closed/bug_4818.v
index e411ce62f0..7dc6e65725 100644
--- a/test-suite/bugs/closed/4818.v
+++ b/test-suite/bugs/closed/bug_4818.v
@@ -15,7 +15,7 @@ Goal GCov (IS * S) -> GCov IS.
 intros X0. induction X0; intros.
 destruct i.
 specialize (locS i).
-clear -locS. 
+clear -locS.
 destruct locS. Show Universes.
 Admitted.
 
diff --git a/test-suite/bugs/closed/4844.v b/test-suite/bugs/closed/bug_4844.v
index f140939ccd..f140939ccd 100644
--- a/test-suite/bugs/closed/4844.v
+++ b/test-suite/bugs/closed/bug_4844.v
diff --git a/test-suite/bugs/closed/4852.v b/test-suite/bugs/closed/bug_4852.v
index 5068ed9b95..e2e00f05d3 100644
--- a/test-suite/bugs/closed/4852.v
+++ b/test-suite/bugs/closed/bug_4852.v
@@ -51,4 +51,3 @@ Extraction Inline wfi_lt.
 Extraction Implicit wfi_lt [1 3].
 Recursive Extraction join. (* was: Error: An implicit occurs after extraction *)
 Extraction TestCompile join.
-
diff --git a/test-suite/bugs/closed/4858.v b/test-suite/bugs/closed/bug_4858.v
index a2fa93832a..a2fa93832a 100644
--- a/test-suite/bugs/closed/4858.v
+++ b/test-suite/bugs/closed/bug_4858.v
diff --git a/test-suite/bugs/closed/4859.v b/test-suite/bugs/closed/bug_4859.v
index 7be0bedcfc..7be0bedcfc 100644
--- a/test-suite/bugs/closed/4859.v
+++ b/test-suite/bugs/closed/bug_4859.v
diff --git a/test-suite/bugs/closed/4863.v b/test-suite/bugs/closed/bug_4863.v
index 1e47f2957b..be2be5683e 100644
--- a/test-suite/bugs/closed/4863.v
+++ b/test-suite/bugs/closed/bug_4863.v
@@ -21,7 +21,7 @@ Check ltac:(abstract (exact I)) : True.
 
 Goal forall (a b : Foo), Decidable (a=b) * Decidable (a=b).
 intros.
-split. typeclasses eauto. 
+split. typeclasses eauto.
 typeclasses eauto. Qed.
 
 Goal forall (a b : Foo), Decidable (a=b) * Decidable (a=b).
diff --git a/test-suite/bugs/closed/4865.v b/test-suite/bugs/closed/bug_4865.v
index da4e53aab0..4fd55d1c62 100644
--- a/test-suite/bugs/closed/4865.v
+++ b/test-suite/bugs/closed/bug_4865.v
@@ -44,7 +44,7 @@ Fail Check g 0 0 1. (* 2nd 0 in bool *)
 
 (* Another test on arguments scopes: checking scope for expanding arities *)
 (* Not sure this is very useful, but why not *)
-                  
+
 Fixpoint arr n := match n with 0%nat => nat | S n => nat -> arr n end.
 Fixpoint lam n : arr n := match n with 0%nat => 0%nat | S n => fun x => lam n  end.
 Notation "0" := true.
diff --git a/test-suite/bugs/closed/4869.v b/test-suite/bugs/closed/bug_4869.v
index ac5d7ea287..ac5d7ea287 100644
--- a/test-suite/bugs/closed/4869.v
+++ b/test-suite/bugs/closed/bug_4869.v
diff --git a/test-suite/bugs/closed/4873.v b/test-suite/bugs/closed/bug_4873.v
index 39299883ad..39299883ad 100644
--- a/test-suite/bugs/closed/4873.v
+++ b/test-suite/bugs/closed/bug_4873.v
diff --git a/test-suite/bugs/closed/4877.v b/test-suite/bugs/closed/bug_4877.v
index 7d153d9828..7d153d9828 100644
--- a/test-suite/bugs/closed/4877.v
+++ b/test-suite/bugs/closed/bug_4877.v
diff --git a/test-suite/bugs/closed/4880.v b/test-suite/bugs/closed/bug_4880.v
index 5569798d54..5569798d54 100644
--- a/test-suite/bugs/closed/4880.v
+++ b/test-suite/bugs/closed/bug_4880.v
diff --git a/test-suite/bugs/closed/4893.v b/test-suite/bugs/closed/bug_4893.v
index 9a35bcf954..9a35bcf954 100644
--- a/test-suite/bugs/closed/4893.v
+++ b/test-suite/bugs/closed/bug_4893.v
diff --git a/test-suite/bugs/closed/4904.v b/test-suite/bugs/closed/bug_4904.v
index a47c3b07a9..a47c3b07a9 100644
--- a/test-suite/bugs/closed/4904.v
+++ b/test-suite/bugs/closed/bug_4904.v
diff --git a/test-suite/bugs/closed/4932.v b/test-suite/bugs/closed/bug_4932.v
index 219d532ac6..219d532ac6 100644
--- a/test-suite/bugs/closed/4932.v
+++ b/test-suite/bugs/closed/bug_4932.v
diff --git a/test-suite/bugs/closed/4955.v b/test-suite/bugs/closed/bug_4955.v
index dce1f764c3..cadc6e5da1 100644
--- a/test-suite/bugs/closed/4955.v
+++ b/test-suite/bugs/closed/bug_4955.v
@@ -6,18 +6,18 @@ Notation "( x ; y )" := (existT _ x y) : fibration_scope.
 Open Scope fibration_scope.
 Notation "p @ q" := (eq_trans p q) (at level 20).
 Notation "p ^" := (eq_sym p) (at level 3).
-Definition transport {A : Type} (P : A -> Type) {x y : A} (p : x = y) (u : P x) 
+Definition transport {A : Type} (P : A -> Type) {x y : A} (p : x = y) (u : P x)
 : P y :=
   match p with eq_refl => u end.
-Notation "p # x" := (transport _ p x) (right associativity, at level 65, only 
+Notation "p # x" := (transport _ p x) (right associativity, at level 65, only
 parsing).
 Definition ap {A B:Type} (f:A -> B) {x y:A} (p:x = y) : f x = f y
   := match p with eq_refl => eq_refl end.
-Definition apD {A:Type} {B:A->Type} (f:forall a:A, B a) {x y:A} (p:x=y): p # (f 
+Definition apD {A:Type} {B:A->Type} (f:forall a:A, B a) {x y:A} (p:x=y): p # (f
 x) = f y
   := match p with eq_refl => eq_refl end.
 Axiom transport_compose
-  : forall {A B} {x y : A} (P : B -> Type) (f : A -> B) (p : x = y) (z : P (f 
+  : forall {A B} {x y : A} (P : B -> Type) (f : A -> B) (p : x = y) (z : P (f
 x)),
     transport (fun x => P (f x)) p z  =  transport P (ap f p) z.
 Delimit Scope morphism_scope with morphism.
@@ -27,11 +27,11 @@ Record PreCategory := { object :> Type ; morphism : object -> object -> Type }.
 Delimit Scope functor_scope with functor.
 Record Functor (C D : PreCategory) :=
   { object_of :> C -> D;
-    morphism_of : forall s d, morphism C s d -> morphism D (object_of s) 
+    morphism_of : forall s d, morphism C s d -> morphism D (object_of s)
 (object_of d) }.
-Arguments object_of {C%category D%category} f%functor c%object : rename, simpl 
+Arguments object_of {C%category D%category} f%functor c%object : rename, simpl
 nomatch.
-Arguments morphism_of [C%category] [D%category] f%functor [s%object d%object] 
+Arguments morphism_of [C%category] [D%category] f%functor [s%object d%object]
 m%morphism : rename, simpl nomatch.
 Section path_functor.
   Variable C : PreCategory.
@@ -39,13 +39,13 @@ Section path_functor.
 
   Local Notation path_functor'_T F G
     := { HO : object_of F = object_of G
-       | transport (fun GO => forall s d, morphism C s d -> morphism D (GO s) 
+       | transport (fun GO => forall s d, morphism C s d -> morphism D (GO s)
 (GO d))
                    HO
                    (morphism_of F)
          = morphism_of G }
          (only parsing).
-  Definition path_functor'_sig_inv (F G : Functor C D) : F = G -> 
+  Definition path_functor'_sig_inv (F G : Functor C D) : F = G ->
 path_functor'_T F G
     := fun H'
        => (ap object_of H';
@@ -62,20 +62,20 @@ Notation "( x ; y )" := (existT _ x y).
 Notation "p @ q" := (eq_trans p q) (at level 20).
 Notation "p ^" := (eq_sym p) (at level 3).
 Axiom transport : forall {A : Type} (P : A -> Type) {x y : A} (p : x = y) (u : P x), P y.
-Notation "p # x" := (transport _ p x) (right associativity, at level 65, only 
+Notation "p # x" := (transport _ p x) (right associativity, at level 65, only
 parsing).
 Definition ap {A B:Type} (f:A -> B) {x y:A} (p:x = y) : f x = f y
   := match p with eq_refl => eq_refl end.
-Axiom apD : forall {A:Type} {B:A->Type} (f:forall a:A, B a) {x y:A} (p:x=y), p # (f 
+Axiom apD : forall {A:Type} {B:A->Type} (f:forall a:A, B a) {x y:A} (p:x=y), p # (f
 x) = f y.
 Axiom transport_compose
-  : forall {A B} {x y : A} (P : B -> Type) (f : A -> B) (p : x = y) (z : P (f 
+  : forall {A B} {x y : A} (P : B -> Type) (f : A -> B) (p : x = y) (z : P (f
 x)),
     transport (fun x => P (f x)) p z  =  transport P (ap f p) z.
 Record PreCategory := { object :> Type ; morphism : object -> object -> Type }.
 Record Functor (C D : PreCategory) :=
   { object_of :> C -> D;
-    morphism_of : forall s d, morphism C s d -> morphism D (object_of s) 
+    morphism_of : forall s d, morphism C s d -> morphism D (object_of s)
 (object_of d) }.
 Arguments object_of {C D} f c : rename, simpl nomatch.
 Arguments morphism_of [C] [D] f [s d] m : rename, simpl nomatch.
@@ -83,12 +83,12 @@ Section path_functor.
   Variable C D : PreCategory.
   Local Notation path_functor'_T F G
     := { HO : object_of F = object_of G
-       | transport (fun GO => forall s d, morphism C s d -> morphism D (GO s) 
+       | transport (fun GO => forall s d, morphism C s d -> morphism D (GO s)
 (GO d))
                    HO
                    (morphism_of F)
          = morphism_of G }.
-  Definition path_functor'_sig_inv (F G : Functor C D) : F = G -> 
+  Definition path_functor'_sig_inv (F G : Functor C D) : F = G ->
 path_functor'_T F G
     := fun H'
        => (ap object_of H';
diff --git a/test-suite/bugs/closed/4957.v b/test-suite/bugs/closed/bug_4957.v
index 0efd87ac0d..0efd87ac0d 100644
--- a/test-suite/bugs/closed/4957.v
+++ b/test-suite/bugs/closed/bug_4957.v
diff --git a/test-suite/bugs/closed/4966.v b/test-suite/bugs/closed/bug_4966.v
index bd93cdc858..bd93cdc858 100644
--- a/test-suite/bugs/closed/4966.v
+++ b/test-suite/bugs/closed/bug_4966.v
diff --git a/test-suite/bugs/closed/4969.v b/test-suite/bugs/closed/bug_4969.v
index 4dee41e221..4dee41e221 100644
--- a/test-suite/bugs/closed/4969.v
+++ b/test-suite/bugs/closed/bug_4969.v
diff --git a/test-suite/bugs/closed/4970.v b/test-suite/bugs/closed/bug_4970.v
index 7a896582f5..7a896582f5 100644
--- a/test-suite/bugs/closed/4970.v
+++ b/test-suite/bugs/closed/bug_4970.v
diff --git a/test-suite/bugs/closed/5011.v b/test-suite/bugs/closed/bug_5011.v
index c3043ca5d1..c3043ca5d1 100644
--- a/test-suite/bugs/closed/5011.v
+++ b/test-suite/bugs/closed/bug_5011.v
diff --git a/test-suite/bugs/closed/5012.v b/test-suite/bugs/closed/bug_5012.v
index 5326c0fbb1..5326c0fbb1 100644
--- a/test-suite/bugs/closed/5012.v
+++ b/test-suite/bugs/closed/bug_5012.v
diff --git a/test-suite/bugs/closed/5019.v b/test-suite/bugs/closed/bug_5019.v
index 7c973f88b5..7c973f88b5 100644
--- a/test-suite/bugs/closed/5019.v
+++ b/test-suite/bugs/closed/bug_5019.v
diff --git a/test-suite/bugs/closed/5036.v b/test-suite/bugs/closed/bug_5036.v
index 83f1677455..83f1677455 100644
--- a/test-suite/bugs/closed/5036.v
+++ b/test-suite/bugs/closed/bug_5036.v
diff --git a/test-suite/bugs/closed/5043.v b/test-suite/bugs/closed/bug_5043.v
index 4e6a0f878f..4e6a0f878f 100644
--- a/test-suite/bugs/closed/5043.v
+++ b/test-suite/bugs/closed/bug_5043.v
diff --git a/test-suite/bugs/closed/5045.v b/test-suite/bugs/closed/bug_5045.v
index dc38738d8f..dc38738d8f 100644
--- a/test-suite/bugs/closed/5045.v
+++ b/test-suite/bugs/closed/bug_5045.v
diff --git a/test-suite/bugs/closed/5065.v b/test-suite/bugs/closed/bug_5065.v
index 932fee8b3b..932fee8b3b 100644
--- a/test-suite/bugs/closed/5065.v
+++ b/test-suite/bugs/closed/bug_5065.v
diff --git a/test-suite/bugs/closed/5066.v b/test-suite/bugs/closed/bug_5066.v
index eed7f0f3ff..eed7f0f3ff 100644
--- a/test-suite/bugs/closed/5066.v
+++ b/test-suite/bugs/closed/bug_5066.v
diff --git a/test-suite/bugs/closed/5077.v b/test-suite/bugs/closed/bug_5077.v
index 7e7f2c3737..dee321c027 100644
--- a/test-suite/bugs/closed/5077.v
+++ b/test-suite/bugs/closed/bug_5077.v
@@ -5,4 +5,4 @@ Definition foo_denote {n} (x : foo n) : Type := match x with end.
 
 Definition baz : forall n (x : foo n), foo_denote x.
 refine (fix go n (x : foo n) : foo_denote x := _).
-Abort.  
+Abort.
diff --git a/test-suite/bugs/closed/5078.v b/test-suite/bugs/closed/bug_5078.v
index ca73cbcc18..ca73cbcc18 100644
--- a/test-suite/bugs/closed/5078.v
+++ b/test-suite/bugs/closed/bug_5078.v
diff --git a/test-suite/bugs/closed/5093.v b/test-suite/bugs/closed/bug_5093.v
index 3ded4dd304..3ded4dd304 100644
--- a/test-suite/bugs/closed/5093.v
+++ b/test-suite/bugs/closed/bug_5093.v
diff --git a/test-suite/bugs/closed/5095.v b/test-suite/bugs/closed/bug_5095.v
index b6f38e3e84..b6f38e3e84 100644
--- a/test-suite/bugs/closed/5095.v
+++ b/test-suite/bugs/closed/bug_5095.v
diff --git a/test-suite/bugs/closed/5096.v b/test-suite/bugs/closed/bug_5096.v
index 20a537ab3c..20a537ab3c 100644
--- a/test-suite/bugs/closed/5096.v
+++ b/test-suite/bugs/closed/bug_5096.v
diff --git a/test-suite/bugs/closed/5097.v b/test-suite/bugs/closed/bug_5097.v
index 37b239cf61..37b239cf61 100644
--- a/test-suite/bugs/closed/5097.v
+++ b/test-suite/bugs/closed/bug_5097.v
diff --git a/test-suite/bugs/closed/5123.v b/test-suite/bugs/closed/bug_5123.v
index 17231bffcf..17231bffcf 100644
--- a/test-suite/bugs/closed/5123.v
+++ b/test-suite/bugs/closed/bug_5123.v
diff --git a/test-suite/bugs/closed/5127.v b/test-suite/bugs/closed/bug_5127.v
index 831e8fb507..831e8fb507 100644
--- a/test-suite/bugs/closed/5127.v
+++ b/test-suite/bugs/closed/bug_5127.v
diff --git a/test-suite/bugs/closed/5145.v b/test-suite/bugs/closed/bug_5145.v
index 0533d21e0c..0533d21e0c 100644
--- a/test-suite/bugs/closed/5145.v
+++ b/test-suite/bugs/closed/bug_5145.v
diff --git a/test-suite/bugs/closed/5149.v b/test-suite/bugs/closed/bug_5149.v
index 684dba1961..ae32217057 100644
--- a/test-suite/bugs/closed/5149.v
+++ b/test-suite/bugs/closed/bug_5149.v
@@ -5,35 +5,35 @@ rewrite <- H.
 eassumption.
 Qed.
 
-Goal forall (base_type_code : Type) (t : base_type_code) (flat_type : Type) 
-            (t' : flat_type) (exprf interp_flat_type0 interp_flat_type1 : 
+Goal forall (base_type_code : Type) (t : base_type_code) (flat_type : Type)
+            (t' : flat_type) (exprf interp_flat_type0 interp_flat_type1 :
 flat_type -> Type)
             (v v' : interp_flat_type1 t'),
     v = v' ->
     forall (interpf : forall t0 : flat_type, exprf t0 -> interp_flat_type1 t0)
-           (SmartVarVar : forall t0 : flat_type, interp_flat_type1 t0 -> 
+           (SmartVarVar : forall t0 : flat_type, interp_flat_type1 t0 ->
 interp_flat_type0 t0)
            (Tbase : base_type_code -> flat_type) (x : exprf (Tbase t))
            (x' : interp_flat_type1 (Tbase t)) (T : Type)
            (flatten_binding_list : forall t0 : flat_type,
                interp_flat_type0 t0 -> interp_flat_type1 t0 -> list T)
            (P : T -> list T -> Prop) (prod : Type -> Type -> Type)
-           (s : forall x0 : base_type_code, prod (exprf (Tbase x0)) 
+           (s : forall x0 : base_type_code, prod (exprf (Tbase x0))
 (interp_flat_type1 (Tbase x0)) -> T)
            (pair : forall A B : Type, A -> B -> prod A B),
       P (s t (pair (exprf (Tbase t)) (interp_flat_type1 (Tbase t)) x x'))
         (flatten_binding_list t' (SmartVarVar t' v') v) ->
-      (forall (t0 : base_type_code) (t'0 : flat_type) (v0 : interp_flat_type1 
+      (forall (t0 : base_type_code) (t'0 : flat_type) (v0 : interp_flat_type1
 t'0)
               (x0 : exprf (Tbase t0)) (x'0 : interp_flat_type1 (Tbase t0)),
-          P (s t0 (pair (exprf (Tbase t0)) (interp_flat_type1 (Tbase t0)) x0 
+          P (s t0 (pair (exprf (Tbase t0)) (interp_flat_type1 (Tbase t0)) x0
 x'0))
-            (flatten_binding_list t'0 (SmartVarVar t'0 v0) v0) -> interpf 
+            (flatten_binding_list t'0 (SmartVarVar t'0 v0) v0) -> interpf
 (Tbase t0) x0 = x'0) ->
       interpf (Tbase t) x = x'.
 Proof.
   intros ?????????????????????? interpf_SmartVarVar.
-  solve [ unshelve (subst; eapply interpf_SmartVarVar; eassumption) ] || fail 
+  solve [ unshelve (subst; eapply interpf_SmartVarVar; eassumption) ] || fail
 "too early".
   Undo.
   (** Implicitely at the dot. The first fails because unshelve adds a goal, and solve hence fails. The second has an ambiant unification problem that is solved after solve *)
@@ -44,4 +44,3 @@ Proof.
   (* User control of when constraints are solved *)
   solve [ unshelve (eapply interpf_SmartVarVar; subst; eassumption); solve_constraints ].
 Qed.
-
diff --git a/test-suite/bugs/closed/5153.v b/test-suite/bugs/closed/bug_5153.v
index be6407b5fa..be6407b5fa 100644
--- a/test-suite/bugs/closed/5153.v
+++ b/test-suite/bugs/closed/bug_5153.v
diff --git a/test-suite/bugs/closed/5161.v b/test-suite/bugs/closed/bug_5161.v
index d28303b8ab..d28303b8ab 100644
--- a/test-suite/bugs/closed/5161.v
+++ b/test-suite/bugs/closed/bug_5161.v
diff --git a/test-suite/bugs/closed/5177.v b/test-suite/bugs/closed/bug_5177.v
index 7c8af1e46e..7c8af1e46e 100644
--- a/test-suite/bugs/closed/5177.v
+++ b/test-suite/bugs/closed/bug_5177.v
diff --git a/test-suite/bugs/closed/5180.v b/test-suite/bugs/closed/bug_5180.v
index 05603a048c..05603a048c 100644
--- a/test-suite/bugs/closed/5180.v
+++ b/test-suite/bugs/closed/bug_5180.v
diff --git a/test-suite/bugs/closed/5181.v b/test-suite/bugs/closed/bug_5181.v
index 0e6d471979..89f54e1bec 100644
--- a/test-suite/bugs/closed/5181.v
+++ b/test-suite/bugs/closed/bug_5181.v
@@ -1,3 +1,2 @@
 Definition foo (x y : nat) := x.
 Fail Arguments foo {_} : assert.
-
diff --git a/test-suite/bugs/closed/5188.v b/test-suite/bugs/closed/bug_5188.v
index e29ebfb4ec..e29ebfb4ec 100644
--- a/test-suite/bugs/closed/5188.v
+++ b/test-suite/bugs/closed/bug_5188.v
diff --git a/test-suite/bugs/closed/5193.v b/test-suite/bugs/closed/bug_5193.v
index cc8739afe6..cc8739afe6 100644
--- a/test-suite/bugs/closed/5193.v
+++ b/test-suite/bugs/closed/bug_5193.v
diff --git a/test-suite/bugs/closed/5198.v b/test-suite/bugs/closed/bug_5198.v
index 72722f5f6d..5d4409f89b 100644
--- a/test-suite/bugs/closed/5198.v
+++ b/test-suite/bugs/closed/bug_5198.v
@@ -1,18 +1,18 @@
 (* -*- mode: coq; coq-prog-args: ("-boot" "-nois") -*- *)
-(* File reduced by coq-bug-finder from original input, then from 286 lines to 
-27 lines, then from 224 lines to 53 lines, then from 218 lines to 56 lines, 
-then from 269 lines to 180 lines, then from 132 lines to 48 lines, then from 
+(* File reduced by coq-bug-finder from original input, then from 286 lines to
+27 lines, then from 224 lines to 53 lines, then from 218 lines to 56 lines,
+then from 269 lines to 180 lines, then from 132 lines to 48 lines, then from
 253 lines to 65 lines, then from 79 lines to 65 lines *)
-(* coqc version 8.6.0 (November 2016) compiled on Nov 12 2016 14:43:52 with 
+(* coqc version 8.6.0 (November 2016) compiled on Nov 12 2016 14:43:52 with
 OCaml 4.02.3
-   coqtop version jgross-Leopard-WS:/home/jgross/Downloads/coq/coq-v8.6,v8.6 
+   coqtop version jgross-Leopard-WS:/home/jgross/Downloads/coq/coq-v8.6,v8.6
 (7e992fa784ee6fa48af8a2e461385c094985587d) *)
 Axiom admit : forall {T}, T.
 Set Printing Implicit.
 Inductive nat := O | S (_ : nat).
 Axiom f : forall (_ _ : nat), nat.
 Class ZLikeOps (e : nat)
-  := { LargeT : Type ; SmallT : Type ; CarryAdd : forall (_ _ : LargeT), LargeT 
+  := { LargeT : Type ; SmallT : Type ; CarryAdd : forall (_ _ : LargeT), LargeT
 }.
 Class BarrettParameters :=
   { b : nat ; k : nat ; ops : ZLikeOps (f b k) }.
diff --git a/test-suite/bugs/closed/5203.v b/test-suite/bugs/closed/bug_5203.v
index 3428e1a450..b0161cc530 100644
--- a/test-suite/bugs/closed/5203.v
+++ b/test-suite/bugs/closed/bug_5203.v
@@ -2,4 +2,3 @@ Goal True.
   Typeclasses eauto := debug.
   Fail solve [ typeclasses eauto ].
   Fail typeclasses eauto.
-  
diff --git a/test-suite/bugs/closed/5205.v b/test-suite/bugs/closed/bug_5205.v
index 406f37a4b1..406f37a4b1 100644
--- a/test-suite/bugs/closed/5205.v
+++ b/test-suite/bugs/closed/bug_5205.v
diff --git a/test-suite/bugs/closed/5208.v b/test-suite/bugs/closed/bug_5208.v
index b7a684a27c..b7a684a27c 100644
--- a/test-suite/bugs/closed/5208.v
+++ b/test-suite/bugs/closed/bug_5208.v
diff --git a/test-suite/bugs/closed/5215.v b/test-suite/bugs/closed/bug_5215.v
index ecf5291596..ecf5291596 100644
--- a/test-suite/bugs/closed/5215.v
+++ b/test-suite/bugs/closed/bug_5215.v
diff --git a/test-suite/bugs/closed/5215_2.v b/test-suite/bugs/closed/bug_5215_2.v
index 399947f00f..399947f00f 100644
--- a/test-suite/bugs/closed/5215_2.v
+++ b/test-suite/bugs/closed/bug_5215_2.v
diff --git a/test-suite/bugs/closed/5219.v b/test-suite/bugs/closed/bug_5219.v
index f7cec1a0cf..f7cec1a0cf 100644
--- a/test-suite/bugs/closed/5219.v
+++ b/test-suite/bugs/closed/bug_5219.v
diff --git a/test-suite/bugs/closed/5233.v b/test-suite/bugs/closed/bug_5233.v
index 06286c740d..06286c740d 100644
--- a/test-suite/bugs/closed/5233.v
+++ b/test-suite/bugs/closed/bug_5233.v
diff --git a/test-suite/bugs/closed/5245.v b/test-suite/bugs/closed/bug_5245.v
index e5bca5b5e4..e5bca5b5e4 100644
--- a/test-suite/bugs/closed/5245.v
+++ b/test-suite/bugs/closed/bug_5245.v
diff --git a/test-suite/bugs/closed/5255.v b/test-suite/bugs/closed/bug_5255.v
index 5daaf9edbf..5daaf9edbf 100644
--- a/test-suite/bugs/closed/5255.v
+++ b/test-suite/bugs/closed/bug_5255.v
diff --git a/test-suite/bugs/closed/5277.v b/test-suite/bugs/closed/bug_5277.v
index 7abc38bfce..449bb9b0a7 100644
--- a/test-suite/bugs/closed/5277.v
+++ b/test-suite/bugs/closed/bug_5277.v
@@ -7,5 +7,5 @@ End A1.
 
 Module A2.
   Inductive A (x : Type) := C (a : x).
-  Scheme Equality for A. 
+  Scheme Equality for A.
 End A2.
diff --git a/test-suite/bugs/closed/5281.v b/test-suite/bugs/closed/bug_5281.v
index 03bafdc9ae..03bafdc9ae 100644
--- a/test-suite/bugs/closed/5281.v
+++ b/test-suite/bugs/closed/bug_5281.v
diff --git a/test-suite/bugs/closed/5286.v b/test-suite/bugs/closed/bug_5286.v
index 98d4e5c968..98d4e5c968 100644
--- a/test-suite/bugs/closed/5286.v
+++ b/test-suite/bugs/closed/bug_5286.v
diff --git a/test-suite/bugs/closed/5300.v b/test-suite/bugs/closed/bug_5300.v
index 18202df508..18202df508 100644
--- a/test-suite/bugs/closed/5300.v
+++ b/test-suite/bugs/closed/bug_5300.v
diff --git a/test-suite/bugs/closed/5315.v b/test-suite/bugs/closed/bug_5315.v
index d8824bff87..7ecd511651 100644
--- a/test-suite/bugs/closed/5315.v
+++ b/test-suite/bugs/closed/bug_5315.v
@@ -7,4 +7,4 @@ Function dumb_nope (a:nat) {struct a} :=
   match (id (fun x => x)) a with O => O | S n' => dumb_nope n' end.
 
 (* This check is just present to ensure Function worked well *)
-Check R_dumb_nope_complete. 
+Check R_dumb_nope_complete.
diff --git a/test-suite/bugs/closed/5321.v b/test-suite/bugs/closed/bug_5321.v
index 03514e23b1..3c32a4cb4d 100644
--- a/test-suite/bugs/closed/5321.v
+++ b/test-suite/bugs/closed/bug_5321.v
@@ -10,7 +10,7 @@ Goal forall sz : nat,
     let sz' := sz in
     forall pf : sz = sz',
       let feq_refl := exist (fun x : nat => sz = x) sz' eq_refl in
-      let fpf := exist (fun x : nat => sz = x) sz' pf in feq_refl = fpf -> 
+      let fpf := exist (fun x : nat => sz = x) sz' pf in feq_refl = fpf ->
 proj2_sig feq_refl = proj2_sig fpf.
 Proof.
   intros.
diff --git a/test-suite/bugs/closed/5322.v b/test-suite/bugs/closed/bug_5322.v
index 01aec8f29b..01aec8f29b 100644
--- a/test-suite/bugs/closed/5322.v
+++ b/test-suite/bugs/closed/bug_5322.v
diff --git a/test-suite/bugs/closed/5323.v b/test-suite/bugs/closed/bug_5323.v
index 295b7cd9f5..dec423338c 100644
--- a/test-suite/bugs/closed/5323.v
+++ b/test-suite/bugs/closed/bug_5323.v
@@ -2,7 +2,7 @@
 
 Module A.
 Inductive flat_type := Unit | Prod (A B : flat_type).
-Inductive exprf (op : flat_type -> flat_type -> Type) {var : Type} : flat_type 
+Inductive exprf (op : flat_type -> flat_type -> Type) {var : Type} : flat_type
 -> Type :=
 | Op {t1 tR} (opc : op t1 tR) (args : exprf op t1) : exprf op tR.
 Inductive op : flat_type -> flat_type -> Type := .
diff --git a/test-suite/bugs/closed/5331.v b/test-suite/bugs/closed/bug_5331.v
index 28743736d3..901389e02e 100644
--- a/test-suite/bugs/closed/5331.v
+++ b/test-suite/bugs/closed/bug_5331.v
@@ -8,4 +8,3 @@ Fail intro H; ih H.
 intro H; ih' H ipattern:([]).
 exact I.
 Qed.
-
diff --git a/test-suite/bugs/closed/5345.v b/test-suite/bugs/closed/bug_5345.v
index d8448f35db..d8448f35db 100644
--- a/test-suite/bugs/closed/5345.v
+++ b/test-suite/bugs/closed/bug_5345.v
diff --git a/test-suite/bugs/closed/5346.v b/test-suite/bugs/closed/bug_5346.v
index 0118c18704..0118c18704 100644
--- a/test-suite/bugs/closed/5346.v
+++ b/test-suite/bugs/closed/bug_5346.v
diff --git a/test-suite/bugs/closed/5347.v b/test-suite/bugs/closed/bug_5347.v
index 9267b3eb69..9267b3eb69 100644
--- a/test-suite/bugs/closed/5347.v
+++ b/test-suite/bugs/closed/bug_5347.v
diff --git a/test-suite/bugs/closed/5359.v b/test-suite/bugs/closed/bug_5359.v
index 87e69565e3..a5a96db2c3 100644
--- a/test-suite/bugs/closed/5359.v
+++ b/test-suite/bugs/closed/bug_5359.v
@@ -10,7 +10,7 @@ Goal False.
         (Ring_polynom.PEmul
            (Ring_polynom.PEmul
               (Ring_polynom.PEmul (Ring_polynom.PEX Z 4) (Ring_polynom.PEX Z 2))
-              (Ring_polynom.PEX Z 5)) (Ring_polynom.PEX Z 3)) 
+              (Ring_polynom.PEX Z 5)) (Ring_polynom.PEX Z 3))
         (Ring_polynom.PEX Z 6))) ) in
   let power := constr:( N.one ) in
   let reified_givens := constr:(
@@ -92,7 +92,7 @@ Goal False.
                              (Ring_polynom.PEX Z 3)))) :: nil)%list ) in
     Nsatz.nsatz_compute
           (@cons _ (@Ring_polynom.PEc _ sugar) (@cons _ (@Ring_polynom.PEc _ nparams) (@cons _ (@Ring_polynom.PEpow _ reified_goal power) reified_givens))).
-  
+
   let sugar := constr:( 0%Z ) in
   let nparams := constr:( (-1)%Z ) in
   let reified_goal := constr:(
@@ -101,7 +101,7 @@ Goal False.
         (Ring_polynom.PEmul
            (Ring_polynom.PEmul
               (Ring_polynom.PEmul (Ring_polynom.PEX Z 4) (Ring_polynom.PEX Z 2))
-              (Ring_polynom.PEX Z 5)) (Ring_polynom.PEX Z 3)) 
+              (Ring_polynom.PEX Z 5)) (Ring_polynom.PEX Z 3))
         (Ring_polynom.PEX Z 6))) ) in
   let power := constr:( N.one ) in
   let reified_givens := constr:(
@@ -168,7 +168,7 @@ Goal False.
                        (Ring_polynom.PEmul
                           (Ring_polynom.PEmul
                              (Ring_polynom.PEmul (Ring_polynom.PEX Z 4)
-                                (Ring_polynom.PEX Z 2)) 
+                                (Ring_polynom.PEX Z 2))
                              (Ring_polynom.PEX Z 5)) (Ring_polynom.PEX Z 3))
                        (Ring_polynom.PEX Z 6))) (Ring_polynom.PEX Z 9))
               (Ring_polynom.PEc 1%Z)
diff --git a/test-suite/bugs/closed/5365.v b/test-suite/bugs/closed/bug_5365.v
index be360d24d2..be360d24d2 100644
--- a/test-suite/bugs/closed/5365.v
+++ b/test-suite/bugs/closed/bug_5365.v
diff --git a/test-suite/bugs/closed/5368.v b/test-suite/bugs/closed/bug_5368.v
index 410fe1707d..410fe1707d 100644
--- a/test-suite/bugs/closed/5368.v
+++ b/test-suite/bugs/closed/bug_5368.v
diff --git a/test-suite/bugs/closed/5372.v b/test-suite/bugs/closed/bug_5372.v
index e60244cd1d..e60244cd1d 100644
--- a/test-suite/bugs/closed/5372.v
+++ b/test-suite/bugs/closed/bug_5372.v
diff --git a/test-suite/bugs/closed/5377.v b/test-suite/bugs/closed/bug_5377.v
index 130d9f9abf..130d9f9abf 100644
--- a/test-suite/bugs/closed/5377.v
+++ b/test-suite/bugs/closed/bug_5377.v
diff --git a/test-suite/bugs/closed/5401.v b/test-suite/bugs/closed/bug_5401.v
index 95193b993b..95193b993b 100644
--- a/test-suite/bugs/closed/5401.v
+++ b/test-suite/bugs/closed/bug_5401.v
diff --git a/test-suite/bugs/closed/5414.v b/test-suite/bugs/closed/bug_5414.v
index 2522a274fb..2522a274fb 100644
--- a/test-suite/bugs/closed/5414.v
+++ b/test-suite/bugs/closed/bug_5414.v
diff --git a/test-suite/bugs/closed/5434.v b/test-suite/bugs/closed/bug_5434.v
index 5d2460face..5d2460face 100644
--- a/test-suite/bugs/closed/5434.v
+++ b/test-suite/bugs/closed/bug_5434.v
diff --git a/test-suite/bugs/closed/5435.v b/test-suite/bugs/closed/bug_5435.v
index 60ace5ce96..62e3b2a1a1 100644
--- a/test-suite/bugs/closed/5435.v
+++ b/test-suite/bugs/closed/bug_5435.v
@@ -1,2 +1 @@
 Definition foo (x : nat) := Eval native_compute in x.
-
diff --git a/test-suite/bugs/closed/5449.v b/test-suite/bugs/closed/bug_5449.v
index d7fc2aaa00..d7fc2aaa00 100644
--- a/test-suite/bugs/closed/5449.v
+++ b/test-suite/bugs/closed/bug_5449.v
diff --git a/test-suite/bugs/closed/5460.v b/test-suite/bugs/closed/bug_5460.v
index 50221cdd83..50221cdd83 100644
--- a/test-suite/bugs/closed/5460.v
+++ b/test-suite/bugs/closed/bug_5460.v
diff --git a/test-suite/bugs/closed/5470.v b/test-suite/bugs/closed/bug_5470.v
index 5b3984b6df..5b3984b6df 100644
--- a/test-suite/bugs/closed/5470.v
+++ b/test-suite/bugs/closed/bug_5470.v
diff --git a/test-suite/bugs/closed/5476.v b/test-suite/bugs/closed/bug_5476.v
index b2d9d943bc..7c0c2c1dfd 100644
--- a/test-suite/bugs/closed/5476.v
+++ b/test-suite/bugs/closed/bug_5476.v
@@ -1,9 +1,9 @@
 Require Setoid.
 
-Goal forall (P : Prop) (T : Type) (m m' : T) (T0 T1 : Type) (P2 : forall _ : 
-Prop, Prop) 
+Goal forall (P : Prop) (T : Type) (m m' : T) (T0 T1 : Type) (P2 : forall _ :
+Prop, Prop)
             (P0 : Set) (x0 : P0) (P1 : forall (_ : P0) (_ : T), Prop)
-            (P3 : forall (_ : forall (_ : P0) (_ : T0) (_ : Prop), Prop) (_ : 
+            (P3 : forall (_ : forall (_ : P0) (_ : T0) (_ : Prop), Prop) (_ :
 T) (_ : Prop), Prop)
             (o : forall _ : P0, option T1)
             (_ : P3
@@ -12,9 +12,9 @@ T) (_ : Prop), Prop)
                       | Some _ => True
                       | None => False
                       end) m' P) (_ : P2 (P1 x0 m))
-            (_ : forall (f : forall (_ : P0) (_ : T0) (_ : Prop), Prop) (m1 m2 
-: T) 
-                        (k : P0) (e : T0) (_ : P2 (P1 k m1)), iff (P3 f m2 P) 
+            (_ : forall (f : forall (_ : P0) (_ : T0) (_ : Prop), Prop) (m1 m2
+: T)
+                        (k : P0) (e : T0) (_ : P2 (P1 k m1)), iff (P3 f m2 P)
 (f k e (P3 f m1 P))), False.
 Proof.
   intros ???????????? H0 H H1.
diff --git a/test-suite/bugs/closed/5486.v b/test-suite/bugs/closed/bug_5486.v
index 390133162f..b1ddfe24bf 100644
--- a/test-suite/bugs/closed/5486.v
+++ b/test-suite/bugs/closed/bug_5486.v
@@ -1,12 +1,12 @@
 Axiom proof_admitted : False.
 Tactic Notation "admit" := abstract case proof_admitted.
 Goal forall (T : Type) (p : prod (prod T T) bool) (Fm : Set) (f : Fm) (k :
-									 forall _ : T, Fm),
+                                                                         forall _ : T, Fm),
     @eq Fm
-	(k
-	   match p return T with
-	   | pair p0 swap => fst p0
-	   end) f.
+        (k
+           match p return T with
+           | pair p0 swap => fst p0
+           end) f.
   intros.
   (* next statement failed in Bug 5486 *)
   match goal with
diff --git a/test-suite/bugs/closed/5487.v b/test-suite/bugs/closed/bug_5487.v
index 9b995f4503..9b995f4503 100644
--- a/test-suite/bugs/closed/5487.v
+++ b/test-suite/bugs/closed/bug_5487.v
diff --git a/test-suite/bugs/closed/5500.v b/test-suite/bugs/closed/bug_5500.v
index aa63e2ab0e..aa63e2ab0e 100644
--- a/test-suite/bugs/closed/5500.v
+++ b/test-suite/bugs/closed/bug_5500.v
diff --git a/test-suite/bugs/closed/5501.v b/test-suite/bugs/closed/bug_5501.v
index 24739a3658..24739a3658 100644
--- a/test-suite/bugs/closed/5501.v
+++ b/test-suite/bugs/closed/bug_5501.v
diff --git a/test-suite/bugs/closed/5522.v b/test-suite/bugs/closed/bug_5522.v
index 0fae9ede42..0fae9ede42 100644
--- a/test-suite/bugs/closed/5522.v
+++ b/test-suite/bugs/closed/bug_5522.v
diff --git a/test-suite/bugs/closed/5523.v b/test-suite/bugs/closed/bug_5523.v
index d7582a3797..d7582a3797 100644
--- a/test-suite/bugs/closed/5523.v
+++ b/test-suite/bugs/closed/bug_5523.v
diff --git a/test-suite/bugs/closed/5526.v b/test-suite/bugs/closed/bug_5526.v
index 88f219be30..88f219be30 100644
--- a/test-suite/bugs/closed/5526.v
+++ b/test-suite/bugs/closed/bug_5526.v
diff --git a/test-suite/bugs/closed/5532.v b/test-suite/bugs/closed/bug_5532.v
index ee5446e548..ee5446e548 100644
--- a/test-suite/bugs/closed/5532.v
+++ b/test-suite/bugs/closed/bug_5532.v
diff --git a/test-suite/bugs/closed/5539.v b/test-suite/bugs/closed/bug_5539.v
index 48e5568e9b..48e5568e9b 100644
--- a/test-suite/bugs/closed/5539.v
+++ b/test-suite/bugs/closed/bug_5539.v
diff --git a/test-suite/bugs/closed/5547.v b/test-suite/bugs/closed/bug_5547.v
index 79633f4893..79633f4893 100644
--- a/test-suite/bugs/closed/5547.v
+++ b/test-suite/bugs/closed/bug_5547.v
diff --git a/test-suite/bugs/closed/5550.v b/test-suite/bugs/closed/bug_5550.v
index bb1222489a..bb1222489a 100644
--- a/test-suite/bugs/closed/5550.v
+++ b/test-suite/bugs/closed/bug_5550.v
diff --git a/test-suite/bugs/closed/5578.v b/test-suite/bugs/closed/bug_5578.v
index b9f0bc45c6..19d36e635d 100644
--- a/test-suite/bugs/closed/5578.v
+++ b/test-suite/bugs/closed/bug_5578.v
@@ -1,5 +1,5 @@
 (* File reduced by coq-bug-finder from original input, then from 1549 lines to  298 lines, then from 277 lines to 133 lines, then from 985 lines to 138 lines,  then from 206 lines to 139 lines, then from 203 lines to 142 lines, then from  262 lines to 152 lines, then from 567 lines to 151 lines, then from 3746 lines  to 151 lines, then from 577 lines to 151 lines, then from 187 lines to 151  lines, thenfrom 981 lines to 940 lines, then from 938 lines to 175 lines, then  from 589 lines to 205 lines, then from 3797 lines to 205 lines, then from 628  lines to 206 lines, then from 238 lines to 205 lines, then from 1346 lines to  213 lines, then from 633 lines to 214 lines, then from 243 lines to 213 lines,  then from 5656 lines to 245 lines, then from 661 lines to 272 lines, then from  3856 lines to 352 lines, then from 1266 lines to 407 lines, then from 421 lines  to 406 lines, then from 424 lines to 91 lines, then from 105 lines to 91 lines,  then from 85 lines to 55 lines, then from 69 lines to 55 lines *)
-(* coqc version trunk (May 2017) compiled on May 30 2017 13:28:59 with OCaml 
+(* coqc version trunk (May 2017) compiled on May 30 2017 13:28:59 with OCaml
 4.02.3
    coqtop version jgross-Leopard-WS:/home/jgross/Downloads/coq/coq-trunk,trunk  (fd36c0451c26e44b1b7e93299d3367ad2d35fee3) *)
 
@@ -33,7 +33,7 @@ Goal forall (Rat : Set) (PositiveMap_t : Set -> Set)
          interp_type interp_term_fixed_t_x
          EqDec_interp_type ret_bool.
   assert (forall f adv' k
-                 (lem : forall (eta : nat) (evil_rands rands : PositiveMap_t 
+                 (lem : forall (eta : nat) (evil_rands rands : PositiveMap_t
 (interp_type_rand eta)),
                      (interp_term_fixed_t_x eta (adv eta evil_rands) rands
                                             ?= interp_term_fixed_t_x eta (adv  eta evil_rands) rands) = true),
@@ -45,7 +45,7 @@ Goal forall (Rat : Set) (PositiveMap_t : Set -> Set)
                           ret_bool (interp_term_fixed_t_x eta (adv' eta) rands  ?= interp_term_fixed_t_x eta (adv' eta) rands)))))).
   Undo.
   assert (forall f adv' k
-                 (lem : forall (eta : nat) (rands : PositiveMap_t 
+                 (lem : forall (eta : nat) (rands : PositiveMap_t
 (interp_type_rand eta)),
                      (interp_term_fixed_t_x eta (adv' eta) rands ?=  interp_term_fixed_t_x eta (adv' eta) rands) = true),
              (forall (eta : nat), Proper (respectful eq eq) (f eta))
diff --git a/test-suite/bugs/closed/5598.v b/test-suite/bugs/closed/bug_5598.v
index 55fef1a575..55fef1a575 100644
--- a/test-suite/bugs/closed/5598.v
+++ b/test-suite/bugs/closed/bug_5598.v
diff --git a/test-suite/bugs/closed/5608.v b/test-suite/bugs/closed/bug_5608.v
index f02eae69c2..7e1c2f2491 100644
--- a/test-suite/bugs/closed/5608.v
+++ b/test-suite/bugs/closed/bug_5608.v
@@ -9,22 +9,22 @@ Delimit Scope expr_scope with expr.
 Inductive base_type := TZ | TWord (logsz : nat).
 Inductive flat_type := Tbase (T : base_type) | Prod (A B : flat_type).
 Context {var : base_type -> Type}.
-Fixpoint interp_flat_type (interp_base_type : base_type -> Type) (t : 
+Fixpoint interp_flat_type (interp_base_type : base_type -> Type) (t :
 flat_type) :=
   match t with
   | Tbase t => interp_base_type t
-  | Prod x y => prod (interp_flat_type interp_base_type x) (interp_flat_type 
+  | Prod x y => prod (interp_flat_type interp_base_type x) (interp_flat_type
 interp_base_type y)
   end.
 Inductive exprf : flat_type -> Type :=
 | Var {t} (v : var t) : exprf (Tbase t)
-| LetIn {tx} (ex : exprf tx) {tC} (eC : interp_flat_type var tx -> exprf tC) : 
+| LetIn {tx} (ex : exprf tx) {tC} (eC : interp_flat_type var tx -> exprf tC) :
 exprf tC
 | Pair {tx} (ex : exprf tx) {ty} (ey : exprf ty) : exprf (Prod tx ty).
 Global Arguments Var {_} _.
 Global Arguments LetIn {_} _ {_} _.
 Global Arguments Pair {_} _ {_} _.
-Notation "T x [1] = { A } ; 'return' ( b0 , b1 , .. , b2 )" := (LetIn (tx:=T) A 
+Notation "T x [1] = { A } ; 'return' ( b0 , b1 , .. , b2 )" := (LetIn (tx:=T) A
 (fun x => Pair .. (Pair b0%expr b1%expr) .. b2%expr)) : expr_scope.
 Definition foo :=
   (fun x3 =>
diff --git a/test-suite/bugs/closed/5618.v b/test-suite/bugs/closed/bug_5618.v
index 47e0e92d2a..47e0e92d2a 100644
--- a/test-suite/bugs/closed/5618.v
+++ b/test-suite/bugs/closed/bug_5618.v
diff --git a/test-suite/bugs/closed/5641.v b/test-suite/bugs/closed/bug_5641.v
index 9f3246f33d..9f3246f33d 100644
--- a/test-suite/bugs/closed/5641.v
+++ b/test-suite/bugs/closed/bug_5641.v
diff --git a/test-suite/bugs/closed/5666.v b/test-suite/bugs/closed/bug_5666.v
index d55a6e57b4..d55a6e57b4 100644
--- a/test-suite/bugs/closed/5666.v
+++ b/test-suite/bugs/closed/bug_5666.v
diff --git a/test-suite/bugs/closed/5671.v b/test-suite/bugs/closed/bug_5671.v
index c9a085045a..c9a085045a 100644
--- a/test-suite/bugs/closed/5671.v
+++ b/test-suite/bugs/closed/bug_5671.v
diff --git a/test-suite/bugs/closed/5683.v b/test-suite/bugs/closed/bug_5683.v
index b5c6a48ec0..b5c6a48ec0 100644
--- a/test-suite/bugs/closed/5683.v
+++ b/test-suite/bugs/closed/bug_5683.v
diff --git a/test-suite/bugs/closed/5692.v b/test-suite/bugs/closed/bug_5692.v
index 4c8d464f19..4c8d464f19 100644
--- a/test-suite/bugs/closed/5692.v
+++ b/test-suite/bugs/closed/bug_5692.v
diff --git a/test-suite/bugs/closed/5696.v b/test-suite/bugs/closed/bug_5696.v
index a20ad1b4da..a20ad1b4da 100644
--- a/test-suite/bugs/closed/5696.v
+++ b/test-suite/bugs/closed/bug_5696.v
diff --git a/test-suite/bugs/closed/5697.v b/test-suite/bugs/closed/bug_5697.v
index c653f992af..c653f992af 100644
--- a/test-suite/bugs/closed/5697.v
+++ b/test-suite/bugs/closed/bug_5697.v
diff --git a/test-suite/bugs/closed/5707.v b/test-suite/bugs/closed/bug_5707.v
index 785844c66d..785844c66d 100644
--- a/test-suite/bugs/closed/5707.v
+++ b/test-suite/bugs/closed/bug_5707.v
diff --git a/test-suite/bugs/closed/5713.v b/test-suite/bugs/closed/bug_5713.v
index 9daf9647fc..9daf9647fc 100644
--- a/test-suite/bugs/closed/5713.v
+++ b/test-suite/bugs/closed/bug_5713.v
diff --git a/test-suite/bugs/closed/5717.v b/test-suite/bugs/closed/bug_5717.v
index 1bfd917d25..1bfd917d25 100644
--- a/test-suite/bugs/closed/5717.v
+++ b/test-suite/bugs/closed/bug_5717.v
diff --git a/test-suite/bugs/closed/5719.v b/test-suite/bugs/closed/bug_5719.v
index 0fad5f54ea..0fad5f54ea 100644
--- a/test-suite/bugs/closed/5719.v
+++ b/test-suite/bugs/closed/bug_5719.v
diff --git a/test-suite/bugs/closed/5726.v b/test-suite/bugs/closed/bug_5726.v
index 53ef473572..53ef473572 100644
--- a/test-suite/bugs/closed/5726.v
+++ b/test-suite/bugs/closed/bug_5726.v
diff --git a/test-suite/bugs/closed/5741.v b/test-suite/bugs/closed/bug_5741.v
index f6598f192d..f6598f192d 100644
--- a/test-suite/bugs/closed/5741.v
+++ b/test-suite/bugs/closed/bug_5741.v
diff --git a/test-suite/bugs/closed/5749.v b/test-suite/bugs/closed/bug_5749.v
index 81bfe351c5..81bfe351c5 100644
--- a/test-suite/bugs/closed/5749.v
+++ b/test-suite/bugs/closed/bug_5749.v
diff --git a/test-suite/bugs/closed/5750.v b/test-suite/bugs/closed/bug_5750.v
index 6d0e21f5d0..6d0e21f5d0 100644
--- a/test-suite/bugs/closed/5750.v
+++ b/test-suite/bugs/closed/bug_5750.v
diff --git a/test-suite/bugs/closed/5755.v b/test-suite/bugs/closed/bug_5755.v
index e07fdcf831..e07fdcf831 100644
--- a/test-suite/bugs/closed/5755.v
+++ b/test-suite/bugs/closed/bug_5755.v
diff --git a/test-suite/bugs/closed/5757.v b/test-suite/bugs/closed/bug_5757.v
index 0d0f2eed44..0d0f2eed44 100644
--- a/test-suite/bugs/closed/5757.v
+++ b/test-suite/bugs/closed/bug_5757.v
diff --git a/test-suite/bugs/closed/5761.v b/test-suite/bugs/closed/bug_5761.v
index 6f28d1981a..6f28d1981a 100644
--- a/test-suite/bugs/closed/5761.v
+++ b/test-suite/bugs/closed/bug_5761.v
diff --git a/test-suite/bugs/closed/5762.v b/test-suite/bugs/closed/bug_5762.v
index 55d36bd722..55d36bd722 100644
--- a/test-suite/bugs/closed/5762.v
+++ b/test-suite/bugs/closed/bug_5762.v
diff --git a/test-suite/bugs/closed/5765.v b/test-suite/bugs/closed/bug_5765.v
index 343ab49357..343ab49357 100644
--- a/test-suite/bugs/closed/5765.v
+++ b/test-suite/bugs/closed/bug_5765.v
diff --git a/test-suite/bugs/closed/5769.v b/test-suite/bugs/closed/bug_5769.v
index 42573aad87..42573aad87 100644
--- a/test-suite/bugs/closed/5769.v
+++ b/test-suite/bugs/closed/bug_5769.v
diff --git a/test-suite/bugs/closed/5786.v b/test-suite/bugs/closed/bug_5786.v
index 20301ec4f5..f25fcd3eb2 100644
--- a/test-suite/bugs/closed/5786.v
+++ b/test-suite/bugs/closed/bug_5786.v
@@ -24,6 +24,3 @@ Tactic Notation "myidtac5" ident(id) := idtac id.
 Goal True.
 myidtac5 foo.
 Abort.
-
-
-
diff --git a/test-suite/bugs/closed/5790.v b/test-suite/bugs/closed/bug_5790.v
index 6c93a3906e..6c93a3906e 100644
--- a/test-suite/bugs/closed/5790.v
+++ b/test-suite/bugs/closed/bug_5790.v
diff --git a/test-suite/bugs/closed/5797.v b/test-suite/bugs/closed/bug_5797.v
index ee5ec1fa6a..23d86a0a20 100644
--- a/test-suite/bugs/closed/5797.v
+++ b/test-suite/bugs/closed/bug_5797.v
@@ -210,4 +210,3 @@ Proof.
   rewrite IHt2.
   trivial.
 Abort. (* one goal still left *)
-
diff --git a/test-suite/bugs/closed/5845.v b/test-suite/bugs/closed/bug_5845.v
index ea3347a851..ea3347a851 100644
--- a/test-suite/bugs/closed/5845.v
+++ b/test-suite/bugs/closed/bug_5845.v
diff --git a/test-suite/bugs/closed/5940.v b/test-suite/bugs/closed/bug_5940.v
index 32c78b4b9e..32c55f667b 100644
--- a/test-suite/bugs/closed/5940.v
+++ b/test-suite/bugs/closed/bug_5940.v
@@ -9,4 +9,3 @@ Lemma PQ2 : forall n, P n -> Q n.
   rewrite PQ in H.
   trivial.
 Qed.
-
diff --git a/test-suite/bugs/closed/6070.v b/test-suite/bugs/closed/bug_6070.v
index 49b16f6254..49b16f6254 100644
--- a/test-suite/bugs/closed/6070.v
+++ b/test-suite/bugs/closed/bug_6070.v
diff --git a/test-suite/bugs/closed/6129.v b/test-suite/bugs/closed/bug_6129.v
index e4a2a2ba95..e4a2a2ba95 100644
--- a/test-suite/bugs/closed/6129.v
+++ b/test-suite/bugs/closed/bug_6129.v
diff --git a/test-suite/bugs/closed/6191.v b/test-suite/bugs/closed/bug_6191.v
index e0d912509b..e0d912509b 100644
--- a/test-suite/bugs/closed/6191.v
+++ b/test-suite/bugs/closed/bug_6191.v
diff --git a/test-suite/bugs/closed/6297.v b/test-suite/bugs/closed/bug_6297.v
index a28607058f..a28607058f 100644
--- a/test-suite/bugs/closed/6297.v
+++ b/test-suite/bugs/closed/bug_6297.v
diff --git a/test-suite/bugs/closed/6313.v b/test-suite/bugs/closed/bug_6313.v
index 4d263c5a82..4d263c5a82 100644
--- a/test-suite/bugs/closed/6313.v
+++ b/test-suite/bugs/closed/bug_6313.v
diff --git a/test-suite/bugs/closed/6323.v b/test-suite/bugs/closed/bug_6323.v
index fdc33befc6..fdc33befc6 100644
--- a/test-suite/bugs/closed/6323.v
+++ b/test-suite/bugs/closed/bug_6323.v
diff --git a/test-suite/bugs/closed/6378.v b/test-suite/bugs/closed/bug_6378.v
index 68ae7961dd..68ae7961dd 100644
--- a/test-suite/bugs/closed/6378.v
+++ b/test-suite/bugs/closed/bug_6378.v
diff --git a/test-suite/bugs/closed/6490.v b/test-suite/bugs/closed/bug_6490.v
index dcf9ff29ed..dcf9ff29ed 100644
--- a/test-suite/bugs/closed/6490.v
+++ b/test-suite/bugs/closed/bug_6490.v
diff --git a/test-suite/bugs/closed/6529.v b/test-suite/bugs/closed/bug_6529.v
index 8d90819998..8d90819998 100644
--- a/test-suite/bugs/closed/6529.v
+++ b/test-suite/bugs/closed/bug_6529.v
diff --git a/test-suite/bugs/closed/6534.v b/test-suite/bugs/closed/bug_6534.v
index f5013994c5..f5013994c5 100644
--- a/test-suite/bugs/closed/6534.v
+++ b/test-suite/bugs/closed/bug_6534.v
diff --git a/test-suite/bugs/closed/6617.v b/test-suite/bugs/closed/bug_6617.v
index 9cabd62d48..9cabd62d48 100644
--- a/test-suite/bugs/closed/6617.v
+++ b/test-suite/bugs/closed/bug_6617.v
diff --git a/test-suite/bugs/closed/6631.v b/test-suite/bugs/closed/bug_6631.v
index 100dc13fc8..100dc13fc8 100644
--- a/test-suite/bugs/closed/6631.v
+++ b/test-suite/bugs/closed/bug_6631.v
diff --git a/test-suite/bugs/closed/6634.v b/test-suite/bugs/closed/bug_6634.v
index 7f33afcc2f..7f33afcc2f 100644
--- a/test-suite/bugs/closed/6634.v
+++ b/test-suite/bugs/closed/bug_6634.v
diff --git a/test-suite/bugs/closed/6661.v b/test-suite/bugs/closed/bug_6661.v
index e88a3704d8..e88a3704d8 100644
--- a/test-suite/bugs/closed/6661.v
+++ b/test-suite/bugs/closed/bug_6661.v
diff --git a/test-suite/bugs/closed/6677.v b/test-suite/bugs/closed/bug_6677.v
index 99e47bb87c..99e47bb87c 100644
--- a/test-suite/bugs/closed/6677.v
+++ b/test-suite/bugs/closed/bug_6677.v
diff --git a/test-suite/bugs/closed/6770.v b/test-suite/bugs/closed/bug_6770.v
index 9bcc740830..9bcc740830 100644
--- a/test-suite/bugs/closed/6770.v
+++ b/test-suite/bugs/closed/bug_6770.v
diff --git a/test-suite/bugs/closed/6774.v b/test-suite/bugs/closed/bug_6774.v
index 9625af91f5..9625af91f5 100644
--- a/test-suite/bugs/closed/6774.v
+++ b/test-suite/bugs/closed/bug_6774.v
diff --git a/test-suite/bugs/closed/6775.v b/test-suite/bugs/closed/bug_6775.v
index 206df23bce..206df23bce 100644
--- a/test-suite/bugs/closed/6775.v
+++ b/test-suite/bugs/closed/bug_6775.v
diff --git a/test-suite/bugs/closed/6878.v b/test-suite/bugs/closed/bug_6878.v
index 70f1b3127a..70f1b3127a 100644
--- a/test-suite/bugs/closed/6878.v
+++ b/test-suite/bugs/closed/bug_6878.v
diff --git a/test-suite/bugs/closed/6910.v b/test-suite/bugs/closed/bug_6910.v
index 5167a5364a..5167a5364a 100644
--- a/test-suite/bugs/closed/6910.v
+++ b/test-suite/bugs/closed/bug_6910.v
diff --git a/test-suite/bugs/closed/6951.v b/test-suite/bugs/closed/bug_6951.v
index 419f8d7c4e..419f8d7c4e 100644
--- a/test-suite/bugs/closed/6951.v
+++ b/test-suite/bugs/closed/bug_6951.v
diff --git a/test-suite/bugs/closed/6956.v b/test-suite/bugs/closed/bug_6956.v
index ee21adbbfd..ee21adbbfd 100644
--- a/test-suite/bugs/closed/6956.v
+++ b/test-suite/bugs/closed/bug_6956.v
diff --git a/test-suite/bugs/closed/7011.v b/test-suite/bugs/closed/bug_7011.v
index 296e4e11e5..296e4e11e5 100644
--- a/test-suite/bugs/closed/7011.v
+++ b/test-suite/bugs/closed/bug_7011.v
diff --git a/test-suite/bugs/closed/7068.v b/test-suite/bugs/closed/bug_7068.v
index 9fadb195bf..9fadb195bf 100644
--- a/test-suite/bugs/closed/7068.v
+++ b/test-suite/bugs/closed/bug_7068.v
diff --git a/test-suite/bugs/closed/7076.v b/test-suite/bugs/closed/bug_7076.v
index 0abc88c282..0abc88c282 100644
--- a/test-suite/bugs/closed/7076.v
+++ b/test-suite/bugs/closed/bug_7076.v
diff --git a/test-suite/bugs/closed/7092.v b/test-suite/bugs/closed/bug_7092.v
index d90de8b932..d90de8b932 100644
--- a/test-suite/bugs/closed/7092.v
+++ b/test-suite/bugs/closed/bug_7092.v
diff --git a/test-suite/bugs/closed/7113.v b/test-suite/bugs/closed/bug_7113.v
index 976e60f20c..976e60f20c 100644
--- a/test-suite/bugs/closed/7113.v
+++ b/test-suite/bugs/closed/bug_7113.v
diff --git a/test-suite/bugs/closed/7195.v b/test-suite/bugs/closed/bug_7195.v
index ea97747ac9..ea97747ac9 100644
--- a/test-suite/bugs/closed/7195.v
+++ b/test-suite/bugs/closed/bug_7195.v
diff --git a/test-suite/bugs/closed/7333.v b/test-suite/bugs/closed/bug_7333.v
index fba5b9029d..fba5b9029d 100644
--- a/test-suite/bugs/closed/7333.v
+++ b/test-suite/bugs/closed/bug_7333.v
diff --git a/test-suite/bugs/closed/7392.v b/test-suite/bugs/closed/bug_7392.v
index cf465c6588..cf465c6588 100644
--- a/test-suite/bugs/closed/7392.v
+++ b/test-suite/bugs/closed/bug_7392.v
diff --git a/test-suite/bugs/closed/7421.v b/test-suite/bugs/closed/bug_7421.v
index afcdd35fcc..afcdd35fcc 100644
--- a/test-suite/bugs/closed/7421.v
+++ b/test-suite/bugs/closed/bug_7421.v
diff --git a/test-suite/bugs/closed/7462.v b/test-suite/bugs/closed/bug_7462.v
index 40ca39e38a..40ca39e38a 100644
--- a/test-suite/bugs/closed/7462.v
+++ b/test-suite/bugs/closed/bug_7462.v
diff --git a/test-suite/bugs/closed/7554.v b/test-suite/bugs/closed/bug_7554.v
index 12b0aa2cb5..12b0aa2cb5 100644
--- a/test-suite/bugs/closed/7554.v
+++ b/test-suite/bugs/closed/bug_7554.v
diff --git a/test-suite/bugs/closed/7615.v b/test-suite/bugs/closed/bug_7615.v
index cd8c4ad7df..cd8c4ad7df 100644
--- a/test-suite/bugs/closed/7615.v
+++ b/test-suite/bugs/closed/bug_7615.v
diff --git a/test-suite/bugs/closed/7631.v b/test-suite/bugs/closed/bug_7631.v
index 34eb8b8676..34eb8b8676 100644
--- a/test-suite/bugs/closed/7631.v
+++ b/test-suite/bugs/closed/bug_7631.v
diff --git a/test-suite/bugs/closed/7695.v b/test-suite/bugs/closed/bug_7695.v
index 42bdb076b6..42bdb076b6 100644
--- a/test-suite/bugs/closed/7695.v
+++ b/test-suite/bugs/closed/bug_7695.v
diff --git a/test-suite/bugs/closed/7700.v b/test-suite/bugs/closed/bug_7700.v
index 56f5481baa..56f5481baa 100644
--- a/test-suite/bugs/closed/7700.v
+++ b/test-suite/bugs/closed/bug_7700.v
diff --git a/test-suite/bugs/closed/7712.v b/test-suite/bugs/closed/bug_7712.v
index a4e9697fad..a4e9697fad 100644
--- a/test-suite/bugs/closed/7712.v
+++ b/test-suite/bugs/closed/bug_7712.v
diff --git a/test-suite/bugs/closed/7723.v b/test-suite/bugs/closed/bug_7723.v
index 2162901231..2162901231 100644
--- a/test-suite/bugs/closed/7723.v
+++ b/test-suite/bugs/closed/bug_7723.v
diff --git a/test-suite/bugs/closed/7754.v b/test-suite/bugs/closed/bug_7754.v
index 229df93773..229df93773 100644
--- a/test-suite/bugs/closed/7754.v
+++ b/test-suite/bugs/closed/bug_7754.v
diff --git a/test-suite/bugs/closed/7779.v b/test-suite/bugs/closed/bug_7779.v
index 78936b5958..78936b5958 100644
--- a/test-suite/bugs/closed/7779.v
+++ b/test-suite/bugs/closed/bug_7779.v
diff --git a/test-suite/bugs/closed/7780.v b/test-suite/bugs/closed/bug_7780.v
index 2318f4d6ec..2318f4d6ec 100644
--- a/test-suite/bugs/closed/7780.v
+++ b/test-suite/bugs/closed/bug_7780.v
diff --git a/test-suite/bugs/closed/7795.v b/test-suite/bugs/closed/bug_7795.v
index 5db0f81cc5..5db0f81cc5 100644
--- a/test-suite/bugs/closed/7795.v
+++ b/test-suite/bugs/closed/bug_7795.v
diff --git a/test-suite/bugs/closed/7811.v b/test-suite/bugs/closed/bug_7811.v
index fee330f22d..fee330f22d 100644
--- a/test-suite/bugs/closed/7811.v
+++ b/test-suite/bugs/closed/bug_7811.v
diff --git a/test-suite/bugs/closed/7854.v b/test-suite/bugs/closed/bug_7854.v
index ab1a29b632..ab1a29b632 100644
--- a/test-suite/bugs/closed/7854.v
+++ b/test-suite/bugs/closed/bug_7854.v
diff --git a/test-suite/bugs/closed/7867.v b/test-suite/bugs/closed/bug_7867.v
index d0c7902756..d0c7902756 100644
--- a/test-suite/bugs/closed/7867.v
+++ b/test-suite/bugs/closed/bug_7867.v
diff --git a/test-suite/bugs/closed/7900.v b/test-suite/bugs/closed/bug_7900.v
index 583ef0ef3b..583ef0ef3b 100644
--- a/test-suite/bugs/closed/7900.v
+++ b/test-suite/bugs/closed/bug_7900.v
diff --git a/test-suite/bugs/closed/7903.v b/test-suite/bugs/closed/bug_7903.v
index 55c7ee99a7..55c7ee99a7 100644
--- a/test-suite/bugs/closed/7903.v
+++ b/test-suite/bugs/closed/bug_7903.v
diff --git a/test-suite/bugs/closed/7967.v b/test-suite/bugs/closed/bug_7967.v
index 2c8855fd54..2c8855fd54 100644
--- a/test-suite/bugs/closed/7967.v
+++ b/test-suite/bugs/closed/bug_7967.v
diff --git a/test-suite/bugs/closed/8004.v b/test-suite/bugs/closed/bug_8004.v
index 818639997a..818639997a 100644
--- a/test-suite/bugs/closed/8004.v
+++ b/test-suite/bugs/closed/bug_8004.v
diff --git a/test-suite/bugs/closed/8081.v b/test-suite/bugs/closed/bug_8081.v
index 0f2501aaa8..0f2501aaa8 100644
--- a/test-suite/bugs/closed/8081.v
+++ b/test-suite/bugs/closed/bug_8081.v
diff --git a/test-suite/bugs/closed/808_2411.v b/test-suite/bugs/closed/bug_808_2411.v
index 1169b2036b..1169b2036b 100644
--- a/test-suite/bugs/closed/808_2411.v
+++ b/test-suite/bugs/closed/bug_808_2411.v
diff --git a/test-suite/bugs/closed/8106.v b/test-suite/bugs/closed/bug_8106.v
index a711c5adef..a711c5adef 100644
--- a/test-suite/bugs/closed/8106.v
+++ b/test-suite/bugs/closed/bug_8106.v
diff --git a/test-suite/bugs/closed/8119.v b/test-suite/bugs/closed/bug_8119.v
index c6329a7328..c6329a7328 100644
--- a/test-suite/bugs/closed/8119.v
+++ b/test-suite/bugs/closed/bug_8119.v
diff --git a/test-suite/bugs/closed/8121.v b/test-suite/bugs/closed/bug_8121.v
index 99267612ca..99267612ca 100644
--- a/test-suite/bugs/closed/8121.v
+++ b/test-suite/bugs/closed/bug_8121.v
diff --git a/test-suite/bugs/closed/8126.v b/test-suite/bugs/closed/bug_8126.v
index f52dfc6b47..f52dfc6b47 100644
--- a/test-suite/bugs/closed/8126.v
+++ b/test-suite/bugs/closed/bug_8126.v
diff --git a/test-suite/bugs/closed/8215.v b/test-suite/bugs/closed/bug_8215.v
index c4b29a6354..c4b29a6354 100644
--- a/test-suite/bugs/closed/8215.v
+++ b/test-suite/bugs/closed/bug_8215.v
diff --git a/test-suite/bugs/closed/8270.v b/test-suite/bugs/closed/bug_8270.v
index f36f757f10..f36f757f10 100644
--- a/test-suite/bugs/closed/8270.v
+++ b/test-suite/bugs/closed/bug_8270.v
diff --git a/test-suite/bugs/closed/8288.v b/test-suite/bugs/closed/bug_8288.v
index 0350be9c06..0350be9c06 100644
--- a/test-suite/bugs/closed/8288.v
+++ b/test-suite/bugs/closed/bug_8288.v
diff --git a/test-suite/bugs/closed/8432.v b/test-suite/bugs/closed/bug_8432.v
index 844ee12668..844ee12668 100644
--- a/test-suite/bugs/closed/8432.v
+++ b/test-suite/bugs/closed/bug_8432.v
diff --git a/test-suite/bugs/closed/8478.v b/test-suite/bugs/closed/bug_8478.v
index 8baaf8686a..8baaf8686a 100644
--- a/test-suite/bugs/closed/8478.v
+++ b/test-suite/bugs/closed/bug_8478.v
diff --git a/test-suite/bugs/closed/8532.v b/test-suite/bugs/closed/bug_8532.v
index 00aa66e701..00aa66e701 100644
--- a/test-suite/bugs/closed/8532.v
+++ b/test-suite/bugs/closed/bug_8532.v
diff --git a/test-suite/bugs/opened/1338.v-disabled b/test-suite/bugs/opened/bug_1338.v-disabled
index ab0f98202d..ab0f98202d 100644
--- a/test-suite/bugs/opened/1338.v-disabled
+++ b/test-suite/bugs/opened/bug_1338.v-disabled
diff --git a/test-suite/bugs/opened/1596.v b/test-suite/bugs/opened/bug_1596.v
index 820022d995..820022d995 100644
--- a/test-suite/bugs/opened/1596.v
+++ b/test-suite/bugs/opened/bug_1596.v
diff --git a/test-suite/bugs/opened/1615.v b/test-suite/bugs/opened/bug_1615.v
index 2825701410..c045335410 100644
--- a/test-suite/bugs/opened/1615.v
+++ b/test-suite/bugs/opened/bug_1615.v
@@ -9,4 +9,3 @@ Lemma foo' : forall n m : nat, n <=  n + n * m.
 Proof.
   intros. Fail omega.
 Abort.
-
diff --git a/test-suite/bugs/opened/1671.v b/test-suite/bugs/opened/bug_1671.v
index b4e653f687..b4e653f687 100644
--- a/test-suite/bugs/opened/1671.v
+++ b/test-suite/bugs/opened/bug_1671.v
diff --git a/test-suite/bugs/opened/1811.v b/test-suite/bugs/opened/bug_1811.v
index 57c1744313..57c1744313 100644
--- a/test-suite/bugs/opened/1811.v
+++ b/test-suite/bugs/opened/bug_1811.v
diff --git a/test-suite/bugs/opened/2572.v-disabled b/test-suite/bugs/opened/bug_2572.v-disabled
index 3f6c6a0d14..3f6c6a0d14 100644
--- a/test-suite/bugs/opened/2572.v-disabled
+++ b/test-suite/bugs/opened/bug_2572.v-disabled
diff --git a/test-suite/bugs/opened/3010.v-disabled b/test-suite/bugs/opened/bug_3010.v-disabled
index f2906bd6a6..f2906bd6a6 100644
--- a/test-suite/bugs/opened/3010.v-disabled
+++ b/test-suite/bugs/opened/bug_3010.v-disabled
diff --git a/test-suite/bugs/opened/3092.v b/test-suite/bugs/opened/bug_3092.v
index 9db21d156e..9db21d156e 100644
--- a/test-suite/bugs/opened/3092.v
+++ b/test-suite/bugs/opened/bug_3092.v
diff --git a/test-suite/bugs/opened/3166.v b/test-suite/bugs/opened/bug_3166.v
index e1c29a954c..e1c29a954c 100644
--- a/test-suite/bugs/opened/3166.v
+++ b/test-suite/bugs/opened/bug_3166.v
diff --git a/test-suite/bugs/opened/3186.v-disabled b/test-suite/bugs/opened/bug_3186.v-disabled
index d0bcb920cc..d0bcb920cc 100644
--- a/test-suite/bugs/opened/3186.v-disabled
+++ b/test-suite/bugs/opened/bug_3186.v-disabled
diff --git a/test-suite/bugs/opened/3248.v b/test-suite/bugs/opened/bug_3248.v
index 33c408a28c..33c408a28c 100644
--- a/test-suite/bugs/opened/3248.v
+++ b/test-suite/bugs/opened/bug_3248.v
diff --git a/test-suite/bugs/opened/3277.v b/test-suite/bugs/opened/bug_3277.v
index 5f4231363a..5f4231363a 100644
--- a/test-suite/bugs/opened/3277.v
+++ b/test-suite/bugs/opened/bug_3277.v
diff --git a/test-suite/bugs/opened/3278.v b/test-suite/bugs/opened/bug_3278.v
index 1c6deae94b..1c6deae94b 100644
--- a/test-suite/bugs/opened/3278.v
+++ b/test-suite/bugs/opened/bug_3278.v
diff --git a/test-suite/bugs/opened/3283.v b/test-suite/bugs/opened/bug_3283.v
index 3ab5416e8c..3ab5416e8c 100644
--- a/test-suite/bugs/opened/3283.v
+++ b/test-suite/bugs/opened/bug_3283.v
diff --git a/test-suite/bugs/opened/3295.v b/test-suite/bugs/opened/bug_3295.v
index c09649de73..c09649de73 100644
--- a/test-suite/bugs/opened/3295.v
+++ b/test-suite/bugs/opened/bug_3295.v
diff --git a/test-suite/bugs/opened/3304.v b/test-suite/bugs/opened/bug_3304.v
index 66668930c7..66668930c7 100644
--- a/test-suite/bugs/opened/3304.v
+++ b/test-suite/bugs/opened/bug_3304.v
diff --git a/test-suite/bugs/opened/3311.v b/test-suite/bugs/opened/bug_3311.v
index 1c66bc1e55..1c66bc1e55 100644
--- a/test-suite/bugs/opened/3311.v
+++ b/test-suite/bugs/opened/bug_3311.v
diff --git a/test-suite/bugs/opened/3312.v b/test-suite/bugs/opened/bug_3312.v
index 749921e2f6..749921e2f6 100644
--- a/test-suite/bugs/opened/3312.v
+++ b/test-suite/bugs/opened/bug_3312.v
diff --git a/test-suite/bugs/opened/3343.v b/test-suite/bugs/opened/bug_3343.v
index 6c5a85f9cf..6c5a85f9cf 100644
--- a/test-suite/bugs/opened/3343.v
+++ b/test-suite/bugs/opened/bug_3343.v
diff --git a/test-suite/bugs/opened/3345.v b/test-suite/bugs/opened/bug_3345.v
index 3e3da6df71..3e3da6df71 100644
--- a/test-suite/bugs/opened/3345.v
+++ b/test-suite/bugs/opened/bug_3345.v
diff --git a/test-suite/bugs/opened/3357.v b/test-suite/bugs/opened/bug_3357.v
index c479158877..c479158877 100644
--- a/test-suite/bugs/opened/3357.v
+++ b/test-suite/bugs/opened/bug_3357.v
diff --git a/test-suite/bugs/opened/3363.v b/test-suite/bugs/opened/bug_3363.v
index 800d89573c..800d89573c 100644
--- a/test-suite/bugs/opened/3363.v
+++ b/test-suite/bugs/opened/bug_3363.v
diff --git a/test-suite/bugs/opened/3370.v b/test-suite/bugs/opened/bug_3370.v
index 4964bf96c0..4964bf96c0 100644
--- a/test-suite/bugs/opened/3370.v
+++ b/test-suite/bugs/opened/bug_3370.v
diff --git a/test-suite/bugs/opened/3395.v b/test-suite/bugs/opened/bug_3395.v
index 5ca48fc9d6..5ca48fc9d6 100644
--- a/test-suite/bugs/opened/3395.v
+++ b/test-suite/bugs/opened/bug_3395.v
diff --git a/test-suite/bugs/opened/3424.v b/test-suite/bugs/opened/bug_3424.v
index d1c5bb68f9..d1c5bb68f9 100644
--- a/test-suite/bugs/opened/3424.v
+++ b/test-suite/bugs/opened/bug_3424.v
diff --git a/test-suite/bugs/opened/3459.v b/test-suite/bugs/opened/bug_3459.v
index 762611f751..762611f751 100644
--- a/test-suite/bugs/opened/3459.v
+++ b/test-suite/bugs/opened/bug_3459.v
diff --git a/test-suite/bugs/opened/3463.v b/test-suite/bugs/opened/bug_3463.v
index 541db37fb7..124f2bcc03 100644
--- a/test-suite/bugs/opened/3463.v
+++ b/test-suite/bugs/opened/bug_3463.v
@@ -10,4 +10,3 @@ Goal True.
   test2 nat (1 + _).
   test3 (1 + _) nat.
   test3 (1 + _ : nat) nat.
-
diff --git a/test-suite/bugs/opened/3478.v-disabled b/test-suite/bugs/opened/bug_3478.v-disabled
index cc926b2167..cc926b2167 100644
--- a/test-suite/bugs/opened/3478.v-disabled
+++ b/test-suite/bugs/opened/bug_3478.v-disabled
diff --git a/test-suite/bugs/opened/3626.v b/test-suite/bugs/opened/bug_3626.v
index 46a6c009eb..46a6c009eb 100644
--- a/test-suite/bugs/opened/3626.v
+++ b/test-suite/bugs/opened/bug_3626.v
diff --git a/test-suite/bugs/opened/3655.v b/test-suite/bugs/opened/bug_3655.v
index 841f77febb..841f77febb 100644
--- a/test-suite/bugs/opened/3655.v
+++ b/test-suite/bugs/opened/bug_3655.v
diff --git a/test-suite/bugs/opened/3754.v b/test-suite/bugs/opened/bug_3754.v
index a717bbe735..a717bbe735 100644
--- a/test-suite/bugs/opened/3754.v
+++ b/test-suite/bugs/opened/bug_3754.v
diff --git a/test-suite/bugs/opened/3794.v b/test-suite/bugs/opened/bug_3794.v
index e4711a38c0..e4711a38c0 100644
--- a/test-suite/bugs/opened/3794.v
+++ b/test-suite/bugs/opened/bug_3794.v
diff --git a/test-suite/bugs/opened/3889.v b/test-suite/bugs/opened/bug_3889.v
index 6b287324cc..6b287324cc 100644
--- a/test-suite/bugs/opened/3889.v
+++ b/test-suite/bugs/opened/bug_3889.v
diff --git a/test-suite/bugs/opened/3890.v b/test-suite/bugs/opened/bug_3890.v
index f9ac9be2c8..5c74addb62 100644
--- a/test-suite/bugs/opened/3890.v
+++ b/test-suite/bugs/opened/bug_3890.v
@@ -3,7 +3,7 @@ Class Bar := b : Type.
 
 Instance foo : Foo := _.
 (* 1 subgoals, subgoal 1 (ID 4)
-  
+
   ============================
    Foo *)
 
diff --git a/test-suite/bugs/opened/3919.v-disabled b/test-suite/bugs/opened/bug_3919.v-disabled
index 0d661de9c4..0d661de9c4 100644
--- a/test-suite/bugs/opened/3919.v-disabled
+++ b/test-suite/bugs/opened/bug_3919.v-disabled
diff --git a/test-suite/bugs/opened/3922.v-disabled b/test-suite/bugs/opened/bug_3922.v-disabled
index ce4f509cad..ce4f509cad 100644
--- a/test-suite/bugs/opened/3922.v-disabled
+++ b/test-suite/bugs/opened/bug_3922.v-disabled
diff --git a/test-suite/bugs/opened/3928.v-disabled b/test-suite/bugs/opened/bug_3928.v-disabled
index b470eb229b..b470eb229b 100644
--- a/test-suite/bugs/opened/3928.v-disabled
+++ b/test-suite/bugs/opened/bug_3928.v-disabled
diff --git a/test-suite/bugs/opened/3938.v b/test-suite/bugs/opened/bug_3938.v
index 2d0d1930f1..2d0d1930f1 100644
--- a/test-suite/bugs/opened/3938.v
+++ b/test-suite/bugs/opened/bug_3938.v
diff --git a/test-suite/bugs/opened/3946.v b/test-suite/bugs/opened/bug_3946.v
index e77bdbc652..e77bdbc652 100644
--- a/test-suite/bugs/opened/3946.v
+++ b/test-suite/bugs/opened/bug_3946.v
diff --git a/test-suite/bugs/opened/4701.v b/test-suite/bugs/opened/bug_4701.v
index 9286f0f1f0..9286f0f1f0 100644
--- a/test-suite/bugs/opened/4701.v
+++ b/test-suite/bugs/opened/bug_4701.v
diff --git a/test-suite/bugs/opened/4721.v b/test-suite/bugs/opened/bug_4721.v
index 1f184b3930..1f184b3930 100644
--- a/test-suite/bugs/opened/4721.v
+++ b/test-suite/bugs/opened/bug_4721.v
diff --git a/test-suite/bugs/opened/4728.v b/test-suite/bugs/opened/bug_4728.v
index 230b4beb6c..230b4beb6c 100644
--- a/test-suite/bugs/opened/4728.v
+++ b/test-suite/bugs/opened/bug_4728.v
diff --git a/test-suite/bugs/opened/4755.v b/test-suite/bugs/opened/bug_4755.v
index 9cc0d361ea..9cc0d361ea 100644
--- a/test-suite/bugs/opened/4755.v
+++ b/test-suite/bugs/opened/bug_4755.v
diff --git a/test-suite/bugs/opened/4771.v b/test-suite/bugs/opened/bug_4771.v
index 396d74bdbf..396d74bdbf 100644
--- a/test-suite/bugs/opened/4771.v
+++ b/test-suite/bugs/opened/bug_4771.v
diff --git a/test-suite/bugs/opened/4778.v b/test-suite/bugs/opened/bug_4778.v
index 633d158e96..633d158e96 100644
--- a/test-suite/bugs/opened/4778.v
+++ b/test-suite/bugs/opened/bug_4778.v
diff --git a/test-suite/bugs/opened/4781.v b/test-suite/bugs/opened/bug_4781.v
index 8b651ac22e..8b651ac22e 100644
--- a/test-suite/bugs/opened/4781.v
+++ b/test-suite/bugs/opened/bug_4781.v
diff --git a/test-suite/bugs/opened/4813.v b/test-suite/bugs/opened/bug_4813.v
index 2ac5535934..2ac5535934 100644
--- a/test-suite/bugs/opened/4813.v
+++ b/test-suite/bugs/opened/bug_4813.v
diff --git a/test-suite/bugs/opened/6393.v b/test-suite/bugs/opened/bug_6393.v
index 8d5d092333..8d5d092333 100644
--- a/test-suite/bugs/opened/6393.v
+++ b/test-suite/bugs/opened/bug_6393.v
diff --git a/test-suite/bugs/opened/6602.v b/test-suite/bugs/opened/bug_6602.v
index 3690adf90a..3690adf90a 100644
--- a/test-suite/bugs/opened/6602.v
+++ b/test-suite/bugs/opened/bug_6602.v
diff --git a/test-suite/interactive/4289.v b/test-suite/interactive/bug_4289.v
index 610a509c9b..610a509c9b 100644
--- a/test-suite/interactive/4289.v
+++ b/test-suite/interactive/bug_4289.v