diff --git a/ghc/tests/deSugar/should_compile/ds001.hs b/ghc/tests/deSugar/should_compile/ds001.hs
index 0358f2022ec86509bc6728afb15378d42ebdca4b..a62c7b4205253a7727b36c2d51e93495bafccbed 100644
--- a/ghc/tests/deSugar/should_compile/ds001.hs
+++ b/ghc/tests/deSugar/should_compile/ds001.hs
@@ -1,4 +1,4 @@
---!!! ds001 -- simple function and pattern bindings
+-- !!! ds001 -- simple function and pattern bindings
--
-- this tests ultra-simple function and pattern bindings (no patterns)
diff --git a/ghc/tests/deSugar/should_compile/ds002.hs b/ghc/tests/deSugar/should_compile/ds002.hs
index d7546365963585f994122335b57acb4697389c26..a63de9423342bc9ac8fb12e1993737df3f602eb6 100644
--- a/ghc/tests/deSugar/should_compile/ds002.hs
+++ b/ghc/tests/deSugar/should_compile/ds002.hs
@@ -1,4 +1,4 @@
---!!! ds002 -- overlapping equations and guards
+-- !!! ds002 -- overlapping equations and guards
--
-- this tests "overlapping" variables and guards
diff --git a/ghc/tests/deSugar/should_compile/ds003.hs b/ghc/tests/deSugar/should_compile/ds003.hs
index f68346ded15e596eaf56fa93951aabd2e2b26f8d..0faff0e8da1e62bf596ef13c341c302f472ead18 100644
--- a/ghc/tests/deSugar/should_compile/ds003.hs
+++ b/ghc/tests/deSugar/should_compile/ds003.hs
@@ -1,4 +1,4 @@
---!!! ds003 -- list, tuple, lazy, as patterns
+-- !!! ds003 -- list, tuple, lazy, as patterns
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds004.hs b/ghc/tests/deSugar/should_compile/ds004.hs
index ef9d0b40d34b55a45abd320928cfbecc5416eb02..cd89e1822d5175eb05e3276f88dffd14bf8532ae 100644
--- a/ghc/tests/deSugar/should_compile/ds004.hs
+++ b/ghc/tests/deSugar/should_compile/ds004.hs
@@ -1,4 +1,4 @@
---!!! ds004 -- nodups from SLPJ p 79
+-- !!! ds004 -- nodups from SLPJ p 79
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds005.hs b/ghc/tests/deSugar/should_compile/ds005.hs
index 505d500e3f640728e2e7c9c60f386fbc3effc8eb..6fca84b10b59951c64023542a473fb2d35b7a267 100644
--- a/ghc/tests/deSugar/should_compile/ds005.hs
+++ b/ghc/tests/deSugar/should_compile/ds005.hs
@@ -1,4 +1,4 @@
---!!! ds005 -- mappairs from SLPJ Ch 5'
+-- !!! ds005 -- mappairs from SLPJ Ch 5'
--
-- this simply tests a "typical" example
diff --git a/ghc/tests/deSugar/should_compile/ds006.hs b/ghc/tests/deSugar/should_compile/ds006.hs
index 6df589e215571b00b009c70bd4e451e6e5b8a30b..ba05547920f2d5ef1aa610ceba32a77df5bf1f1b 100644
--- a/ghc/tests/deSugar/should_compile/ds006.hs
+++ b/ghc/tests/deSugar/should_compile/ds006.hs
@@ -1,4 +1,4 @@
---!!! ds006 -- v | True = v+1 | False = v (dead code elim)
+-- !!! ds006 -- v | True = v+1 | False = v (dead code elim)
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds007.hs b/ghc/tests/deSugar/should_compile/ds007.hs
index 5b2b752e93ae251585372d75905946577ef94f70..dd0fcd50ebaa033032f30b2e0889e829f3760e67 100644
--- a/ghc/tests/deSugar/should_compile/ds007.hs
+++ b/ghc/tests/deSugar/should_compile/ds007.hs
@@ -1,4 +1,4 @@
---!!! ds007 -- simple local bindings
+-- !!! ds007 -- simple local bindings
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds008.hs b/ghc/tests/deSugar/should_compile/ds008.hs
index 1264d13d8fcc722bb85b4992e6cab074ceb8b973..a97470d99e2db5b9005e4a40878c86eda6ab2899 100644
--- a/ghc/tests/deSugar/should_compile/ds008.hs
+++ b/ghc/tests/deSugar/should_compile/ds008.hs
@@ -1,4 +1,4 @@
---!!! ds008 -- free tyvars on RHSs
+-- !!! ds008 -- free tyvars on RHSs
--
-- these tests involve way-cool TyApps
diff --git a/ghc/tests/deSugar/should_compile/ds009.hs b/ghc/tests/deSugar/should_compile/ds009.hs
index 370b6290db8950b42422261f89f64d76f1b63f04..ba205562ad8008a273fc282cf39adb5a8be02109 100644
--- a/ghc/tests/deSugar/should_compile/ds009.hs
+++ b/ghc/tests/deSugar/should_compile/ds009.hs
@@ -1,4 +1,4 @@
---!!! ds009 -- simple list comprehensions
+-- !!! ds009 -- simple list comprehensions
module SimpleListComp where
diff --git a/ghc/tests/deSugar/should_compile/ds010.hs b/ghc/tests/deSugar/should_compile/ds010.hs
index a49c09c03f83a1c674f787a44779a0e69463800a..abf6fa1b3e06385fcbfd2a50cfaa455224d0e867 100644
--- a/ghc/tests/deSugar/should_compile/ds010.hs
+++ b/ghc/tests/deSugar/should_compile/ds010.hs
@@ -1,4 +1,4 @@
---!!! ds010 -- deeply-nested list comprehensions
+-- !!! ds010 -- deeply-nested list comprehensions
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds011.hs b/ghc/tests/deSugar/should_compile/ds011.hs
index 8b12d9371fe672f91329b135fd8684b7c93c2bb3..f9dc13d49a15dbb1a87872f8aecd27773c52ab81 100644
--- a/ghc/tests/deSugar/should_compile/ds011.hs
+++ b/ghc/tests/deSugar/should_compile/ds011.hs
@@ -1,4 +1,4 @@
---!!! ds011 -- uses of "error"
+-- !!! ds011 -- uses of "error"
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds012.hs b/ghc/tests/deSugar/should_compile/ds012.hs
index 390db5817d9b4d5640302adc6414850e5d7da274..8870881441cb2ffd00421ec4888487eec958f626 100644
--- a/ghc/tests/deSugar/should_compile/ds012.hs
+++ b/ghc/tests/deSugar/should_compile/ds012.hs
@@ -1,4 +1,4 @@
---!!! ds012 -- simple Integer arithmetic
+-- !!! ds012 -- simple Integer arithmetic
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds013.hs b/ghc/tests/deSugar/should_compile/ds013.hs
index 9b5b4b3454b9f78bd214a201739f2cfd90e7226c..da7267d761aa6e30b43d45a1a7ff8c05e7953143 100644
--- a/ghc/tests/deSugar/should_compile/ds013.hs
+++ b/ghc/tests/deSugar/should_compile/ds013.hs
@@ -1,4 +1,4 @@
---!!! ds013 -- simple Rational arithmetic
+-- !!! ds013 -- simple Rational arithmetic
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds014.hs b/ghc/tests/deSugar/should_compile/ds014.hs
index cf1ccb183baaa7bb7c75d71834597824f2579290..8770cb7814436c27749c17a8d970ad541cad5332 100644
--- a/ghc/tests/deSugar/should_compile/ds014.hs
+++ b/ghc/tests/deSugar/should_compile/ds014.hs
@@ -1,5 +1,5 @@
---!!! ds014 -- character and string literals
---!!! really should add ALL weird forms...
+-- !!! ds014 -- character and string literals
+-- !!! really should add ALL weird forms...
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds015.hs b/ghc/tests/deSugar/should_compile/ds015.hs
index 5c2164ecbc57c19d0529194d6960a9b0a1c2f9ff..b14cc6e5267a1bd60a3a137a87f3eaf23fd3fd61 100644
--- a/ghc/tests/deSugar/should_compile/ds015.hs
+++ b/ghc/tests/deSugar/should_compile/ds015.hs
@@ -1,4 +1,4 @@
---!!! ds015 -- lambdas
+-- !!! ds015 -- lambdas
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds016.hs b/ghc/tests/deSugar/should_compile/ds016.hs
index 57e00535389b1733ed510fe8da7e8ff6cad03172..370c37eaf832078745f69cabaf0cc13c7bec1aa1 100644
--- a/ghc/tests/deSugar/should_compile/ds016.hs
+++ b/ghc/tests/deSugar/should_compile/ds016.hs
@@ -1,4 +1,4 @@
---!!! ds016 -- case expressions
+-- !!! ds016 -- case expressions
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds017.hs b/ghc/tests/deSugar/should_compile/ds017.hs
index 00f98848b3d608461b65e246206157b73cf98410..20092448d73d87e13e019b7772b71d53276b9a35 100644
--- a/ghc/tests/deSugar/should_compile/ds017.hs
+++ b/ghc/tests/deSugar/should_compile/ds017.hs
@@ -1,4 +1,4 @@
---!!! ds017 -- let expressions
+-- !!! ds017 -- let expressions
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds018.hs b/ghc/tests/deSugar/should_compile/ds018.hs
index b5c428012eafbd200dee7f8250b3c1c239f911fe..00098bd05c0c5361d456b66a98cd20e47965ae13 100644
--- a/ghc/tests/deSugar/should_compile/ds018.hs
+++ b/ghc/tests/deSugar/should_compile/ds018.hs
@@ -1,4 +1,4 @@
---!!! ds018 -- explicit lists and tuples
+-- !!! ds018 -- explicit lists and tuples
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds019.hs b/ghc/tests/deSugar/should_compile/ds019.hs
index 32400ddec8fa936de9b6f2ebbebad0dea45266c2..8056a5470e26c961cdc631fbf08d04becdb2caf5 100644
--- a/ghc/tests/deSugar/should_compile/ds019.hs
+++ b/ghc/tests/deSugar/should_compile/ds019.hs
@@ -1,4 +1,4 @@
---!!! ds019 -- mixed var and uni-constructor pats
+-- !!! ds019 -- mixed var and uni-constructor pats
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds020.hs b/ghc/tests/deSugar/should_compile/ds020.hs
index ac6ea8dd4b9ea1dd3b9686e8a78a4f096c32646b..54a1101f231b0e17b8c1978823914e9351e521d9 100644
--- a/ghc/tests/deSugar/should_compile/ds020.hs
+++ b/ghc/tests/deSugar/should_compile/ds020.hs
@@ -1,4 +1,4 @@
---!!! ds020 -- lazy patterns (in detail)
+-- !!! ds020 -- lazy patterns (in detail)
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds021.hs b/ghc/tests/deSugar/should_compile/ds021.hs
index f7e93929edd50694cb4921e178a6f87b250b1e54..1f33591a055152a9191543db591db62632970a44 100644
--- a/ghc/tests/deSugar/should_compile/ds021.hs
+++ b/ghc/tests/deSugar/should_compile/ds021.hs
@@ -1,4 +1,4 @@
---!!! ds021 -- hairier uses of guards
+-- !!! ds021 -- hairier uses of guards
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds022.hs b/ghc/tests/deSugar/should_compile/ds022.hs
index ce07e1941cac930a1dc0384b372ac68875a7e84c..672871093a13490707c72f73ed06d92870c46382 100644
--- a/ghc/tests/deSugar/should_compile/ds022.hs
+++ b/ghc/tests/deSugar/should_compile/ds022.hs
@@ -1,4 +1,4 @@
---!!! ds022 -- literal patterns (wimp version)
+-- !!! ds022 -- literal patterns (wimp version)
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds023.hs b/ghc/tests/deSugar/should_compile/ds023.hs
index ecd6e137bfe1eefb65b65ecd8091320d0c728386..a15c464d38ee7d13638e11bcd53c2953ff903584 100644
--- a/ghc/tests/deSugar/should_compile/ds023.hs
+++ b/ghc/tests/deSugar/should_compile/ds023.hs
@@ -1,4 +1,4 @@
---!!! ds023 -- overloading eg from section 9.2
+-- !!! ds023 -- overloading eg from section 9.2
--
module Tests where
diff --git a/ghc/tests/deSugar/should_compile/ds024.hs b/ghc/tests/deSugar/should_compile/ds024.hs
index 6f0b27aadec89597d7682f287ae3c7accd50cb1d..9c1c9d86be1c4effae53bf0ab61bc76a4d0f061e 100644
--- a/ghc/tests/deSugar/should_compile/ds024.hs
+++ b/ghc/tests/deSugar/should_compile/ds024.hs
@@ -1,4 +1,4 @@
---!!! ds024 -- correct types on ConPatOuts
+-- !!! ds024 -- correct types on ConPatOuts
-- do all the right types get stuck on all the
-- Nils and Conses?
diff --git a/ghc/tests/deSugar/should_compile/ds025.hs b/ghc/tests/deSugar/should_compile/ds025.hs
index b2ae1fda46d7a046066047186c6a9ec4accf5c53..8b7651f9f1b9934c92b28b521c01213b532eba44 100644
--- a/ghc/tests/deSugar/should_compile/ds025.hs
+++ b/ghc/tests/deSugar/should_compile/ds025.hs
@@ -1,4 +1,4 @@
---!!! ds025 -- overloaded assoc -- AbsBinds
+-- !!! ds025 -- overloaded assoc -- AbsBinds
module Util where
diff --git a/ghc/tests/deSugar/should_compile/ds026.hs b/ghc/tests/deSugar/should_compile/ds026.hs
index ff1f0bee7ee54e40526c2c57fdf61ace09b91f02..969587d70e579c36fe37533016c405f4abec9db0 100644
--- a/ghc/tests/deSugar/should_compile/ds026.hs
+++ b/ghc/tests/deSugar/should_compile/ds026.hs
@@ -1,4 +1,4 @@
---!!! ds026 -- classes -- incl. polymorphic method
+-- !!! ds026 -- classes -- incl. polymorphic method
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds027.hs b/ghc/tests/deSugar/should_compile/ds027.hs
index 99a4d93ac2652421cff8182de4f24637abc18bf4..5f7a54555accb973372a1fd84973faffa6b38262 100644
--- a/ghc/tests/deSugar/should_compile/ds027.hs
+++ b/ghc/tests/deSugar/should_compile/ds027.hs
@@ -1,4 +1,4 @@
---!!! ds027 -- simple instances
+-- !!! ds027 -- simple instances
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds028.hs b/ghc/tests/deSugar/should_compile/ds028.hs
index 18c0b7d622958b5aff3b97a7e885f25cc77d2b67..bec8c19b43154f33c21d6de1749433fb09358b60 100644
--- a/ghc/tests/deSugar/should_compile/ds028.hs
+++ b/ghc/tests/deSugar/should_compile/ds028.hs
@@ -1,4 +1,4 @@
---!!! ds028: failable pats in top row
+-- !!! ds028: failable pats in top row
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds029.hs b/ghc/tests/deSugar/should_compile/ds029.hs
index fd9f583487fc1fd9d837c77672839443190c8c73..833e19b25db3838f5ccc2de67e788ea3391b7fd1 100644
--- a/ghc/tests/deSugar/should_compile/ds029.hs
+++ b/ghc/tests/deSugar/should_compile/ds029.hs
@@ -1,4 +1,4 @@
---!!! ds029: pattern binding with guards (dubious but valid)
+-- !!! ds029: pattern binding with guards (dubious but valid)
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds030.hs b/ghc/tests/deSugar/should_compile/ds030.hs
index 7abc4d82e02d55df495d395b432cb92d43f558c3..6046fd93eb495008389bb312b688f7233f412a95 100644
--- a/ghc/tests/deSugar/should_compile/ds030.hs
+++ b/ghc/tests/deSugar/should_compile/ds030.hs
@@ -1,4 +1,4 @@
---!!! ds030: checks that types substituted into binders
+-- !!! ds030: checks that types substituted into binders
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds032.hs b/ghc/tests/deSugar/should_compile/ds032.hs
index 31bc07ebf557ab7bcc1285c05c6b2006e7386762..65f06c34174f322d7abd0ef06f381540a7b38a6f 100644
--- a/ghc/tests/deSugar/should_compile/ds032.hs
+++ b/ghc/tests/deSugar/should_compile/ds032.hs
@@ -1,4 +1,4 @@
---!!! recursive funs tangled in an AbsBind
+-- !!! recursive funs tangled in an AbsBind
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds033.hs b/ghc/tests/deSugar/should_compile/ds033.hs
index bdadb58bfeb9e1b3042a51d01e28c9ab244cae0c..83a00cacb163d8964fa330d4cc5d8c6d680b5b0d 100644
--- a/ghc/tests/deSugar/should_compile/ds033.hs
+++ b/ghc/tests/deSugar/should_compile/ds033.hs
@@ -1,4 +1,4 @@
---!!! getting top-level dependencies right
+-- !!! getting top-level dependencies right
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds034.hs b/ghc/tests/deSugar/should_compile/ds034.hs
index d1f278608b84af3a1a8e816792f279457a5a00d8..47a190eff500b1de3d5339454ddbee820e644731 100644
--- a/ghc/tests/deSugar/should_compile/ds034.hs
+++ b/ghc/tests/deSugar/should_compile/ds034.hs
@@ -1,4 +1,4 @@
---!!! mutually-recursive methods in an instance declaration
+-- !!! mutually-recursive methods in an instance declaration
--
module Test where
diff --git a/ghc/tests/deSugar/should_compile/ds037.hs b/ghc/tests/deSugar/should_compile/ds037.hs
index 648534165021609b42d0701b03794a7078098cf3..72eb43a42adefac09bef230e3e9dcd1f6fb4d084 100644
--- a/ghc/tests/deSugar/should_compile/ds037.hs
+++ b/ghc/tests/deSugar/should_compile/ds037.hs
@@ -1,4 +1,4 @@
---!!! AbsBinds with tyvars, no dictvars, but some dict binds
+-- !!! AbsBinds with tyvars, no dictvars, but some dict binds
--
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds038.hs b/ghc/tests/deSugar/should_compile/ds038.hs
index 14e60e96e29b2cf56cc8e5ceedba8ff5d511679c..6436b57300befdd65f0d993371690159341ff8cf 100644
--- a/ghc/tests/deSugar/should_compile/ds038.hs
+++ b/ghc/tests/deSugar/should_compile/ds038.hs
@@ -1,5 +1,5 @@
---!!! Jon Hill reported a bug in desugaring this in 0.09
---!!! (recursive with n+k patts)
+-- !!! Jon Hill reported a bug in desugaring this in 0.09
+-- !!! (recursive with n+k patts)
--
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds039.hs b/ghc/tests/deSugar/should_compile/ds039.hs
index e153bfa51a2cb6ad4676e16be4cf4e1df2841405..a6588a4d42a740a861f820d3f348157f8f42b9c5 100644
--- a/ghc/tests/deSugar/should_compile/ds039.hs
+++ b/ghc/tests/deSugar/should_compile/ds039.hs
@@ -1,5 +1,5 @@
---!!! make sure correct type applications get put in
---!!! when (:) is saturated.
+-- !!! make sure correct type applications get put in
+-- !!! when (:) is saturated.
module ShouldSucceed where
diff --git a/ghc/tests/deSugar/should_compile/ds040.hs b/ghc/tests/deSugar/should_compile/ds040.hs
index 6d1c17e3f238b1e0219d46f75b974eb4927507d9..8be249b4f76350035191739f018fc465f847e15e 100644
--- a/ghc/tests/deSugar/should_compile/ds040.hs
+++ b/ghc/tests/deSugar/should_compile/ds040.hs
@@ -1,4 +1,4 @@
---!!! Another bug in overloaded n+k patts
+-- !!! Another bug in overloaded n+k patts
--
main = print ((4::Int) ^^^^ (6::Int))
diff --git a/ghc/tests/deSugar/should_run/dsrun006.hs b/ghc/tests/deSugar/should_run/dsrun006.hs
index 0bcda9650e4b6a12cb8733f26d5af0605488d94b..759c9c542db5e65b8b5976661507e2247ff25aa7 100644
--- a/ghc/tests/deSugar/should_run/dsrun006.hs
+++ b/ghc/tests/deSugar/should_run/dsrun006.hs
@@ -27,7 +27,7 @@ fails with:
data X = A {a :: Int} | B {a :: Int}
-f x = let A {a} = x
+f x = let A {a=a} = x
in a
main = print (f (A {a = 3}))