From cf7d06b8ac0f47d6ff1c2d3decdb6a50a0fd7502 Mon Sep 17 00:00:00 2001
From: alexbiehl <alexbiehl@gmail.com>
Date: Tue, 9 Feb 2021 12:42:30 +0100
Subject: Stable sort for (data/newtype) instances

---
 html-test/ref/Bug1103.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'html-test/ref/Bug1103.html')

diff --git a/html-test/ref/Bug1103.html b/html-test/ref/Bug1103.html
index 4d3772d1..c17eb7b8 100644
--- a/html-test/ref/Bug1103.html
+++ b/html-test/ref/Bug1103.html
@@ -392,6 +392,8 @@
 		      >Foo3</a
 		      > (a :: <a href="#" title="Data.Char"
 		      >Char</a
+		      > -&gt; <a href="#" title="Data.Char"
+		      >Char</a
 		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
@@ -415,6 +417,8 @@
 			>Foo3</a
 			> (a :: <a href="#" title="Data.Char"
 			>Char</a
+			> -&gt; <a href="#" title="Data.Char"
+			>Char</a
 			>)</div
 		      ></details
 		    ></td
@@ -430,8 +434,6 @@
 		      >Foo3</a
 		      > (a :: <a href="#" title="Data.Char"
 		      >Char</a
-		      > -&gt; <a href="#" title="Data.Char"
-		      >Char</a
 		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
@@ -455,8 +457,6 @@
 			>Foo3</a
 			> (a :: <a href="#" title="Data.Char"
 			>Char</a
-			> -&gt; <a href="#" title="Data.Char"
-			>Char</a
 			>)</div
 		      ></details
 		    ></td
-- 
cgit v1.2.3


From 606e3f220d20688c7baff94bef525a13434dc56b Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Mon, 22 Feb 2021 10:31:56 +0100
Subject: html-test: Always set language
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

from ghc-9.2 on, the “default” langauge of GHC is expected to change
more wildly. To prepare for that (and unblock
https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4853), this sets the
language for all the test files to `Haskell2010`. This should insolate
this test suite against changes to the default.

Cherry-picked from https://github.com/haskell/haddock/pull/1341
---
 hoogle-test/src/Bug722/Bug722.hs                   |   1 +
 hoogle-test/src/Bug806/Bug806.hs                   |   1 +
 hoogle-test/src/Bug825/Bug825.hs                   |   1 +
 hoogle-test/src/Bug873/Bug873.hs                   |   1 +
 hoogle-test/src/Bug946/Bug946.hs                   |   1 +
 hoogle-test/src/Bug992/Bug992.hs                   |   1 +
 hoogle-test/src/assoc-types/AssocTypes.hs          |   1 +
 hoogle-test/src/classes/Classes.hs                 |   1 +
 hoogle-test/src/fixity/Fixity.hs                   |   1 +
 hoogle-test/src/modules/Bar.hs                     |   1 +
 hoogle-test/src/modules/Foo.hs                     |   1 +
 hoogle-test/src/type-sigs/ReaderT.hs               |   1 +
 hoogle-test/src/type-sigs/ReaderTReexport.hs       |   1 +
 html-test/ref/A.html                               |   6 +
 html-test/ref/Bold.html                            |   6 +
 html-test/ref/Bug1.html                            |   6 +
 html-test/ref/Bug1004.html                         |   6 +
 html-test/ref/Bug1033.html                         |   6 +
 html-test/ref/Bug1035.html                         |   6 +
 html-test/ref/Bug1050.html                         |   6 +
 html-test/ref/Bug1054.html                         |   6 +
 html-test/ref/Bug1063.html                         |   6 +
 html-test/ref/Bug1067A.html                        |   6 +
 html-test/ref/Bug1067B.html                        |   6 +
 html-test/ref/Bug1103.html                         |   6 +
 html-test/ref/Bug195.html                          |   6 +
 html-test/ref/Bug2.html                            |   6 +
 html-test/ref/Bug201.html                          |   6 +
 html-test/ref/Bug253.html                          |   6 +
 html-test/ref/Bug26.html                           |   6 +
 html-test/ref/Bug280.html                          |   6 +
 html-test/ref/Bug294.html                          |   6 +
 html-test/ref/Bug298.html                          |   6 +
 html-test/ref/Bug3.html                            |   6 +
 html-test/ref/Bug308.html                          |   6 +
 html-test/ref/Bug308CrossModule.html               |   6 +
 html-test/ref/Bug310.html                          |   6 +
 html-test/ref/Bug313.html                          |   6 +
 html-test/ref/Bug335.html                          |   6 +
 html-test/ref/Bug4.html                            |   6 +
 html-test/ref/Bug458.html                          |   6 +
 html-test/ref/Bug466.html                          |   6 +
 html-test/ref/Bug546.html                          |   6 +
 html-test/ref/Bug548.html                          |   6 +
 html-test/ref/Bug574.html                          |   6 +
 html-test/ref/Bug6.html                            |   6 +
 html-test/ref/Bug613.html                          |   6 +
 html-test/ref/Bug647.html                          |   6 +
 html-test/ref/Bug679.html                          |   6 +
 html-test/ref/Bug7.html                            |   6 +
 html-test/ref/Bug8.html                            |   6 +
 html-test/ref/Bug85.html                           |   6 +
 html-test/ref/Bug865.html                          |   6 +
 html-test/ref/Bug923.html                          |   6 +
 html-test/ref/Bug952.html                          |   6 +
 html-test/ref/Bug953.html                          |   6 +
 html-test/ref/Bug973.html                          |   6 +
 html-test/ref/BugDeprecated.html                   |   6 +
 html-test/ref/BugExportHeadings.html               |   6 +
 html-test/ref/Bugs.html                            |   6 +
 html-test/ref/BundledPatterns.html                 |   6 +
 html-test/ref/BundledPatterns2.html                |   6 +
 html-test/ref/ConstructorArgs.html                 |   6 +
 html-test/ref/ConstructorPatternExport.html        |   6 +
 html-test/ref/DefaultAssociatedTypes.html          |   6 +
 html-test/ref/DefaultSignatures.html               |   6 +
 html-test/ref/DeprecatedClass.html                 |   6 +
 html-test/ref/DeprecatedData.html                  |   6 +
 html-test/ref/DeprecatedFunction.html              |   6 +
 html-test/ref/DeprecatedFunction2.html             |   6 +
 html-test/ref/DeprecatedFunction3.html             |   6 +
 html-test/ref/DeprecatedModule.html                |   6 +
 html-test/ref/DeprecatedModule2.html               |   6 +
 html-test/ref/DeprecatedNewtype.html               |   6 +
 html-test/ref/DeprecatedReExport.html              |   6 +
 html-test/ref/DeprecatedRecord.html                |   6 +
 html-test/ref/DeprecatedTypeFamily.html            |   6 +
 html-test/ref/DeprecatedTypeSynonym.html           |   6 +
 html-test/ref/DuplicateRecordFields.html           |   6 +
 html-test/ref/Examples.html                        |   6 +
 html-test/ref/FunArgs.html                         |   6 +
 html-test/ref/GADTRecords.html                     |   6 +
 html-test/ref/GadtConstructorArgs.html             |   6 +
 html-test/ref/Hash.html                            |   6 +
 html-test/ref/HiddenInstances.html                 |   6 +
 html-test/ref/HiddenInstancesB.html                |   6 +
 html-test/ref/Hyperlinks.html                      |   6 +
 html-test/ref/Identifiers.html                     |   6 +
 html-test/ref/IgnoreExports.html                   |   6 +
 html-test/ref/ImplicitParams.html                  |   6 +
 html-test/ref/Instances.html                       |   6 +
 html-test/ref/LinearTypes.html                     |   6 +
 html-test/ref/Math.html                            |   6 +
 html-test/ref/Minimal.html                         |   6 +
 html-test/ref/ModuleWithWarning.html               |   6 +
 html-test/ref/NamedDoc.html                        |   6 +
 html-test/ref/NamespacedIdentifiers.html           |   6 +
 html-test/ref/Nesting.html                         |   6 +
 html-test/ref/NoLayout.html                        |   6 +
 html-test/ref/NonGreedy.html                       |   6 +
 html-test/ref/Operators.html                       |   6 +
 html-test/ref/OrphanInstances.html                 |   6 +
 html-test/ref/OrphanInstancesClass.html            |   6 +
 html-test/ref/OrphanInstancesType.html             |   6 +
 html-test/ref/PR643.html                           |   6 +
 html-test/ref/PR643_1.html                         |   6 +
 html-test/ref/PatternSyns.html                     |   6 +
 html-test/ref/PromotedTypes.html                   |   6 +
 html-test/ref/Properties.html                      |   6 +
 html-test/ref/PruneWithWarning.html                |   6 +
 html-test/ref/QuantifiedConstraints.html           |   6 +
 html-test/ref/QuasiExpr.html                       |   6 +
 html-test/ref/QuasiQuote.html                      |   6 +
 html-test/ref/SectionLabels.html                   |   6 +
 html-test/ref/SpuriousSuperclassConstraints.html   |   6 +
 html-test/ref/TH.html                              |   6 +
 html-test/ref/TH2.html                             |   6 +
 html-test/ref/Table.html                           |   6 +
 html-test/ref/Test.html                            |   6 +
 html-test/ref/Threaded.html                        |   6 +
 html-test/ref/Threaded_TH.html                     |   6 +
 html-test/ref/Ticket112.html                       |   6 +
 html-test/ref/Ticket61.html                        |   6 +
 html-test/ref/Ticket75.html                        |   6 +
 html-test/ref/TitledPicture.html                   |   6 +
 html-test/ref/TypeFamilies.html                    |   6 +
 html-test/ref/TypeFamilies2.html                   |   6 +
 html-test/ref/TypeFamilies3.html                   |   6 +
 html-test/ref/TypeOperators.html                   |   6 +
 html-test/ref/UnboxedStuff.html                    |   6 +
 html-test/ref/Unicode.html                         |   6 +
 html-test/ref/Unicode2.html                        |   6 +
 html-test/ref/Visible.html                         |   6 +
 html-test/src/A.hs                                 |   1 +
 html-test/src/B.hs                                 |   1 +
 html-test/src/Bold.hs                              |   1 +
 html-test/src/Bug1.hs                              |   1 +
 html-test/src/Bug1004.hs                           |   1 +
 html-test/src/Bug1033.hs                           |   1 +
 html-test/src/Bug1035.hs                           |   1 +
 html-test/src/Bug1050.hs                           |   1 +
 html-test/src/Bug1054.hs                           |   1 +
 html-test/src/Bug1063.hs                           |   1 +
 html-test/src/Bug1067A.hs                          |   1 +
 html-test/src/Bug1067B.hs                          |   1 +
 html-test/src/Bug1103.hs                           |   1 +
 html-test/src/Bug195.hs                            |   1 +
 html-test/src/Bug2.hs                              |   1 +
 html-test/src/Bug201.hs                            |   1 +
 html-test/src/Bug253.hs                            |   1 +
 html-test/src/Bug26.hs                             |   1 +
 html-test/src/Bug280.hs                            |   1 +
 html-test/src/Bug294.hs                            |   1 +
 html-test/src/Bug298.hs                            |   1 +
 html-test/src/Bug3.hs                              |   1 +
 html-test/src/Bug308.hs                            |   1 +
 html-test/src/Bug308CrossModule.hs                 |   1 +
 html-test/src/Bug310.hs                            |   1 +
 html-test/src/Bug313.hs                            |   1 +
 html-test/src/Bug335.hs                            |   1 +
 html-test/src/Bug4.hs                              |   1 +
 html-test/src/Bug458.hs                            |   1 +
 html-test/src/Bug466.hs                            |   1 +
 html-test/src/Bug546.hs                            |   1 +
 html-test/src/Bug548.hs                            |   1 +
 html-test/src/Bug6.hs                              |   1 +
 html-test/src/Bug613.hs                            |   1 +
 html-test/src/Bug647.hs                            |   1 +
 html-test/src/Bug679.hs                            |   1 +
 html-test/src/Bug7.hs                              |   1 +
 html-test/src/Bug745.hs                            |   1 +
 html-test/src/Bug8.hs                              |   1 +
 html-test/src/Bug85.hs                             |   1 +
 html-test/src/Bug865.hs                            |   1 +
 html-test/src/Bug923.hs                            |   1 +
 html-test/src/Bug952.hs                            |   1 +
 html-test/src/Bug953.hs                            |   1 +
 html-test/src/Bug975.hs                            |   1 +
 html-test/src/BugDeprecated.hs                     |   1 +
 html-test/src/BugExportHeadings.hs                 |   1 +
 html-test/src/Bugs.hs                              |   1 +
 html-test/src/BundledPatterns.hs                   |   1 +
 html-test/src/BundledPatterns2.hs                  |   1 +
 html-test/src/ConstructorArgs.hs                   |   1 +
 html-test/src/ConstructorPatternExport.hs          |   1 +
 html-test/src/DefaultAssociatedTypes.hs            |   1 +
 html-test/src/DefaultSignatures.hs                 |   1 +
 html-test/src/DeprecatedClass.hs                   |   1 +
 html-test/src/DeprecatedData.hs                    |   1 +
 html-test/src/DeprecatedFunction.hs                |   1 +
 html-test/src/DeprecatedFunction2.hs               |   1 +
 html-test/src/DeprecatedFunction3.hs               |   1 +
 html-test/src/DeprecatedModule.hs                  |   1 +
 html-test/src/DeprecatedModule2.hs                 |   1 +
 html-test/src/DeprecatedNewtype.hs                 |   1 +
 html-test/src/DeprecatedReExport.hs                |   1 +
 html-test/src/DeprecatedRecord.hs                  |   1 +
 html-test/src/DeprecatedTypeFamily.hs              |   1 +
 html-test/src/DeprecatedTypeSynonym.hs             |   1 +
 html-test/src/DuplicateRecordFields.hs             |   1 +
 html-test/src/Examples.hs                          |   1 +
 html-test/src/Extensions.hs                        |   1 +
 html-test/src/FunArgs.hs                           |   1 +
 html-test/src/GADTRecords.hs                       |   1 +
 html-test/src/GadtConstructorArgs.hs               |   1 +
 html-test/src/Hash.hs                              |   1 +
 html-test/src/Hidden.hs                            |   1 +
 html-test/src/HiddenInstances.hs                   |   1 +
 html-test/src/HiddenInstancesA.hs                  |   1 +
 html-test/src/HiddenInstancesB.hs                  |   1 +
 html-test/src/Hyperlinks.hs                        |   1 +
 html-test/src/Identifiers.hs                       |   1 +
 html-test/src/IgnoreExports.hs                     |   1 +
 html-test/src/ImplicitParams.hs                    |   1 +
 html-test/src/Instances.hs                         |   1 +
 html-test/src/LinearTypes.hs                       |   1 +
 html-test/src/Math.hs                              |   1 +
 html-test/src/Minimal.hs                           |   1 +
 html-test/src/ModuleWithWarning.hs                 |   1 +
 html-test/src/NamedDoc.hs                          |   1 +
 html-test/src/NamespacedIdentifiers.hs             |   1 +
 html-test/src/Nesting.hs                           |   1 +
 html-test/src/NoLayout.hs                          |   1 +
 html-test/src/NonGreedy.hs                         |   1 +
 html-test/src/Operators.hs                         |   1 +
 html-test/src/OrphanInstances.hs                   |   1 +
 html-test/src/OrphanInstancesClass.hs              |   1 +
 html-test/src/OrphanInstancesType.hs               |   1 +
 html-test/src/PR643.hs                             |   1 +
 html-test/src/PR643_1.hs                           |   1 +
 html-test/src/PatternSyns.hs                       |   1 +
 html-test/src/PromotedTypes.hs                     |   1 +
 html-test/src/Properties.hs                        |   1 +
 html-test/src/PruneWithWarning.hs                  |   1 +
 html-test/src/QuantifiedConstraints.hs             |   1 +
 html-test/src/QuasiExpr.hs                         |   1 +
 html-test/src/QuasiQuote.hs                        |   1 +
 html-test/src/SectionLabels.hs                     |   1 +
 html-test/src/SpuriousSuperclassConstraints.hs     |   1 +
 html-test/src/TH.hs                                |   1 +
 html-test/src/TH2.hs                               |   1 +
 html-test/src/Table.hs                             |   1 +
 html-test/src/Test.hs                              |   1 +
 html-test/src/Threaded.hs                          |   1 +
 html-test/src/Threaded_TH.hs                       |   1 +
 html-test/src/Ticket112.hs                         |   1 +
 html-test/src/Ticket61.hs                          |   1 +
 html-test/src/Ticket61_Hidden.hs                   |   1 +
 html-test/src/Ticket75.hs                          |   1 +
 html-test/src/TitledPicture.hs                     |   1 +
 html-test/src/TypeFamilies.hs                      |   1 +
 html-test/src/TypeFamilies2.hs                     |   1 +
 html-test/src/TypeFamilies3.hs                     |   1 +
 html-test/src/TypeOperators.hs                     |   1 +
 html-test/src/UnboxedStuff.hs                      |   1 +
 html-test/src/Unicode.hs                           |   1 +
 html-test/src/Unicode2.hs                          |   1 +
 html-test/src/Visible.hs                           |   1 +
 hypsrc-test/ref/src/Bug1091.html                   |   9 +-
 hypsrc-test/ref/src/CPP.html                       |  31 +++--
 hypsrc-test/ref/src/Classes.html                   |  79 ++++++------
 hypsrc-test/ref/src/Constructors.html              |  79 ++++++------
 hypsrc-test/ref/src/Identifiers.html               |  65 +++++-----
 hypsrc-test/ref/src/LinkingIdentifiers.html        |  37 +++---
 hypsrc-test/ref/src/Literals.html                  |  43 ++++---
 hypsrc-test/ref/src/Operators.html                 |  53 ++++----
 hypsrc-test/ref/src/Polymorphism.html              | 135 +++++++++++----------
 hypsrc-test/ref/src/PositionPragmas.html           |  13 +-
 hypsrc-test/ref/src/Quasiquoter.html               |  41 ++++---
 hypsrc-test/ref/src/Records.html                   |  71 ++++++-----
 .../ref/src/TemplateHaskellQuasiquotes.html        |  83 +++++++------
 hypsrc-test/ref/src/TemplateHaskellSplices.html    |  23 ++--
 hypsrc-test/ref/src/Types.html                     |  87 +++++++------
 hypsrc-test/ref/src/UsingQuasiquotes.html          |  19 ++-
 hypsrc-test/src/Bug1091.hs                         |   1 +
 hypsrc-test/src/CPP.hs                             |   1 +
 hypsrc-test/src/Classes.hs                         |   1 +
 hypsrc-test/src/Constructors.hs                    |   1 +
 hypsrc-test/src/Identifiers.hs                     |   1 +
 hypsrc-test/src/LinkingIdentifiers.hs              |   1 +
 hypsrc-test/src/Literals.hs                        |   1 +
 hypsrc-test/src/Operators.hs                       |   1 +
 hypsrc-test/src/Polymorphism.hs                    |   1 +
 hypsrc-test/src/PositionPragmas.hs                 |   1 +
 hypsrc-test/src/Quasiquoter.hs                     |   1 +
 hypsrc-test/src/Records.hs                         |   1 +
 hypsrc-test/src/TemplateHaskellQuasiquotes.hs      |   1 +
 hypsrc-test/src/TemplateHaskellSplices.hs          |   1 +
 hypsrc-test/src/Types.hs                           |   1 +
 hypsrc-test/src/UsingQuasiquotes.hs                |   1 +
 latex-test/src/ConstructorArgs/ConstructorArgs.hs  |   1 +
 .../src/DefaultSignatures/DefaultSignatures.hs     |   1 +
 latex-test/src/Deprecated/Deprecated.hs            |   1 +
 latex-test/src/Example/Example.hs                  |   1 +
 .../src/GadtConstructorArgs/GadtConstructorArgs.hs |   1 +
 latex-test/src/LinearTypes/LinearTypes.hs          |   1 +
 .../NamespacedIdentifier/NamespacedIdentifier.hs   |   1 +
 latex-test/src/Simple/Simple.hs                    |   1 +
 latex-test/src/TypeFamilies3/TypeFamilies3.hs      |   1 +
 latex-test/src/UnboxedStuff/UnboxedStuff.hs        |   1 +
 300 files changed, 1374 insertions(+), 378 deletions(-)

(limited to 'html-test/ref/Bug1103.html')

diff --git a/hoogle-test/src/Bug722/Bug722.hs b/hoogle-test/src/Bug722/Bug722.hs
index a33d5b24..ef7e9a2f 100644
--- a/hoogle-test/src/Bug722/Bug722.hs
+++ b/hoogle-test/src/Bug722/Bug722.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeOperators, TypeFamilies #-}
 module Bug722 where
 
diff --git a/hoogle-test/src/Bug806/Bug806.hs b/hoogle-test/src/Bug806/Bug806.hs
index 45efda77..6deb98c1 100644
--- a/hoogle-test/src/Bug806/Bug806.hs
+++ b/hoogle-test/src/Bug806/Bug806.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
diff --git a/hoogle-test/src/Bug825/Bug825.hs b/hoogle-test/src/Bug825/Bug825.hs
index bfe07139..48c09305 100644
--- a/hoogle-test/src/Bug825/Bug825.hs
+++ b/hoogle-test/src/Bug825/Bug825.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeOperators #-}
 module Bug825 where
diff --git a/hoogle-test/src/Bug873/Bug873.hs b/hoogle-test/src/Bug873/Bug873.hs
index 3a9a5383..4df1b772 100644
--- a/hoogle-test/src/Bug873/Bug873.hs
+++ b/hoogle-test/src/Bug873/Bug873.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug873 (($), ($$)) where
 infixr 0 $$
 
diff --git a/hoogle-test/src/Bug946/Bug946.hs b/hoogle-test/src/Bug946/Bug946.hs
index 606b5ac4..ec567d6d 100644
--- a/hoogle-test/src/Bug946/Bug946.hs
+++ b/hoogle-test/src/Bug946/Bug946.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE PatternSynonyms #-}
 module Bug946 (
   AnInt(AnInt, Zero),
diff --git a/hoogle-test/src/Bug992/Bug992.hs b/hoogle-test/src/Bug992/Bug992.hs
index bd772427..0b03964b 100644
--- a/hoogle-test/src/Bug992/Bug992.hs
+++ b/hoogle-test/src/Bug992/Bug992.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE KindSignatures #-}
 
 module Bug992 where
diff --git a/hoogle-test/src/assoc-types/AssocTypes.hs b/hoogle-test/src/assoc-types/AssocTypes.hs
index ceacc834..3fa5f034 100644
--- a/hoogle-test/src/assoc-types/AssocTypes.hs
+++ b/hoogle-test/src/assoc-types/AssocTypes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE AllowAmbiguousTypes #-}
 
diff --git a/hoogle-test/src/classes/Classes.hs b/hoogle-test/src/classes/Classes.hs
index 23f68499..2bd726a2 100644
--- a/hoogle-test/src/classes/Classes.hs
+++ b/hoogle-test/src/classes/Classes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Classes where
 
 
diff --git a/hoogle-test/src/fixity/Fixity.hs b/hoogle-test/src/fixity/Fixity.hs
index 3af38117..122bd4f8 100644
--- a/hoogle-test/src/fixity/Fixity.hs
+++ b/hoogle-test/src/fixity/Fixity.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Fixity where
 
 
diff --git a/hoogle-test/src/modules/Bar.hs b/hoogle-test/src/modules/Bar.hs
index 156a835f..86e2648b 100644
--- a/hoogle-test/src/modules/Bar.hs
+++ b/hoogle-test/src/modules/Bar.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bar where
 
 
diff --git a/hoogle-test/src/modules/Foo.hs b/hoogle-test/src/modules/Foo.hs
index 6581fe4c..947da4ce 100644
--- a/hoogle-test/src/modules/Foo.hs
+++ b/hoogle-test/src/modules/Foo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Foo where
 
 
diff --git a/hoogle-test/src/type-sigs/ReaderT.hs b/hoogle-test/src/type-sigs/ReaderT.hs
index 009c7ed2..fb09bac0 100644
--- a/hoogle-test/src/type-sigs/ReaderT.hs
+++ b/hoogle-test/src/type-sigs/ReaderT.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module ReaderT where
 
 newtype ReaderT r m a = ReaderT { runReaderT :: r -> m a }
diff --git a/hoogle-test/src/type-sigs/ReaderTReexport.hs b/hoogle-test/src/type-sigs/ReaderTReexport.hs
index 21fa44ee..b995bba8 100644
--- a/hoogle-test/src/type-sigs/ReaderTReexport.hs
+++ b/hoogle-test/src/type-sigs/ReaderTReexport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module ReaderTReexport (ReaderT(..), runReaderT) where
 
 import ReaderT
diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index c27f1888..d3dc54ff 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>A</p
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 2bbe37a4..00f9301a 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bold</p
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index a14ac387..c3e350d8 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1</p
diff --git a/html-test/ref/Bug1004.html b/html-test/ref/Bug1004.html
index b4ce3c88..4137771b 100644
--- a/html-test/ref/Bug1004.html
+++ b/html-test/ref/Bug1004.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1004</p
diff --git a/html-test/ref/Bug1033.html b/html-test/ref/Bug1033.html
index 36254447..327739a8 100644
--- a/html-test/ref/Bug1033.html
+++ b/html-test/ref/Bug1033.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1033</p
diff --git a/html-test/ref/Bug1035.html b/html-test/ref/Bug1035.html
index 6594064e..9df26a95 100644
--- a/html-test/ref/Bug1035.html
+++ b/html-test/ref/Bug1035.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1035</p
diff --git a/html-test/ref/Bug1050.html b/html-test/ref/Bug1050.html
index da7ae1d2..89fa19ce 100644
--- a/html-test/ref/Bug1050.html
+++ b/html-test/ref/Bug1050.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1050</p
diff --git a/html-test/ref/Bug1054.html b/html-test/ref/Bug1054.html
index df3fae0a..8d31c62e 100644
--- a/html-test/ref/Bug1054.html
+++ b/html-test/ref/Bug1054.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1054</p
diff --git a/html-test/ref/Bug1063.html b/html-test/ref/Bug1063.html
index f311373a..7f2b46cf 100644
--- a/html-test/ref/Bug1063.html
+++ b/html-test/ref/Bug1063.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1063</p
diff --git a/html-test/ref/Bug1067A.html b/html-test/ref/Bug1067A.html
index 96b8d495..0ccff963 100644
--- a/html-test/ref/Bug1067A.html
+++ b/html-test/ref/Bug1067A.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1067A</p
diff --git a/html-test/ref/Bug1067B.html b/html-test/ref/Bug1067B.html
index f3bf821a..ab48c202 100644
--- a/html-test/ref/Bug1067B.html
+++ b/html-test/ref/Bug1067B.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1067B</p
diff --git a/html-test/ref/Bug1103.html b/html-test/ref/Bug1103.html
index 4d3772d1..1cfbda81 100644
--- a/html-test/ref/Bug1103.html
+++ b/html-test/ref/Bug1103.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug1103</p
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index af595d5d..3428b31d 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug195</p
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index c0c192c9..f8da696d 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug2</p
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 13ad4556..0f2b3878 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug201</p
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index a482a21a..60d5ef66 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug253</p
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 5c6fb34e..73b33e89 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug26</p
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index 57e265f4..e821b091 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -46,6 +46,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug280</p
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 6ceb3422..c62fc606 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug294</p
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index fc57d087..8983195b 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug298</p
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 0c9d8526..da390bc7 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug3</p
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index acd019d3..66fedba8 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug308</p
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index f754aa87..1b9a2809 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug308CrossModule</p
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 65ec1cae..57c82077 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug310</p
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 83ee7a34..9bb1e176 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug313</p
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 00e31ca0..a5049088 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug335</p
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 8a19bc6b..a8861c4e 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug4</p
diff --git a/html-test/ref/Bug458.html b/html-test/ref/Bug458.html
index d5b5a768..ad07b3fa 100644
--- a/html-test/ref/Bug458.html
+++ b/html-test/ref/Bug458.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug458</p
diff --git a/html-test/ref/Bug466.html b/html-test/ref/Bug466.html
index 4f6f6f16..4fab918a 100644
--- a/html-test/ref/Bug466.html
+++ b/html-test/ref/Bug466.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug466</p
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index bb400a50..3b478723 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug546</p
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index 1ac40ae4..db325dac 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug548</p
diff --git a/html-test/ref/Bug574.html b/html-test/ref/Bug574.html
index e2024f47..89f71a01 100644
--- a/html-test/ref/Bug574.html
+++ b/html-test/ref/Bug574.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug574</p
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 5bd4c030..129542e2 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug6</p
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 4df6037d..425fc670 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug613</p
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index 0648cf51..07b3b11b 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug647</p
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index 8814129d..50dbed5a 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug679</p
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 5338bda2..df5cebe3 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug7</p
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 4d6fe69b..e62caae3 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug8</p
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index bbef4d32..c22438c7 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug85</p
diff --git a/html-test/ref/Bug865.html b/html-test/ref/Bug865.html
index 96f64daf..7cc142b3 100644
--- a/html-test/ref/Bug865.html
+++ b/html-test/ref/Bug865.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug865</p
diff --git a/html-test/ref/Bug923.html b/html-test/ref/Bug923.html
index d657e08e..7c287254 100644
--- a/html-test/ref/Bug923.html
+++ b/html-test/ref/Bug923.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug923</p
diff --git a/html-test/ref/Bug952.html b/html-test/ref/Bug952.html
index bd301bcd..0105b82f 100644
--- a/html-test/ref/Bug952.html
+++ b/html-test/ref/Bug952.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug952</p
diff --git a/html-test/ref/Bug953.html b/html-test/ref/Bug953.html
index aea7ec5c..b19179d0 100644
--- a/html-test/ref/Bug953.html
+++ b/html-test/ref/Bug953.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug953</p
diff --git a/html-test/ref/Bug973.html b/html-test/ref/Bug973.html
index 20e27886..8297b4f4 100644
--- a/html-test/ref/Bug973.html
+++ b/html-test/ref/Bug973.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bug973</p
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 92a963f3..e4017f17 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>BugDeprecated</p
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index ddcb7aa3..2ba3a858 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>BugExportHeadings</p
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index c6c42446..59c79d24 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Bugs</p
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index af1a0265..82f58e49 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>BundledPatterns</p
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index faca9016..56a44f57 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>BundledPatterns2</p
diff --git a/html-test/ref/ConstructorArgs.html b/html-test/ref/ConstructorArgs.html
index 16ef6780..9441fd03 100644
--- a/html-test/ref/ConstructorArgs.html
+++ b/html-test/ref/ConstructorArgs.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>ConstructorArgs</p
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 0822733d..aa0c1a8f 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>ConstructorPatternExport</p
diff --git a/html-test/ref/DefaultAssociatedTypes.html b/html-test/ref/DefaultAssociatedTypes.html
index 4b39483a..bc4d8a00 100644
--- a/html-test/ref/DefaultAssociatedTypes.html
+++ b/html-test/ref/DefaultAssociatedTypes.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DefaultAssociatedTypes</p
diff --git a/html-test/ref/DefaultSignatures.html b/html-test/ref/DefaultSignatures.html
index 60d0428f..f44cc859 100644
--- a/html-test/ref/DefaultSignatures.html
+++ b/html-test/ref/DefaultSignatures.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DefaultSignatures</p
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index a0de4858..ff3be26d 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedClass</p
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 001970df..3ca99820 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedData</p
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index 2b3c4a66..104a67f1 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedFunction</p
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index a2cd84a2..023e4701 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedFunction2</p
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 90bde84d..3666bcbc 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedFunction3</p
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index c4d1c241..9a0a058b 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedModule</p
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index b1d6c12a..c179dfc1 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedModule2</p
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 4fad244a..7e423fc9 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedNewtype</p
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index d8dd554f..672f28ae 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedReExport</p
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 7760386d..37dceddd 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedRecord</p
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 76a9a039..4fbaeaa5 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedTypeFamily</p
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 32c9721b..81c7d78e 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DeprecatedTypeSynonym</p
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index fab57a04..7017df6a 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>DuplicateRecordFields</p
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index f5a7ba8c..b397e079 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Examples</p
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 03a97522..2fac6d4e 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>FunArgs</p
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 9dac0c13..834d8f67 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>GADTRecords</p
diff --git a/html-test/ref/GadtConstructorArgs.html b/html-test/ref/GadtConstructorArgs.html
index c1a4dedf..aefe15f5 100644
--- a/html-test/ref/GadtConstructorArgs.html
+++ b/html-test/ref/GadtConstructorArgs.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>GadtConstructorArgs</p
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 8c062e1b..a924e0e8 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Hash</p
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 181b47f8..4098771e 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>HiddenInstances</p
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 579f5754..89667e73 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>HiddenInstancesB</p
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 947d5342..28a38bac 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Hyperlinks</p
diff --git a/html-test/ref/Identifiers.html b/html-test/ref/Identifiers.html
index bd0f610e..b7ca9296 100644
--- a/html-test/ref/Identifiers.html
+++ b/html-test/ref/Identifiers.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Identifiers</p
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index f89e009e..029565b8 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>IgnoreExports</p
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 1c0126a9..b027baad 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>ImplicitParams</p
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index c6a6b5ca..e7eecb4d 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Instances</p
diff --git a/html-test/ref/LinearTypes.html b/html-test/ref/LinearTypes.html
index 48ad04e2..fbece396 100644
--- a/html-test/ref/LinearTypes.html
+++ b/html-test/ref/LinearTypes.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>LinearTypes</p
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index 627f4840..6ae9e392 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Math</p
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index cacbb86d..f8fa63ff 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Minimal</p
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index cb8b8f27..a54331cd 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>ModuleWithWarning</p
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 1fd0c25b..2e0f6321 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>NamedDoc</p
diff --git a/html-test/ref/NamespacedIdentifiers.html b/html-test/ref/NamespacedIdentifiers.html
index 8424e46d..2507c934 100644
--- a/html-test/ref/NamespacedIdentifiers.html
+++ b/html-test/ref/NamespacedIdentifiers.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>NamespacedIdentifiers</p
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 14905718..59111338 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Nesting</p
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index a6afc3fc..44ed6688 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>NoLayout</p
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 76861de6..7f5146ba 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>NonGreedy</p
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 005d3a0c..9ebbe42d 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Operators</p
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index cc5b5c7c..cad2a2d7 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>OrphanInstances</p
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index b90e36e2..5445ddd7 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>OrphanInstancesClass</p
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 16ea1d53..2b01525c 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>OrphanInstancesType</p
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index e19e3343..bd0bef4c 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>PR643</p
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 0582deae..91fd0edd 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>PR643_1</p
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 7e5cdc1f..54c2ce00 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>PatternSyns</p
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index b4e4dd7c..d13a6bd8 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>PromotedTypes</p
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 2adab2b0..aa9bc4ad 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Properties</p
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 9747a87f..ba03144e 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>PruneWithWarning</p
diff --git a/html-test/ref/QuantifiedConstraints.html b/html-test/ref/QuantifiedConstraints.html
index 0833f1a8..8838facb 100644
--- a/html-test/ref/QuantifiedConstraints.html
+++ b/html-test/ref/QuantifiedConstraints.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>QuantifiedConstraints</p
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index e3c7b6e7..b7660f20 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>QuasiExpr</p
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 1ea51099..210c5248 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>QuasiQuote</p
diff --git a/html-test/ref/SectionLabels.html b/html-test/ref/SectionLabels.html
index 8b571b42..5137afa4 100644
--- a/html-test/ref/SectionLabels.html
+++ b/html-test/ref/SectionLabels.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>SectionLabels</p
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 7293a149..ec9ccbd3 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>SpuriousSuperclassConstraints</p
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index d44d5741..60192571 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TH</p
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 1b47e640..98f2315f 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TH2</p
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index 26b0254d..01f74119 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Table</p
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index ce2acb60..10540c93 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -68,6 +68,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Test</p
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 8391431e..4a980f94 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Threaded</p
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 8850eafb..52e65bb3 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Threaded_TH</p
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index bd596be0..42c9f7fb 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Ticket112</p
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 5e384b86..3b219168 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Ticket61</p
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 4940b6fb..f9349d94 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Ticket75</p
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 5b936a16..dd10e1be 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TitledPicture</p
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 7ca50972..98d4f250 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeFamilies</p
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 8425a1d4..6095eb58 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeFamilies2</p
diff --git a/html-test/ref/TypeFamilies3.html b/html-test/ref/TypeFamilies3.html
index 88e74dd9..a926601b 100644
--- a/html-test/ref/TypeFamilies3.html
+++ b/html-test/ref/TypeFamilies3.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeFamilies3</p
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 5588e82a..ff79e6be 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeOperators</p
diff --git a/html-test/ref/UnboxedStuff.html b/html-test/ref/UnboxedStuff.html
index 0f7ae983..8bb5ad20 100644
--- a/html-test/ref/UnboxedStuff.html
+++ b/html-test/ref/UnboxedStuff.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>UnboxedStuff</p
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 8f301458..29ad66af 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Unicode</p
diff --git a/html-test/ref/Unicode2.html b/html-test/ref/Unicode2.html
index b789c2d7..d1e94dbd 100644
--- a/html-test/ref/Unicode2.html
+++ b/html-test/ref/Unicode2.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Unicode2</p
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 0a932038..c8f6b26d 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Visible</p
diff --git a/html-test/src/A.hs b/html-test/src/A.hs
index 606b0865..e2319041 100644
--- a/html-test/src/A.hs
+++ b/html-test/src/A.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module A where
 
 data A = A
diff --git a/html-test/src/B.hs b/html-test/src/B.hs
index 5fd69acd..ce7a945c 100644
--- a/html-test/src/B.hs
+++ b/html-test/src/B.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module B ( module A, test, reExport, X(..) ) where
 import A ( A(..), test2, reExport, X(..) )
 
diff --git a/html-test/src/Bold.hs b/html-test/src/Bold.hs
index 7ff28ef9..91bc6715 100644
--- a/html-test/src/Bold.hs
+++ b/html-test/src/Bold.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bold where
 -- | Some __bold text__.
 --
diff --git a/html-test/src/Bug1.hs b/html-test/src/Bug1.hs
index af1ed4d3..6df1b9e2 100644
--- a/html-test/src/Bug1.hs
+++ b/html-test/src/Bug1.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug1 where
 
 -- | We should have different anchors for constructors and types\/classes.  This
diff --git a/html-test/src/Bug1004.hs b/html-test/src/Bug1004.hs
index d789e77f..f2ee5f61 100644
--- a/html-test/src/Bug1004.hs
+++ b/html-test/src/Bug1004.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug1004 (Product(..)) where
 
 import Data.Functor.Product
diff --git a/html-test/src/Bug1033.hs b/html-test/src/Bug1033.hs
index fdf5a57e..4c80e672 100644
--- a/html-test/src/Bug1033.hs
+++ b/html-test/src/Bug1033.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StandaloneDeriving #-}
 
diff --git a/html-test/src/Bug1035.hs b/html-test/src/Bug1035.hs
index 3516c08f..46a6dd1f 100644
--- a/html-test/src/Bug1035.hs
+++ b/html-test/src/Bug1035.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug1035 where
 
 data Foo = Bar
diff --git a/html-test/src/Bug1050.hs b/html-test/src/Bug1050.hs
index ea293e6e..1fe49ab7 100644
--- a/html-test/src/Bug1050.hs
+++ b/html-test/src/Bug1050.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE RankNTypes #-}
diff --git a/html-test/src/Bug1054.hs b/html-test/src/Bug1054.hs
index c699f1fb..b05d79c0 100644
--- a/html-test/src/Bug1054.hs
+++ b/html-test/src/Bug1054.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug1054 where
 
 -- * Header with 'foo' link
diff --git a/html-test/src/Bug1063.hs b/html-test/src/Bug1063.hs
index c6d13a1f..d5b1c69f 100644
--- a/html-test/src/Bug1063.hs
+++ b/html-test/src/Bug1063.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
diff --git a/html-test/src/Bug1067A.hs b/html-test/src/Bug1067A.hs
index 57ab60b0..4523d838 100644
--- a/html-test/src/Bug1067A.hs
+++ b/html-test/src/Bug1067A.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# language PatternSynonyms #-}
 module Bug1067A ( Foo(P) ) where
 
diff --git a/html-test/src/Bug1067B.hs b/html-test/src/Bug1067B.hs
index f1a814df..b5ce67f6 100644
--- a/html-test/src/Bug1067B.hs
+++ b/html-test/src/Bug1067B.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# language PatternSynonyms #-}
 module Bug1067B ( pattern P ) where
 
diff --git a/html-test/src/Bug1103.hs b/html-test/src/Bug1103.hs
index 1f387e62..c790e8c1 100644
--- a/html-test/src/Bug1103.hs
+++ b/html-test/src/Bug1103.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE PolyKinds #-}
diff --git a/html-test/src/Bug195.hs b/html-test/src/Bug195.hs
index 14440e8d..304e0c2e 100644
--- a/html-test/src/Bug195.hs
+++ b/html-test/src/Bug195.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug195 where
 
 data T = A { someField :: () -- ^ Doc for someField of A
diff --git a/html-test/src/Bug2.hs b/html-test/src/Bug2.hs
index 9121922e..6dc79f46 100644
--- a/html-test/src/Bug2.hs
+++ b/html-test/src/Bug2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug2 ( x ) where
 import B
 x :: A
diff --git a/html-test/src/Bug201.hs b/html-test/src/Bug201.hs
index bf6cb9a9..caa92d95 100644
--- a/html-test/src/Bug201.hs
+++ b/html-test/src/Bug201.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- We test that leading whitespace gets properly dropped (or not!)
 -- from codeblocks
 module Bug201 where
diff --git a/html-test/src/Bug253.hs b/html-test/src/Bug253.hs
index 499f6cd4..29a3adc6 100644
--- a/html-test/src/Bug253.hs
+++ b/html-test/src/Bug253.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | This module tests that if we're trying to link to a /qualified/
 -- identifier that's not in scope, we get an anchor as if it was a
 -- variable. Previous behaviour was to treat it as a type constructor
diff --git a/html-test/src/Bug26.hs b/html-test/src/Bug26.hs
index b0483f03..8b9c4162 100644
--- a/html-test/src/Bug26.hs
+++ b/html-test/src/Bug26.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | This module tests the ‘@since …’ annotation.
 --
 -- @since 1.2.3
diff --git a/html-test/src/Bug280.hs b/html-test/src/Bug280.hs
index ac27e2e5..d53def96 100644
--- a/html-test/src/Bug280.hs
+++ b/html-test/src/Bug280.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-|
 Copyright: Foo,
            Bar,
diff --git a/html-test/src/Bug294.hs b/html-test/src/Bug294.hs
index 4f874705..922b8ee7 100644
--- a/html-test/src/Bug294.hs
+++ b/html-test/src/Bug294.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies, FlexibleInstances, GADTs #-}
 -- This tests that we are able to extract record selectors for
 -- associated types when the type itself is not exported. Making this
diff --git a/html-test/src/Bug298.hs b/html-test/src/Bug298.hs
index 07d6fa0c..7ab9d21b 100644
--- a/html-test/src/Bug298.hs
+++ b/html-test/src/Bug298.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- We introduced a regression in 2.14.x where we don't consider
 -- identifiers with ^ as valid. We test that the regression goes away
 -- here. It's a silly typo in the parser, really. Same with ★ which is a valid
diff --git a/html-test/src/Bug3.hs b/html-test/src/Bug3.hs
index 67e57892..1b7e5277 100644
--- a/html-test/src/Bug3.hs
+++ b/html-test/src/Bug3.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug3 where
 
 -- | /multi-line
diff --git a/html-test/src/Bug308.hs b/html-test/src/Bug308.hs
index 3adb3746..93ecffac 100644
--- a/html-test/src/Bug308.hs
+++ b/html-test/src/Bug308.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- From 2.14.x onwards we were forgetting to swallow ‘#’ as a special
 -- character resulting in broken anchors if they accured
 -- mid-paragraph. Here we check that anchors get generated as
diff --git a/html-test/src/Bug308CrossModule.hs b/html-test/src/Bug308CrossModule.hs
index 589aa69e..45c89040 100644
--- a/html-test/src/Bug308CrossModule.hs
+++ b/html-test/src/Bug308CrossModule.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- Just like Bug308 module but here we test that referring to anchors
 -- from other modules works.
 module Bug308CrossModule where
diff --git a/html-test/src/Bug310.hs b/html-test/src/Bug310.hs
index d2492dc0..c54eab81 100644
--- a/html-test/src/Bug310.hs
+++ b/html-test/src/Bug310.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ExplicitNamespaces #-}
 module Bug310 ( type (+) ) where
 
diff --git a/html-test/src/Bug313.hs b/html-test/src/Bug313.hs
index 90d4d3b6..c076c5b8 100644
--- a/html-test/src/Bug313.hs
+++ b/html-test/src/Bug313.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | The first list is incorrectly numbered as 1. 2. 1.; the second example
 -- renders fine (1. 2. 3.).
 --
diff --git a/html-test/src/Bug335.hs b/html-test/src/Bug335.hs
index c1821dd0..45668307 100644
--- a/html-test/src/Bug335.hs
+++ b/html-test/src/Bug335.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- Tests for collapsable headers
 module Bug335 where
 
diff --git a/html-test/src/Bug4.hs b/html-test/src/Bug4.hs
index 425a77aa..3343e1b9 100644
--- a/html-test/src/Bug4.hs
+++ b/html-test/src/Bug4.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug4 where
 -- | don't use apostrophe's in the wrong place's
 foo :: Int
diff --git a/html-test/src/Bug458.hs b/html-test/src/Bug458.hs
index 6a3ac9a4..b0fefecf 100644
--- a/html-test/src/Bug458.hs
+++ b/html-test/src/Bug458.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug458 where
 
 -- | See the defn of @'⊆'@.
diff --git a/html-test/src/Bug466.hs b/html-test/src/Bug466.hs
index ec7cde2c..697f0f75 100644
--- a/html-test/src/Bug466.hs
+++ b/html-test/src/Bug466.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, TypeFamilies, StarIsType #-}
 module Bug466 where
 
diff --git a/html-test/src/Bug546.hs b/html-test/src/Bug546.hs
index 4493b1d9..e1df6aca 100644
--- a/html-test/src/Bug546.hs
+++ b/html-test/src/Bug546.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug546 where
 
 -- |Test:
diff --git a/html-test/src/Bug548.hs b/html-test/src/Bug548.hs
index 652d3d32..c890a207 100644
--- a/html-test/src/Bug548.hs
+++ b/html-test/src/Bug548.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug548 (WrappedArrow(..)) where
 
 import Control.Applicative
diff --git a/html-test/src/Bug6.hs b/html-test/src/Bug6.hs
index 17411f31..de2874aa 100644
--- a/html-test/src/Bug6.hs
+++ b/html-test/src/Bug6.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Exporting records.
 module Bug6( A(A), B(B), b, C(C,c1,c2), D(D,d1), E(E) ) where
 
diff --git a/html-test/src/Bug613.hs b/html-test/src/Bug613.hs
index effef695..3bdd0ac2 100644
--- a/html-test/src/Bug613.hs
+++ b/html-test/src/Bug613.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug613  where
 
 import Prelude (Either(Left, Right))
diff --git a/html-test/src/Bug647.hs b/html-test/src/Bug647.hs
index 4143092a..7f1b9544 100644
--- a/html-test/src/Bug647.hs
+++ b/html-test/src/Bug647.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug647 where
 
 class Bug647 a where
diff --git a/html-test/src/Bug679.hs b/html-test/src/Bug679.hs
index 0a321ec5..3cc2278f 100644
--- a/html-test/src/Bug679.hs
+++ b/html-test/src/Bug679.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Bug679 where
diff --git a/html-test/src/Bug7.hs b/html-test/src/Bug7.hs
index a07934c4..aeb7d96e 100644
--- a/html-test/src/Bug7.hs
+++ b/html-test/src/Bug7.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 -- | This module caused a duplicate instance in the documentation for the Foo
 -- type.
diff --git a/html-test/src/Bug745.hs b/html-test/src/Bug745.hs
index f26562c1..295ac59d 100644
--- a/html-test/src/Bug745.hs
+++ b/html-test/src/Bug745.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
 
 module Bug574 where
diff --git a/html-test/src/Bug8.hs b/html-test/src/Bug8.hs
index 30afae1f..1b50ce9c 100644
--- a/html-test/src/Bug8.hs
+++ b/html-test/src/Bug8.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug8 where
 
 infix -->
diff --git a/html-test/src/Bug85.hs b/html-test/src/Bug85.hs
index e29b2662..53979aee 100644
--- a/html-test/src/Bug85.hs
+++ b/html-test/src/Bug85.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, KindSignatures #-}
 module Bug85 where
 
diff --git a/html-test/src/Bug865.hs b/html-test/src/Bug865.hs
index 71a6add1..86627f8e 100644
--- a/html-test/src/Bug865.hs
+++ b/html-test/src/Bug865.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug865 where
 
 -- | An emphasized link [yes /this/ is emphasized while this is
diff --git a/html-test/src/Bug923.hs b/html-test/src/Bug923.hs
index bb5bca0a..1d24a9f6 100644
--- a/html-test/src/Bug923.hs
+++ b/html-test/src/Bug923.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE KindSignatures, FlexibleInstances, GADTs, DataKinds #-}
 module Bug923 where
 
diff --git a/html-test/src/Bug952.hs b/html-test/src/Bug952.hs
index 09b365e4..0840e46c 100644
--- a/html-test/src/Bug952.hs
+++ b/html-test/src/Bug952.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug952 where
 
 -- | See 'case', 'of', '--' compared to 'Q.case', 'Q.of', 'Q.--'
diff --git a/html-test/src/Bug953.hs b/html-test/src/Bug953.hs
index 63f2c45a..4ff3e8ae 100644
--- a/html-test/src/Bug953.hs
+++ b/html-test/src/Bug953.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bug953 where
 
 {- | A foo
diff --git a/html-test/src/Bug975.hs b/html-test/src/Bug975.hs
index 97ebabda..e55385c5 100644
--- a/html-test/src/Bug975.hs
+++ b/html-test/src/Bug975.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ExplicitForAll #-}
 module Bug973 where
 
diff --git a/html-test/src/BugDeprecated.hs b/html-test/src/BugDeprecated.hs
index 7741786f..9dfef176 100644
--- a/html-test/src/BugDeprecated.hs
+++ b/html-test/src/BugDeprecated.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module BugDeprecated where
 
 foo :: Int
diff --git a/html-test/src/BugExportHeadings.hs b/html-test/src/BugExportHeadings.hs
index a5493a08..b664a448 100644
--- a/html-test/src/BugExportHeadings.hs
+++ b/html-test/src/BugExportHeadings.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- test for #192
 module BugExportHeadings (
 -- * Foo
diff --git a/html-test/src/Bugs.hs b/html-test/src/Bugs.hs
index e60bbe8f..aed716a4 100644
--- a/html-test/src/Bugs.hs
+++ b/html-test/src/Bugs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Bugs where
 
 data A a = A a (a -> Int)
diff --git a/html-test/src/BundledPatterns.hs b/html-test/src/BundledPatterns.hs
index 443e64fa..420068ac 100644
--- a/html-test/src/BundledPatterns.hs
+++ b/html-test/src/BundledPatterns.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, GADTs, KindSignatures, PatternSynonyms, TypeOperators,
              ViewPatterns #-}
 module BundledPatterns (Vec(Nil,(:>)), RTree (LR,BR)) where
diff --git a/html-test/src/BundledPatterns2.hs b/html-test/src/BundledPatterns2.hs
index 5e9a83a7..c4123535 100644
--- a/html-test/src/BundledPatterns2.hs
+++ b/html-test/src/BundledPatterns2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds, GADTs, KindSignatures, PatternSynonyms, TypeOperators,
              ViewPatterns #-}
 module BundledPatterns2 (Vec((:>), Empty), RTree(..)) where
diff --git a/html-test/src/ConstructorArgs.hs b/html-test/src/ConstructorArgs.hs
index 6b0da711..c3b848c3 100644
--- a/html-test/src/ConstructorArgs.hs
+++ b/html-test/src/ConstructorArgs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, PatternSynonyms #-}
 
 module ConstructorArgs (Foo(..), Boo(Foo, Foa, Fo, Fo'), pattern Bo, pattern Bo') where
diff --git a/html-test/src/ConstructorPatternExport.hs b/html-test/src/ConstructorPatternExport.hs
index 7897b4bc..aa2971d6 100644
--- a/html-test/src/ConstructorPatternExport.hs
+++ b/html-test/src/ConstructorPatternExport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE GADTs #-}
diff --git a/html-test/src/DefaultAssociatedTypes.hs b/html-test/src/DefaultAssociatedTypes.hs
index 6ad197d3..340742d3 100644
--- a/html-test/src/DefaultAssociatedTypes.hs
+++ b/html-test/src/DefaultAssociatedTypes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DefaultSignatures, TypeFamilies #-}
 
 module DefaultAssociatedTypes where
diff --git a/html-test/src/DefaultSignatures.hs b/html-test/src/DefaultSignatures.hs
index 52d68a96..1b1b8257 100644
--- a/html-test/src/DefaultSignatures.hs
+++ b/html-test/src/DefaultSignatures.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DefaultSignatures #-}
 
 module DefaultSignatures where
diff --git a/html-test/src/DeprecatedClass.hs b/html-test/src/DeprecatedClass.hs
index 018904ab..357f64e4 100644
--- a/html-test/src/DeprecatedClass.hs
+++ b/html-test/src/DeprecatedClass.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedClass where
 
 -- | some class
diff --git a/html-test/src/DeprecatedData.hs b/html-test/src/DeprecatedData.hs
index c40ba122..f2324162 100644
--- a/html-test/src/DeprecatedData.hs
+++ b/html-test/src/DeprecatedData.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 module DeprecatedData where
 
diff --git a/html-test/src/DeprecatedFunction.hs b/html-test/src/DeprecatedFunction.hs
index 8d626435..2c6418d3 100644
--- a/html-test/src/DeprecatedFunction.hs
+++ b/html-test/src/DeprecatedFunction.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedFunction where
 
 -- | some documentation for foo
diff --git a/html-test/src/DeprecatedFunction2.hs b/html-test/src/DeprecatedFunction2.hs
index bdbbf95c..fb4193f2 100644
--- a/html-test/src/DeprecatedFunction2.hs
+++ b/html-test/src/DeprecatedFunction2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedFunction2 where
 
 
diff --git a/html-test/src/DeprecatedFunction3.hs b/html-test/src/DeprecatedFunction3.hs
index ca719bda..4a286e0a 100644
--- a/html-test/src/DeprecatedFunction3.hs
+++ b/html-test/src/DeprecatedFunction3.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedFunction3 where
 
 
diff --git a/html-test/src/DeprecatedModule.hs b/html-test/src/DeprecatedModule.hs
index 369dba4f..179b5899 100644
--- a/html-test/src/DeprecatedModule.hs
+++ b/html-test/src/DeprecatedModule.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Documentation for "DeprecatedModule".
 module DeprecatedModule {-# DEPRECATED "Use \"Foo\" instead" #-} where
 
diff --git a/html-test/src/DeprecatedModule2.hs b/html-test/src/DeprecatedModule2.hs
index 94185297..ccec1be7 100644
--- a/html-test/src/DeprecatedModule2.hs
+++ b/html-test/src/DeprecatedModule2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedModule2 {-# DEPRECATED "Use Foo instead" #-} where
 
 foo :: Int
diff --git a/html-test/src/DeprecatedNewtype.hs b/html-test/src/DeprecatedNewtype.hs
index 254f1f55..6aeead44 100644
--- a/html-test/src/DeprecatedNewtype.hs
+++ b/html-test/src/DeprecatedNewtype.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedNewtype where
 
 -- | some documentation
diff --git a/html-test/src/DeprecatedReExport.hs b/html-test/src/DeprecatedReExport.hs
index f851e2ff..061c9c27 100644
--- a/html-test/src/DeprecatedReExport.hs
+++ b/html-test/src/DeprecatedReExport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- |
 -- What is tested here:
 --
diff --git a/html-test/src/DeprecatedRecord.hs b/html-test/src/DeprecatedRecord.hs
index d44499e7..9fe0240d 100644
--- a/html-test/src/DeprecatedRecord.hs
+++ b/html-test/src/DeprecatedRecord.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module DeprecatedRecord where
 
 -- | type Foo
diff --git a/html-test/src/DeprecatedTypeFamily.hs b/html-test/src/DeprecatedTypeFamily.hs
index 70473bb8..3d94cace 100644
--- a/html-test/src/DeprecatedTypeFamily.hs
+++ b/html-test/src/DeprecatedTypeFamily.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 module DeprecatedTypeFamily where
 
diff --git a/html-test/src/DeprecatedTypeSynonym.hs b/html-test/src/DeprecatedTypeSynonym.hs
index 34df47da..05fb9bdc 100644
--- a/html-test/src/DeprecatedTypeSynonym.hs
+++ b/html-test/src/DeprecatedTypeSynonym.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 
 module DeprecatedTypeSynonym where
 
diff --git a/html-test/src/DuplicateRecordFields.hs b/html-test/src/DuplicateRecordFields.hs
index 2cf9ff43..59441750 100644
--- a/html-test/src/DuplicateRecordFields.hs
+++ b/html-test/src/DuplicateRecordFields.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 module DuplicateRecordFields (RawReplay(..)) where
 
diff --git a/html-test/src/Examples.hs b/html-test/src/Examples.hs
index c8c450f1..b518ea70 100644
--- a/html-test/src/Examples.hs
+++ b/html-test/src/Examples.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Examples where
 
 -- | Fibonacci number of given 'Integer'.
diff --git a/html-test/src/Extensions.hs b/html-test/src/Extensions.hs
index 61eac219..bbaa6395 100644
--- a/html-test/src/Extensions.hs
+++ b/html-test/src/Extensions.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE Haskell2010, ExplicitForAll, MonomorphismRestriction #-}
 {-# OPTIONS_HADDOCK show-extensions #-}
 module Extensions where
diff --git a/html-test/src/FunArgs.hs b/html-test/src/FunArgs.hs
index e20bcda7..9d7c19dc 100644
--- a/html-test/src/FunArgs.hs
+++ b/html-test/src/FunArgs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RankNTypes, DataKinds, TypeFamilies #-}
 module FunArgs where
 
diff --git a/html-test/src/GADTRecords.hs b/html-test/src/GADTRecords.hs
index dcbbb870..015027d2 100644
--- a/html-test/src/GADTRecords.hs
+++ b/html-test/src/GADTRecords.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs #-}
 module GADTRecords (H1(..)) where
 
diff --git a/html-test/src/GadtConstructorArgs.hs b/html-test/src/GadtConstructorArgs.hs
index 79ffb4d3..6d742bd7 100644
--- a/html-test/src/GadtConstructorArgs.hs
+++ b/html-test/src/GadtConstructorArgs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, PatternSynonyms #-}
 
 module GadtConstructorArgs (Boo(..)) where
diff --git a/html-test/src/Hash.hs b/html-test/src/Hash.hs
index 1eb8af5b..ce40fdd3 100644
--- a/html-test/src/Hash.hs
+++ b/html-test/src/Hash.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {- |
   Implementation of fixed-size hash tables, with a type
   class for constructing hash values for structured types.
diff --git a/html-test/src/Hidden.hs b/html-test/src/Hidden.hs
index 896da648..2b694e86 100644
--- a/html-test/src/Hidden.hs
+++ b/html-test/src/Hidden.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# OPTIONS_HADDOCK hide #-}
 
 module Hidden where
diff --git a/html-test/src/HiddenInstances.hs b/html-test/src/HiddenInstances.hs
index 99a6c2fd..a9124098 100644
--- a/html-test/src/HiddenInstances.hs
+++ b/html-test/src/HiddenInstances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- http://trac.haskell.org/haddock/ticket/37
 module HiddenInstances (VisibleClass, VisibleData) where
 
diff --git a/html-test/src/HiddenInstancesA.hs b/html-test/src/HiddenInstancesA.hs
index f1775208..8879868c 100644
--- a/html-test/src/HiddenInstancesA.hs
+++ b/html-test/src/HiddenInstancesA.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# OPTIONS_HADDOCK hide #-}
 module HiddenInstancesA where
 
diff --git a/html-test/src/HiddenInstancesB.hs b/html-test/src/HiddenInstancesB.hs
index eabf0637..0def0ecc 100644
--- a/html-test/src/HiddenInstancesB.hs
+++ b/html-test/src/HiddenInstancesB.hs
@@ -1,2 +1,3 @@
+{-# LANGUAGE Haskell2010 #-}
 module HiddenInstancesB (Foo, Bar) where
 import HiddenInstancesA
diff --git a/html-test/src/Hyperlinks.hs b/html-test/src/Hyperlinks.hs
index 34e64448..f64a5bb1 100644
--- a/html-test/src/Hyperlinks.hs
+++ b/html-test/src/Hyperlinks.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Hyperlinks where
 
 -- |
diff --git a/html-test/src/Identifiers.hs b/html-test/src/Identifiers.hs
index 75f12109..13ee3b82 100644
--- a/html-test/src/Identifiers.hs
+++ b/html-test/src/Identifiers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeOperators #-}
 module Identifiers where
 
diff --git a/html-test/src/IgnoreExports.hs b/html-test/src/IgnoreExports.hs
index edb7c4c1..2016d3d5 100644
--- a/html-test/src/IgnoreExports.hs
+++ b/html-test/src/IgnoreExports.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# OPTIONS_HADDOCK ignore-exports #-}
 module IgnoreExports (Foo, foo) where
 
diff --git a/html-test/src/ImplicitParams.hs b/html-test/src/ImplicitParams.hs
index 3ca9157b..8635b2a4 100644
--- a/html-test/src/ImplicitParams.hs
+++ b/html-test/src/ImplicitParams.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ImplicitParams, RankNTypes #-}
 module ImplicitParams where
 
diff --git a/html-test/src/Instances.hs b/html-test/src/Instances.hs
index 545c8534..e9537a92 100644
--- a/html-test/src/Instances.hs
+++ b/html-test/src/Instances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
diff --git a/html-test/src/LinearTypes.hs b/html-test/src/LinearTypes.hs
index cb4eb138..c4f9c84f 100644
--- a/html-test/src/LinearTypes.hs
+++ b/html-test/src/LinearTypes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE LinearTypes #-}
 module LinearTypes where
 
diff --git a/html-test/src/Math.hs b/html-test/src/Math.hs
index 75bc513e..375dbc2d 100644
--- a/html-test/src/Math.hs
+++ b/html-test/src/Math.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Math (display) for 'normalDensity'
 --
 -- \[
diff --git a/html-test/src/Minimal.hs b/html-test/src/Minimal.hs
index 9df03cca..ec275aec 100644
--- a/html-test/src/Minimal.hs
+++ b/html-test/src/Minimal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | This tests the new MINIMAL pragma present in GHC 7.8
 module Minimal
   ( Foo(..)
diff --git a/html-test/src/ModuleWithWarning.hs b/html-test/src/ModuleWithWarning.hs
index e64d9d7e..710589bf 100644
--- a/html-test/src/ModuleWithWarning.hs
+++ b/html-test/src/ModuleWithWarning.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Documentation for "ModuleWithWarning".
 module ModuleWithWarning {-# WARNING "This is an unstable interface.  Prefer functions from \"Prelude\" instead!" #-} where
 
diff --git a/html-test/src/NamedDoc.hs b/html-test/src/NamedDoc.hs
index 7c04ba72..8ac40921 100644
--- a/html-test/src/NamedDoc.hs
+++ b/html-test/src/NamedDoc.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module NamedDoc where
 
 -- $foo bar
diff --git a/html-test/src/NamespacedIdentifiers.hs b/html-test/src/NamespacedIdentifiers.hs
index 6f59d247..38fb7101 100644
--- a/html-test/src/NamespacedIdentifiers.hs
+++ b/html-test/src/NamespacedIdentifiers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module NamespacedIdentifiers where
 
 -- | A link to:
diff --git a/html-test/src/Nesting.hs b/html-test/src/Nesting.hs
index f88be87d..fa45e11b 100644
--- a/html-test/src/Nesting.hs
+++ b/html-test/src/Nesting.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Nesting where
 
 {-|
diff --git a/html-test/src/NoLayout.hs b/html-test/src/NoLayout.hs
index 19b38b1d..e07470a3 100644
--- a/html-test/src/NoLayout.hs
+++ b/html-test/src/NoLayout.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 
 -- Haddock comments are parsed as separate declarations so we
 -- need to insert a ';' when using them with explicit layout.
diff --git a/html-test/src/NonGreedy.hs b/html-test/src/NonGreedy.hs
index f51b55f5..b89b0723 100644
--- a/html-test/src/NonGreedy.hs
+++ b/html-test/src/NonGreedy.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module NonGreedy where
 
 -- | <url1> <url2>
diff --git a/html-test/src/Operators.hs b/html-test/src/Operators.hs
index 0b633c3f..c303c8bd 100644
--- a/html-test/src/Operators.hs
+++ b/html-test/src/Operators.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE PatternSynonyms, TypeOperators, TypeFamilies, MultiParamTypeClasses, GADTs #-}
 {-# LANGUAGE FunctionalDependencies #-}
 
diff --git a/html-test/src/OrphanInstances.hs b/html-test/src/OrphanInstances.hs
index e50327ee..e7a24c45 100644
--- a/html-test/src/OrphanInstances.hs
+++ b/html-test/src/OrphanInstances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module OrphanInstances where
 
 import OrphanInstancesType
diff --git a/html-test/src/OrphanInstancesClass.hs b/html-test/src/OrphanInstancesClass.hs
index 4b51acfc..d5cbf708 100644
--- a/html-test/src/OrphanInstancesClass.hs
+++ b/html-test/src/OrphanInstancesClass.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module OrphanInstancesClass (AClass(..)) where
 
 class AClass a where
diff --git a/html-test/src/OrphanInstancesType.hs b/html-test/src/OrphanInstancesType.hs
index b3c3145e..8a48b93e 100644
--- a/html-test/src/OrphanInstancesType.hs
+++ b/html-test/src/OrphanInstancesType.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module OrphanInstancesType (AType(..)) where
 
 data AType = AType Int
diff --git a/html-test/src/PR643.hs b/html-test/src/PR643.hs
index 565e5b57..a6ad81ee 100644
--- a/html-test/src/PR643.hs
+++ b/html-test/src/PR643.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module PR643 (test) where
 
 import PR643_1
diff --git a/html-test/src/PR643_1.hs b/html-test/src/PR643_1.hs
index ecd0db94..67dabee3 100644
--- a/html-test/src/PR643_1.hs
+++ b/html-test/src/PR643_1.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module PR643_1 where
 
 infixr 5 `test`
diff --git a/html-test/src/PatternSyns.hs b/html-test/src/PatternSyns.hs
index bf0f7848..e0da6d6b 100644
--- a/html-test/src/PatternSyns.hs
+++ b/html-test/src/PatternSyns.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE ExistentialQuantification, PatternSynonyms, PolyKinds, TypeOperators #-}
 
 -- | Testing some pattern synonyms
diff --git a/html-test/src/PromotedTypes.hs b/html-test/src/PromotedTypes.hs
index ae3ad375..624f9d5a 100644
--- a/html-test/src/PromotedTypes.hs
+++ b/html-test/src/PromotedTypes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
diff --git a/html-test/src/Properties.hs b/html-test/src/Properties.hs
index 05930ece..8b1409f3 100644
--- a/html-test/src/Properties.hs
+++ b/html-test/src/Properties.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Properties where
 
 -- | Fibonacci number of given 'Integer'.
diff --git a/html-test/src/PruneWithWarning.hs b/html-test/src/PruneWithWarning.hs
index bfa55ea2..c2f746f0 100644
--- a/html-test/src/PruneWithWarning.hs
+++ b/html-test/src/PruneWithWarning.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# OPTIONS_HADDOCK prune #-}
 -- |
 -- What is tested here:
diff --git a/html-test/src/QuantifiedConstraints.hs b/html-test/src/QuantifiedConstraints.hs
index 82dd81e5..4f96b322 100644
--- a/html-test/src/QuantifiedConstraints.hs
+++ b/html-test/src/QuantifiedConstraints.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 module QuantifiedConstraints where
 
diff --git a/html-test/src/QuasiExpr.hs b/html-test/src/QuasiExpr.hs
index 970759ba..d81fcf8b 100644
--- a/html-test/src/QuasiExpr.hs
+++ b/html-test/src/QuasiExpr.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 -- Used by QuasiQuote. Example taken from the GHC documentation.
diff --git a/html-test/src/QuasiQuote.hs b/html-test/src/QuasiQuote.hs
index 06762cf9..fe900eb8 100644
--- a/html-test/src/QuasiQuote.hs
+++ b/html-test/src/QuasiQuote.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
 
 -- example taken from the GHC documentation
diff --git a/html-test/src/SectionLabels.hs b/html-test/src/SectionLabels.hs
index 560bafa4..0017bd72 100644
--- a/html-test/src/SectionLabels.hs
+++ b/html-test/src/SectionLabels.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module SectionLabels
   (
     -- * Section heading#custom#
diff --git a/html-test/src/SpuriousSuperclassConstraints.hs b/html-test/src/SpuriousSuperclassConstraints.hs
index 3e230945..cb204941 100644
--- a/html-test/src/SpuriousSuperclassConstraints.hs
+++ b/html-test/src/SpuriousSuperclassConstraints.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE EmptyDataDecls, KindSignatures #-}
 -- |
 -- What is tested here:
diff --git a/html-test/src/TH.hs b/html-test/src/TH.hs
index f8178bcb..2692ae42 100644
--- a/html-test/src/TH.hs
+++ b/html-test/src/TH.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module TH where
diff --git a/html-test/src/TH2.hs b/html-test/src/TH2.hs
index ea85e547..f878b1e0 100644
--- a/html-test/src/TH2.hs
+++ b/html-test/src/TH2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module TH2 where
diff --git a/html-test/src/Table.hs b/html-test/src/Table.hs
index 2cf0c662..4ffbc9b3 100644
--- a/html-test/src/Table.hs
+++ b/html-test/src/Table.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | This tests the table markup
 module Table
   ( tableWithHeader
diff --git a/html-test/src/Test.hs b/html-test/src/Test.hs
index e94cc414..a809f337 100644
--- a/html-test/src/Test.hs
+++ b/html-test/src/Test.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Test
diff --git a/html-test/src/Threaded.hs b/html-test/src/Threaded.hs
index 7f3073ad..afe38c27 100644
--- a/html-test/src/Threaded.hs
+++ b/html-test/src/Threaded.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 -- | Ensures haddock built with @-threaded@.
diff --git a/html-test/src/Threaded_TH.hs b/html-test/src/Threaded_TH.hs
index 53e5a399..8179f090 100644
--- a/html-test/src/Threaded_TH.hs
+++ b/html-test/src/Threaded_TH.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- | Imported by 'Threaded', since a TH splice can't be used in the
 -- module where it is defined.
 module Threaded_TH where
diff --git a/html-test/src/Ticket112.hs b/html-test/src/Ticket112.hs
index c9cd5117..db7f3ed0 100644
--- a/html-test/src/Ticket112.hs
+++ b/html-test/src/Ticket112.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE MagicHash #-}
 
 module Ticket112 where
diff --git a/html-test/src/Ticket61.hs b/html-test/src/Ticket61.hs
index 26ca287f..c80e1c75 100644
--- a/html-test/src/Ticket61.hs
+++ b/html-test/src/Ticket61.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Ticket61 (module Ticket61_Hidden) where
 
 import Ticket61_Hidden
diff --git a/html-test/src/Ticket61_Hidden.hs b/html-test/src/Ticket61_Hidden.hs
index 583c10cd..f3654cfc 100644
--- a/html-test/src/Ticket61_Hidden.hs
+++ b/html-test/src/Ticket61_Hidden.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# OPTIONS_HADDOCK hide #-}
 
 module Ticket61_Hidden where
diff --git a/html-test/src/Ticket75.hs b/html-test/src/Ticket75.hs
index 5fc704d6..743ffd60 100644
--- a/html-test/src/Ticket75.hs
+++ b/html-test/src/Ticket75.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeOperators #-}
 module Ticket75 where
 
diff --git a/html-test/src/TitledPicture.hs b/html-test/src/TitledPicture.hs
index 7029d98a..69d44397 100644
--- a/html-test/src/TitledPicture.hs
+++ b/html-test/src/TitledPicture.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module TitledPicture where
 
 -- | Picture for 'foo' without a title <<bar>>
diff --git a/html-test/src/TypeFamilies.hs b/html-test/src/TypeFamilies.hs
index a79d503e..d759af4f 100644
--- a/html-test/src/TypeFamilies.hs
+++ b/html-test/src/TypeFamilies.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies, UndecidableInstances, PolyKinds, TypeOperators, DataKinds, MultiParamTypeClasses, GADTs #-}
 
 -- | Doc for: module TypeFamilies
diff --git a/html-test/src/TypeFamilies2.hs b/html-test/src/TypeFamilies2.hs
index b66acbfa..c1211319 100644
--- a/html-test/src/TypeFamilies2.hs
+++ b/html-test/src/TypeFamilies2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 -- This tests what happens if we have unexported types
 -- in type instances. The expected behaviour is
diff --git a/html-test/src/TypeFamilies3.hs b/html-test/src/TypeFamilies3.hs
index bde05fb8..80279e36 100644
--- a/html-test/src/TypeFamilies3.hs
+++ b/html-test/src/TypeFamilies3.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 
 module TypeFamilies3 where
diff --git a/html-test/src/TypeOperators.hs b/html-test/src/TypeOperators.hs
index e69e89cb..e82d065d 100644
--- a/html-test/src/TypeOperators.hs
+++ b/html-test/src/TypeOperators.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeOperators, GADTs, MultiParamTypeClasses, FlexibleContexts #-}
 module TypeOperators where
 
diff --git a/html-test/src/UnboxedStuff.hs b/html-test/src/UnboxedStuff.hs
index bd1b1302..dfeb7429 100644
--- a/html-test/src/UnboxedStuff.hs
+++ b/html-test/src/UnboxedStuff.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE UnboxedSums, UnboxedTuples #-}
 module UnboxedStuff where
 
diff --git a/html-test/src/Unicode.hs b/html-test/src/Unicode.hs
index d5bbf445..ecd195cf 100644
--- a/html-test/src/Unicode.hs
+++ b/html-test/src/Unicode.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Unicode where
 
 -- | γλώσσα
diff --git a/html-test/src/Unicode2.hs b/html-test/src/Unicode2.hs
index ca6b18ba..19925a4f 100644
--- a/html-test/src/Unicode2.hs
+++ b/html-test/src/Unicode2.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Unicode2 where
 
 -- | All of the following work with a unicode character ü:
diff --git a/html-test/src/Visible.hs b/html-test/src/Visible.hs
index cad71931..9440aeef 100644
--- a/html-test/src/Visible.hs
+++ b/html-test/src/Visible.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Visible where
 visible :: Int -> Int
 visible a = a
diff --git a/hypsrc-test/ref/src/Bug1091.html b/hypsrc-test/ref/src/Bug1091.html
index a9c7d163..3aad9cc8 100644
--- a/hypsrc-test/ref/src/Bug1091.html
+++ b/hypsrc-test/ref/src/Bug1091.html
@@ -7,12 +7,19 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE CPP #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE CPP #-}</span
+      ><span
+      >
+</span
+      ><span id="line-3"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
diff --git a/hypsrc-test/ref/src/CPP.html b/hypsrc-test/ref/src/CPP.html
index 719be7f8..41cb8f8c 100644
--- a/hypsrc-test/ref/src/CPP.html
+++ b/hypsrc-test/ref/src/CPP.html
@@ -7,12 +7,19 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE CPP #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE CPP #-}</span
+      ><span
+      >
+</span
+      ><span id="line-3"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -31,7 +38,7 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span class="annot"
       ><a href="CPP.html#foo"
@@ -52,7 +59,7 @@
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span id="foo"
       ><span class="annot"
@@ -92,7 +99,7 @@
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span class="annot"
       ><a href="CPP.html#bar"
@@ -113,7 +120,7 @@
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id="bar"
       ><span class="annot"
@@ -147,26 +154,26 @@
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span class="hs-comment"
       >-- &quot; single quotes are fine in line comments</span
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span class="hs-comment"
       >-- {- unclosed block comments are fine in line comments</span
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span class="hs-comment"
       >-- Multiline CPP is also fine</span
@@ -178,7 +185,7 @@
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span class="annot"
       ><a href="CPP.html#baz"
@@ -199,7 +206,7 @@
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span id="baz"
       ><span class="annot"
@@ -228,7 +235,7 @@
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
index 2a44be99..f3993425 100644
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,17 +26,17 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="hs-keyword"
       >class</span
@@ -60,7 +67,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >    </span
@@ -97,7 +104,7 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >    </span
@@ -148,12 +155,12 @@
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span class="hs-keyword"
       >instance</span
@@ -178,7 +185,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >    </span
@@ -210,7 +217,7 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >    </span
@@ -273,12 +280,12 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="hs-keyword"
       >instance</span
@@ -392,17 +399,17 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span class="hs-keyword"
       >class</span
@@ -453,7 +460,7 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span
       >    </span
@@ -506,7 +513,7 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >    </span
@@ -597,12 +604,12 @@ forall a. Foo' a =&gt; [a] -&gt; a
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span
       >    </span
@@ -645,7 +652,7 @@ forall a. Foo' a =&gt; [a] -&gt; a
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span
       >    </span
@@ -750,12 +757,12 @@ forall a. Foo a =&gt; a -&gt; Int
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span class="hs-keyword"
       >instance</span
@@ -782,7 +789,7 @@ forall a. Foo a =&gt; a -&gt; Int
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span
       >    </span
@@ -814,12 +821,12 @@ forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span class="hs-keyword"
       >instance</span
@@ -896,17 +903,17 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span class="hs-keyword"
       >class</span
@@ -937,7 +944,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span
       >    </span
@@ -1072,12 +1079,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span class="hs-keyword"
       >instance</span
@@ -1102,7 +1109,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ><span
       >    </span
@@ -1198,7 +1205,7 @@ forall a b. a -&gt; b -&gt; a
       ><span
       >
 </span
-      ><span id="line-36"
+      ><span id="line-37"
       ></span
       ><span
       >    </span
@@ -1289,7 +1296,7 @@ forall a b. a -&gt; b -&gt; a
       ><span
       >
 </span
-      ><span id="line-37"
+      ><span id="line-38"
       ></span
       ><span
       >    </span
@@ -1380,7 +1387,7 @@ forall a b. a -&gt; b -&gt; a
       ><span
       >
 </span
-      ><span id="line-38"
+      ><span id="line-39"
       ></span
       ><span
       >    </span
@@ -1471,7 +1478,7 @@ forall a b. a -&gt; b -&gt; a
       ><span
       >
 </span
-      ><span id="line-39"
+      ><span id="line-40"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Constructors.html b/hypsrc-test/ref/src/Constructors.html
index 2cc234ac..d5c3dd33 100644
--- a/hypsrc-test/ref/src/Constructors.html
+++ b/hypsrc-test/ref/src/Constructors.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,17 +26,17 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -46,7 +53,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >    </span
@@ -65,7 +72,7 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >    </span
@@ -84,7 +91,7 @@
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >    </span
@@ -117,12 +124,12 @@
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span class="hs-keyword"
       >newtype</span
@@ -189,17 +196,17 @@
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#bar"
@@ -242,7 +249,7 @@
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span id="bar"
       ><span class="annot"
@@ -273,7 +280,7 @@
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id="baz"
       ><span class="annot"
@@ -304,7 +311,7 @@
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span id="quux"
       ><span class="annot"
@@ -355,17 +362,17 @@
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unfoo"
@@ -398,7 +405,7 @@
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span id="unfoo"
       ><span class="annot"
@@ -438,7 +445,7 @@
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unfoo"
@@ -473,7 +480,7 @@
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unfoo"
@@ -588,17 +595,17 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unnorf"
@@ -637,7 +644,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span id="unnorf"
       ><span class="annot"
@@ -723,7 +730,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unnorf"
@@ -814,7 +821,7 @@ forall a. [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unnorf"
@@ -848,17 +855,17 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span class="annot"
       ><a href="Constructors.html#unnorf%27"
@@ -891,7 +898,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span id="unnorf%27"
       ><span class="annot"
@@ -1047,7 +1054,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span
       >    </span
@@ -1148,7 +1155,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span
       >  </span
@@ -1157,7 +1164,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span
       >    </span
@@ -1278,7 +1285,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ><span
       >    </span
@@ -1383,7 +1390,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-36"
+      ><span id="line-37"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Identifiers.html b/hypsrc-test/ref/src/Identifiers.html
index e0f88772..a983182d 100644
--- a/hypsrc-test/ref/src/Identifiers.html
+++ b/hypsrc-test/ref/src/Identifiers.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,17 +26,17 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="annot"
       ><a href="Identifiers.html#foo"
@@ -90,7 +97,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span id="foo"
       ><span class="annot"
@@ -253,7 +260,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span id="bar"
       ><span class="annot"
@@ -416,7 +423,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span id="baz"
       ><span class="annot"
@@ -557,12 +564,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span class="annot"
       ><a href="Identifiers.html#quux"
@@ -593,7 +600,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span id="quux"
       ><span class="annot"
@@ -711,12 +718,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="annot"
       ><a href="Identifiers.html#norf"
@@ -767,7 +774,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span id="norf"
       ><span class="annot"
@@ -822,7 +829,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span
       >    </span
@@ -887,7 +894,7 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span
       >    </span
@@ -952,7 +959,7 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >    </span
@@ -1017,7 +1024,7 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span
       >    </span
@@ -1101,17 +1108,17 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span class="annot"
       ><a href="Identifiers.html#main"
@@ -1138,7 +1145,7 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span id="main"
       ><span class="annot"
@@ -1162,7 +1169,7 @@ forall a. Ord a =&gt; a -&gt; a -&gt; Bool
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span
       >    </span
@@ -1239,7 +1246,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span
       >    </span
@@ -1305,7 +1312,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span
       >    </span
@@ -1393,7 +1400,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span
       >  </span
@@ -1402,7 +1409,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span
       >    </span
@@ -1433,7 +1440,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span
       >    </span
@@ -1464,7 +1471,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span
       >    </span
@@ -1495,7 +1502,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/LinkingIdentifiers.html b/hypsrc-test/ref/src/LinkingIdentifiers.html
index c923b6da..3a6cca56 100644
--- a/hypsrc-test/ref/src/LinkingIdentifiers.html
+++ b/hypsrc-test/ref/src/LinkingIdentifiers.html
@@ -6,41 +6,48 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-comment"
-      >-- Tests that the identifers/operators are properly linked even when:</span
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
       ><span class="hs-comment"
-      >--</span
+      >-- Tests that the identifers/operators are properly linked even when:</span
       ><span
       >
 </span
       ><span id="line-3"
       ></span
       ><span class="hs-comment"
-      >--   * backquoted, parenthesized, vanilla</span
+      >--</span
       ><span
       >
 </span
       ><span id="line-4"
       ></span
       ><span class="hs-comment"
-      >--   * qualified, not-qualified</span
+      >--   * backquoted, parenthesized, vanilla</span
       ><span
       >
 </span
       ><span id="line-5"
       ></span
       ><span class="hs-comment"
-      >--</span
+      >--   * qualified, not-qualified</span
       ><span
       >
 </span
       ><span id="line-6"
       ></span
+      ><span class="hs-comment"
+      >--</span
+      ><span
+      >
+</span
+      ><span id="line-7"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -54,12 +61,12 @@
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span class="annot"
       ><a href="LinkingIdentifiers.html#ident"
@@ -100,7 +107,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span id=""
       ><span class="annot"
@@ -222,7 +229,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span class="annot"
       ><a href="LinkingIdentifiers.html#ident"
@@ -331,12 +338,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="annot"
       ><a href="LinkingIdentifiers.html#%2B%2B%3A%2B%2B"
@@ -377,7 +384,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span id=""
       ><span class="annot"
@@ -499,7 +506,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span class="annot"
       ><a href="LinkingIdentifiers.html#%2B%2B%3A%2B%2B"
@@ -608,7 +615,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Literals.html b/hypsrc-test/ref/src/Literals.html
index db6d37b3..94deb304 100644
--- a/hypsrc-test/ref/src/Literals.html
+++ b/hypsrc-test/ref/src/Literals.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,17 +26,17 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="annot"
       ><a href="Literals.html#str"
@@ -50,7 +57,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span id="str"
       ><span class="annot"
@@ -79,12 +86,12 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span id=""
       ><span class="annot"
@@ -127,7 +134,7 @@
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id="num"
       ><span class="annot"
@@ -232,12 +239,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span id=""
       ><span class="annot"
@@ -280,7 +287,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span id="frac"
       ><span class="annot"
@@ -309,12 +316,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span id=""
       ><span class="annot"
@@ -355,7 +362,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id="list"
       ><span class="annot"
@@ -413,12 +420,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span class="annot"
       ><a href="Literals.html#pair"
@@ -479,7 +486,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span id="pair"
       ><span class="annot"
@@ -545,7 +552,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html
index 2ce87a6e..04006a0d 100644
--- a/hypsrc-test/ref/src/Operators.html
+++ b/hypsrc-test/ref/src/Operators.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,17 +26,17 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span id=""
       ><span class="annot"
@@ -90,7 +97,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span id=""
       ><span class="annot"
@@ -189,12 +196,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span id=""
       ><span class="annot"
@@ -255,7 +262,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id=""
       ><span class="annot"
@@ -335,12 +342,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span id=""
       ><span class="annot"
@@ -401,7 +408,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span id="%2A%2A%2A"
       ><span class="annot"
@@ -451,7 +458,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="annot"
       ><a href="Operators.html#%2A%2A%2A"
@@ -568,12 +575,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id=""
       ><span class="annot"
@@ -638,7 +645,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span id=""
       ><span class="annot"
@@ -732,12 +739,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span id=""
       ><span class="annot"
@@ -810,7 +817,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span id=""
       ><span class="annot"
@@ -954,17 +961,17 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span id=""
       ><span id=""
@@ -1047,7 +1054,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span id=""
       ><span class="annot"
@@ -1141,7 +1148,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Polymorphism.html b/hypsrc-test/ref/src/Polymorphism.html
index 1b166aff..e1c13828 100644
--- a/hypsrc-test/ref/src/Polymorphism.html
+++ b/hypsrc-test/ref/src/Polymorphism.html
@@ -7,19 +7,21 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE RankNTypes #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
       ><span class="hs-pragma"
-      >{-# LANGUAGE ScopedTypeVariables #-}</span
+      >{-# LANGUAGE RankNTypes #-}</span
       ><span
       >
 </span
       ><span id="line-3"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE ScopedTypeVariables #-}</span
       ><span
       >
 </span
@@ -30,6 +32,11 @@
 </span
       ><span id="line-5"
       ></span
+      ><span
+      >
+</span
+      ><span id="line-6"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -43,17 +50,17 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id=""
       ><span class="annot"
@@ -102,7 +109,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span id="foo"
       ><span class="annot"
@@ -132,12 +139,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#foo%27"
@@ -200,7 +207,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span id="foo%27"
       ><span class="annot"
@@ -230,12 +237,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id=""
       ><span id=""
@@ -300,7 +307,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span id="bar"
       ><span class="annot"
@@ -330,12 +337,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#bar%27"
@@ -422,7 +429,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span id="bar%27"
       ><span class="annot"
@@ -452,12 +459,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span id=""
       ><span id=""
@@ -552,7 +559,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span id="baz"
       ><span class="annot"
@@ -582,12 +589,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#baz%27"
@@ -704,7 +711,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span id="baz%27"
       ><span class="annot"
@@ -734,12 +741,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span id=""
       ><span class="annot"
@@ -820,7 +827,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span id="quux"
       ><span class="annot"
@@ -889,12 +896,12 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#quux%27"
@@ -989,7 +996,7 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span id="quux%27"
       ><span class="annot"
@@ -1058,17 +1065,17 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span id=""
       ><span class="annot"
@@ -1135,7 +1142,7 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span id="num"
       ><span class="annot"
@@ -1165,12 +1172,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ><span
       >
 </span
-      ><span id="line-36"
+      ><span id="line-37"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#num%27"
@@ -1251,7 +1258,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-37"
+      ><span id="line-38"
       ></span
       ><span id="num%27"
       ><span class="annot"
@@ -1281,12 +1288,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-38"
+      ><span id="line-39"
       ></span
       ><span
       >
 </span
-      ><span id="line-39"
+      ><span id="line-40"
       ></span
       ><span id=""
       ><span id=""
@@ -1397,7 +1404,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-40"
+      ><span id="line-41"
       ></span
       ><span id="eq"
       ><span class="annot"
@@ -1427,12 +1434,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-41"
+      ><span id="line-42"
       ></span
       ><span
       >
 </span
-      ><span id="line-42"
+      ><span id="line-43"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#eq%27"
@@ -1565,7 +1572,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-43"
+      ><span id="line-44"
       ></span
       ><span id="eq%27"
       ><span class="annot"
@@ -1595,12 +1602,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-44"
+      ><span id="line-45"
       ></span
       ><span
       >
 </span
-      ><span id="line-45"
+      ><span id="line-46"
       ></span
       ><span id=""
       ><span id=""
@@ -1689,7 +1696,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-46"
+      ><span id="line-47"
       ></span
       ><span id="mon"
       ><span class="annot"
@@ -1719,12 +1726,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-47"
+      ><span id="line-48"
       ></span
       ><span
       >
 </span
-      ><span id="line-48"
+      ><span id="line-49"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#mon%27"
@@ -1835,7 +1842,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-49"
+      ><span id="line-50"
       ></span
       ><span id="mon%27"
       ><span class="annot"
@@ -1865,17 +1872,17 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-50"
+      ><span id="line-51"
       ></span
       ><span
       >
 </span
-      ><span id="line-51"
+      ><span id="line-52"
       ></span
       ><span
       >
 </span
-      ><span id="line-52"
+      ><span id="line-53"
       ></span
       ><span id=""
       ><span class="annot"
@@ -1974,7 +1981,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-53"
+      ><span id="line-54"
       ></span
       ><span id="norf"
       ><span class="annot"
@@ -2031,12 +2038,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-54"
+      ><span id="line-55"
       ></span
       ><span
       >
 </span
-      ><span id="line-55"
+      ><span id="line-56"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#norf%27"
@@ -2149,7 +2156,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-56"
+      ><span id="line-57"
       ></span
       ><span id="norf%27"
       ><span class="annot"
@@ -2206,17 +2213,17 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-57"
+      ><span id="line-58"
       ></span
       ><span
       >
 </span
-      ><span id="line-58"
+      ><span id="line-59"
       ></span
       ><span
       >
 </span
-      ><span id="line-59"
+      ><span id="line-60"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#plugh"
@@ -2267,7 +2274,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-60"
+      ><span id="line-61"
       ></span
       ><span id="plugh"
       ><span class="annot"
@@ -2323,12 +2330,12 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-61"
+      ><span id="line-62"
       ></span
       ><span
       >
 </span
-      ><span id="line-62"
+      ><span id="line-63"
       ></span
       ><span class="annot"
       ><a href="Polymorphism.html#thud"
@@ -2431,7 +2438,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-63"
+      ><span id="line-64"
       ></span
       ><span id="thud"
       ><span class="annot"
@@ -2477,7 +2484,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-64"
+      ><span id="line-65"
       ></span
       ><span
       >    </span
@@ -2548,7 +2555,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-65"
+      ><span id="line-66"
       ></span
       ><span
       >  </span
@@ -2557,7 +2564,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-66"
+      ><span id="line-67"
       ></span
       ><span
       >    </span
@@ -2641,7 +2648,7 @@ forall a. HasCallStack =&gt; a
       ><span
       >
 </span
-      ><span id="line-67"
+      ><span id="line-68"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/PositionPragmas.html b/hypsrc-test/ref/src/PositionPragmas.html
index 8ee123fa..3fef6c73 100644
--- a/hypsrc-test/ref/src/PositionPragmas.html
+++ b/hypsrc-test/ref/src/PositionPragmas.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -19,12 +26,12 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span class="hs-pragma"
       >{-# LINE 8 &quot;hypsrc-test/src/PositionPragmas.hs&quot; #-}</span
diff --git a/hypsrc-test/ref/src/Quasiquoter.html b/hypsrc-test/ref/src/Quasiquoter.html
index 867c78ca..53c05de1 100644
--- a/hypsrc-test/ref/src/Quasiquoter.html
+++ b/hypsrc-test/ref/src/Quasiquoter.html
@@ -6,7 +6,14 @@
     ></head
   ><body
   ><pre
-    ><span class="hs-keyword"
+    ><span class="hs-pragma"
+      >{-# LANGUAGE Haskell2010 #-}</span
+      ><span
+      >
+</span
+      ><span id="line-2"
+      ></span
+      ><span class="hs-keyword"
       >module</span
       ><span
       > </span
@@ -35,12 +42,12 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id="line-3"
       ></span
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span class="hs-keyword"
       >import</span
@@ -53,7 +60,7 @@
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="hs-keyword"
       >import</span
@@ -66,19 +73,19 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span class="hs-comment"
       >-- | Quoter for constructing multiline string literals</span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span class="annot"
       ><a href="Quasiquoter.html#string"
@@ -99,7 +106,7 @@
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id="string"
       ><span class="annot"
@@ -125,7 +132,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >  </span
@@ -195,7 +202,7 @@ forall b c a. (b -&gt; c) -&gt; (a -&gt; b) -&gt; a -&gt; c
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >  </span
@@ -229,7 +236,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >  </span
@@ -263,7 +270,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span
       >  </span
@@ -297,7 +304,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span
       >  </span
@@ -306,7 +313,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span
       >  </span
@@ -315,7 +322,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span
       >    </span
@@ -358,7 +365,7 @@ forall a. String -&gt; Q a
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >    </span
@@ -408,7 +415,7 @@ forall (m :: * -&gt; *) a. MonadFail m =&gt; String -&gt; m a
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index 7c5b2ff7..9adf02de 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -7,19 +7,21 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE NamedFieldPuns #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
       ><span class="hs-pragma"
-      >{-# LANGUAGE RecordWildCards #-}</span
+      >{-# LANGUAGE NamedFieldPuns #-}</span
       ><span
       >
 </span
       ><span id="line-3"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE RecordWildCards #-}</span
       ><span
       >
 </span
@@ -30,6 +32,11 @@
 </span
       ><span id="line-5"
       ></span
+      ><span
+      >
+</span
+      ><span id="line-6"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -43,17 +50,17 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -84,7 +91,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >    </span
@@ -118,7 +125,7 @@
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >    </span
@@ -152,7 +159,7 @@
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >    </span
@@ -161,17 +168,17 @@
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span class="annot"
       ><a href="Records.html#point"
@@ -214,7 +221,7 @@
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span id="point"
       ><span class="annot"
@@ -330,17 +337,17 @@
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span class="annot"
       ><a href="Records.html#lengthSqr"
@@ -373,7 +380,7 @@
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span id="lengthSqr"
       ><span class="annot"
@@ -545,12 +552,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span class="annot"
       ><a href="Records.html#lengthSqr%27"
@@ -583,7 +590,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span id="lengthSqr%27"
       ><span class="annot"
@@ -729,17 +736,17 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span class="annot"
       ><a href="Records.html#translateX"
@@ -794,7 +801,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span id="translateX"
       ><span class="annot"
@@ -917,7 +924,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span id="translateY"
       ><span class="annot"
@@ -1040,12 +1047,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span class="annot"
       ><a href="Records.html#translate"
@@ -1100,7 +1107,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span id="translate"
       ><span class="annot"
@@ -1159,7 +1166,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span
       >    </span
@@ -1186,7 +1193,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span
       >  </span
@@ -1195,7 +1202,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span
       >    </span
@@ -1264,7 +1271,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span
       >    </span
@@ -1430,7 +1437,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html b/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html
index 38dfb97e..9c06e8e0 100644
--- a/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html
+++ b/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html
@@ -7,17 +7,24 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE TemplateHaskell #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE TemplateHaskell #-}</span
       ><span
       >
 </span
       ><span id="line-3"
       ></span
+      ><span
+      >
+</span
+      ><span id="line-4"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -31,12 +38,12 @@
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span class="hs-keyword"
       >import</span
@@ -49,12 +56,12 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span class="annot"
       ><a href="TemplateHaskellQuasiquotes.html#aDecl"
@@ -75,7 +82,7 @@
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id="aDecl"
       ><span class="annot"
@@ -99,7 +106,7 @@
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span
       >    </span
@@ -144,7 +151,7 @@
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >    </span
@@ -169,7 +176,7 @@
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span
       >  </span
@@ -178,12 +185,12 @@
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span class="annot"
       ><a href="TemplateHaskellQuasiquotes.html#aPattern"
@@ -204,7 +211,7 @@
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span id="aPattern"
       ><span class="annot"
@@ -228,7 +235,7 @@
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span
       >    </span
@@ -241,7 +248,7 @@
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >    </span
@@ -254,7 +261,7 @@
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span
       >    </span
@@ -277,7 +284,7 @@
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span
       >    </span
@@ -304,7 +311,7 @@
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >    </span
@@ -313,7 +320,7 @@
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >  </span
@@ -322,12 +329,12 @@
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span class="annot"
       ><a href="TemplateHaskellQuasiquotes.html#aNumberPattern"
@@ -348,7 +355,7 @@
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span id="aNumberPattern"
       ><span class="annot"
@@ -372,7 +379,7 @@
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span
       >    </span
@@ -389,7 +396,7 @@
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span
       >  </span
@@ -398,12 +405,12 @@
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span class="annot"
       ><a href="TemplateHaskellQuasiquotes.html#anExpression"
@@ -434,7 +441,7 @@
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span id="anExpression"
       ><span class="annot"
@@ -458,7 +465,7 @@
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span
       >    </span
@@ -495,7 +502,7 @@
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span
       >  </span
@@ -504,7 +511,7 @@
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span id="anExpression2"
       ><span class="annot"
@@ -552,12 +559,12 @@
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span class="annot"
       ><a href="TemplateHaskellQuasiquotes.html#aType"
@@ -578,7 +585,7 @@
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span id="aType"
       ><span class="annot"
@@ -602,7 +609,7 @@
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ><span
       >    </span
@@ -629,7 +636,7 @@
       ><span
       >
 </span
-      ><span id="line-36"
+      ><span id="line-37"
       ></span
       ><span
       >  </span
@@ -638,22 +645,22 @@
       ><span
       >
 </span
-      ><span id="line-37"
+      ><span id="line-38"
       ></span
       ><span
       >
 </span
-      ><span id="line-38"
+      ><span id="line-39"
       ></span
       ><span
       >
 </span
-      ><span id="line-39"
+      ><span id="line-40"
       ></span
       ><span
       >
 </span
-      ><span id="line-40"
+      ><span id="line-41"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/TemplateHaskellSplices.html b/hypsrc-test/ref/src/TemplateHaskellSplices.html
index 63b0025d..db43c818 100644
--- a/hypsrc-test/ref/src/TemplateHaskellSplices.html
+++ b/hypsrc-test/ref/src/TemplateHaskellSplices.html
@@ -7,12 +7,19 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE TemplateHaskell #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE TemplateHaskell #-}</span
+      ><span
+      >
+</span
+      ><span id="line-3"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -26,12 +33,12 @@
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="hs-keyword"
       >import</span
@@ -46,12 +53,12 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span class="hs-special"
       >$</span
@@ -66,12 +73,12 @@
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span id="foo"
       ><span class="annot"
@@ -111,7 +118,7 @@ forall a. a -&gt; a
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Types.html b/hypsrc-test/ref/src/Types.html
index 835fafb0..641ba512 100644
--- a/hypsrc-test/ref/src/Types.html
+++ b/hypsrc-test/ref/src/Types.html
@@ -7,12 +7,14 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE TypeFamilies #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE TypeFamilies #-}</span
       ><span
       >
 </span
@@ -23,6 +25,11 @@
 </span
       ><span id="line-4"
       ></span
+      ><span
+      >
+</span
+      ><span id="line-5"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -36,17 +43,17 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-8"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -91,12 +98,12 @@
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-9"
       ></span
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-10"
       ></span
       ><span class="hs-keyword"
       >newtype</span
@@ -133,12 +140,12 @@
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-12"
       ></span
       ><span class="hs-keyword"
       >type</span
@@ -181,7 +188,7 @@
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-13"
       ></span
       ><span class="hs-keyword"
       >type</span
@@ -224,17 +231,17 @@
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-14"
       ></span
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-15"
       ></span
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-16"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -275,12 +282,12 @@
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-17"
       ></span
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-18"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -347,7 +354,7 @@
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-19"
       ></span
       ><span class="hs-keyword"
       >data</span
@@ -414,17 +421,17 @@
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-20"
       ></span
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id="line-21"
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id="line-22"
       ></span
       ><span class="hs-keyword"
       >type</span
@@ -465,12 +472,12 @@
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-23"
       ></span
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-24"
       ></span
       ><span class="hs-keyword"
       >type</span
@@ -533,7 +540,7 @@
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-25"
       ></span
       ><span class="hs-keyword"
       >type</span
@@ -596,17 +603,17 @@
       ><span
       >
 </span
-      ><span id="line-25"
+      ><span id="line-26"
       ></span
       ><span
       >
 </span
-      ><span id="line-26"
+      ><span id="line-27"
       ></span
       ><span
       >
 </span
-      ><span id="line-27"
+      ><span id="line-28"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf1"
@@ -655,7 +662,7 @@
       ><span
       >
 </span
-      ><span id="line-28"
+      ><span id="line-29"
       ></span
       ><span id="norf1"
       ><span class="annot"
@@ -725,7 +732,7 @@
       ><span
       >
 </span
-      ><span id="line-29"
+      ><span id="line-30"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf1"
@@ -790,12 +797,12 @@
       ><span
       >
 </span
-      ><span id="line-30"
+      ><span id="line-31"
       ></span
       ><span
       >
 </span
-      ><span id="line-31"
+      ><span id="line-32"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf2"
@@ -844,7 +851,7 @@
       ><span
       >
 </span
-      ><span id="line-32"
+      ><span id="line-33"
       ></span
       ><span id="norf2"
       ><span class="annot"
@@ -914,7 +921,7 @@
       ><span
       >
 </span
-      ><span id="line-33"
+      ><span id="line-34"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf2"
@@ -979,17 +986,17 @@
       ><span
       >
 </span
-      ><span id="line-34"
+      ><span id="line-35"
       ></span
       ><span
       >
 </span
-      ><span id="line-35"
+      ><span id="line-36"
       ></span
       ><span
       >
 </span
-      ><span id="line-36"
+      ><span id="line-37"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf1%27"
@@ -1038,7 +1045,7 @@
       ><span
       >
 </span
-      ><span id="line-37"
+      ><span id="line-38"
       ></span
       ><span id="norf1%27"
       ><span class="annot"
@@ -1098,7 +1105,7 @@
       ><span
       >
 </span
-      ><span id="line-38"
+      ><span id="line-39"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf1%27"
@@ -1153,12 +1160,12 @@
       ><span
       >
 </span
-      ><span id="line-39"
+      ><span id="line-40"
       ></span
       ><span
       >
 </span
-      ><span id="line-40"
+      ><span id="line-41"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf2%27"
@@ -1207,7 +1214,7 @@
       ><span
       >
 </span
-      ><span id="line-41"
+      ><span id="line-42"
       ></span
       ><span id="norf2%27"
       ><span class="annot"
@@ -1267,7 +1274,7 @@
       ><span
       >
 </span
-      ><span id="line-42"
+      ><span id="line-43"
       ></span
       ><span class="annot"
       ><a href="Types.html#norf2%27"
@@ -1322,7 +1329,7 @@
       ><span
       >
 </span
-      ><span id="line-43"
+      ><span id="line-44"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/UsingQuasiquotes.html b/hypsrc-test/ref/src/UsingQuasiquotes.html
index ca48775d..1e7aef2c 100644
--- a/hypsrc-test/ref/src/UsingQuasiquotes.html
+++ b/hypsrc-test/ref/src/UsingQuasiquotes.html
@@ -7,12 +7,19 @@
   ><body
   ><pre
     ><span class="hs-pragma"
-      >{-# LANGUAGE QuasiQuotes #-}</span
+      >{-# LANGUAGE Haskell2010 #-}</span
       ><span
       >
 </span
       ><span id="line-2"
       ></span
+      ><span class="hs-pragma"
+      >{-# LANGUAGE QuasiQuotes #-}</span
+      ><span
+      >
+</span
+      ><span id="line-3"
+      ></span
       ><span class="hs-keyword"
       >module</span
       ><span
@@ -26,12 +33,12 @@
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id="line-4"
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id="line-5"
       ></span
       ><span class="hs-keyword"
       >import</span
@@ -46,12 +53,12 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id="line-6"
       ></span
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-7"
       ></span
       ><span id="baz"
       ><span class="annot"
@@ -96,7 +103,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-11"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/src/Bug1091.hs b/hypsrc-test/src/Bug1091.hs
index f0cea033..013acbbc 100644
--- a/hypsrc-test/src/Bug1091.hs
+++ b/hypsrc-test/src/Bug1091.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE CPP #-}
 module Bug1091 where
 
diff --git a/hypsrc-test/src/CPP.hs b/hypsrc-test/src/CPP.hs
index f00ce031..59cb6034 100644
--- a/hypsrc-test/src/CPP.hs
+++ b/hypsrc-test/src/CPP.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE CPP #-}
 module CPP where
 
diff --git a/hypsrc-test/src/Classes.hs b/hypsrc-test/src/Classes.hs
index b3c3f785..0f2416de 100644
--- a/hypsrc-test/src/Classes.hs
+++ b/hypsrc-test/src/Classes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Classes where
 
 
diff --git a/hypsrc-test/src/Constructors.hs b/hypsrc-test/src/Constructors.hs
index 8cb46535..66260ee8 100644
--- a/hypsrc-test/src/Constructors.hs
+++ b/hypsrc-test/src/Constructors.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Constructors where
 
 
diff --git a/hypsrc-test/src/Identifiers.hs b/hypsrc-test/src/Identifiers.hs
index 173c3ba7..72853a4a 100644
--- a/hypsrc-test/src/Identifiers.hs
+++ b/hypsrc-test/src/Identifiers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Identifiers where
 
 
diff --git a/hypsrc-test/src/LinkingIdentifiers.hs b/hypsrc-test/src/LinkingIdentifiers.hs
index 4fff9776..b195c2c6 100644
--- a/hypsrc-test/src/LinkingIdentifiers.hs
+++ b/hypsrc-test/src/LinkingIdentifiers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 -- Tests that the identifers/operators are properly linked even when:
 --
 --   * backquoted, parenthesized, vanilla
diff --git a/hypsrc-test/src/Literals.hs b/hypsrc-test/src/Literals.hs
index 997b6615..d862bf87 100644
--- a/hypsrc-test/src/Literals.hs
+++ b/hypsrc-test/src/Literals.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Literals where
 
 
diff --git a/hypsrc-test/src/Operators.hs b/hypsrc-test/src/Operators.hs
index 8e86ab0b..1dcb8856 100644
--- a/hypsrc-test/src/Operators.hs
+++ b/hypsrc-test/src/Operators.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Operators where
 
 
diff --git a/hypsrc-test/src/Polymorphism.hs b/hypsrc-test/src/Polymorphism.hs
index 3f0103bf..dfcb37fa 100644
--- a/hypsrc-test/src/Polymorphism.hs
+++ b/hypsrc-test/src/Polymorphism.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
diff --git a/hypsrc-test/src/PositionPragmas.hs b/hypsrc-test/src/PositionPragmas.hs
index 907316fd..e01334ed 100644
--- a/hypsrc-test/src/PositionPragmas.hs
+++ b/hypsrc-test/src/PositionPragmas.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module PositionPragmas where
 
 {-# LINE 8 "hypsrc-test/src/PositionPragmas.hs" #-}
diff --git a/hypsrc-test/src/Quasiquoter.hs b/hypsrc-test/src/Quasiquoter.hs
index d0a46c33..48f1b155 100644
--- a/hypsrc-test/src/Quasiquoter.hs
+++ b/hypsrc-test/src/Quasiquoter.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Quasiquoter ( string ) where
 
 import Language.Haskell.TH.Quote
diff --git a/hypsrc-test/src/Records.hs b/hypsrc-test/src/Records.hs
index 40a01121..ae5a0c55 100644
--- a/hypsrc-test/src/Records.hs
+++ b/hypsrc-test/src/Records.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 
diff --git a/hypsrc-test/src/TemplateHaskellQuasiquotes.hs b/hypsrc-test/src/TemplateHaskellQuasiquotes.hs
index 6d404921..7fafc7aa 100644
--- a/hypsrc-test/src/TemplateHaskellQuasiquotes.hs
+++ b/hypsrc-test/src/TemplateHaskellQuasiquotes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module TemplateHaskellQuasiquotes where
diff --git a/hypsrc-test/src/TemplateHaskellSplices.hs b/hypsrc-test/src/TemplateHaskellSplices.hs
index bbd3948e..f8a859a0 100644
--- a/hypsrc-test/src/TemplateHaskellSplices.hs
+++ b/hypsrc-test/src/TemplateHaskellSplices.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TemplateHaskell #-}
 module TemplateHaskellSplices where
 
diff --git a/hypsrc-test/src/Types.hs b/hypsrc-test/src/Types.hs
index b63a825b..a0481e82 100644
--- a/hypsrc-test/src/Types.hs
+++ b/hypsrc-test/src/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 
 
diff --git a/hypsrc-test/src/UsingQuasiquotes.hs b/hypsrc-test/src/UsingQuasiquotes.hs
index 34872d4d..44da0c4b 100644
--- a/hypsrc-test/src/UsingQuasiquotes.hs
+++ b/hypsrc-test/src/UsingQuasiquotes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE QuasiQuotes #-}
 module UsingQuasiquotes where
 
diff --git a/latex-test/src/ConstructorArgs/ConstructorArgs.hs b/latex-test/src/ConstructorArgs/ConstructorArgs.hs
index 6b0da711..c3b848c3 100644
--- a/latex-test/src/ConstructorArgs/ConstructorArgs.hs
+++ b/latex-test/src/ConstructorArgs/ConstructorArgs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, PatternSynonyms #-}
 
 module ConstructorArgs (Foo(..), Boo(Foo, Foa, Fo, Fo'), pattern Bo, pattern Bo') where
diff --git a/latex-test/src/DefaultSignatures/DefaultSignatures.hs b/latex-test/src/DefaultSignatures/DefaultSignatures.hs
index 52d68a96..1b1b8257 100644
--- a/latex-test/src/DefaultSignatures/DefaultSignatures.hs
+++ b/latex-test/src/DefaultSignatures/DefaultSignatures.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE DefaultSignatures #-}
 
 module DefaultSignatures where
diff --git a/latex-test/src/Deprecated/Deprecated.hs b/latex-test/src/Deprecated/Deprecated.hs
index aecec94e..bf7755c6 100644
--- a/latex-test/src/Deprecated/Deprecated.hs
+++ b/latex-test/src/Deprecated/Deprecated.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Deprecated where
 
 -- | Docs for something deprecated
diff --git a/latex-test/src/Example/Example.hs b/latex-test/src/Example/Example.hs
index 42ff1646..932fddfa 100644
--- a/latex-test/src/Example/Example.hs
+++ b/latex-test/src/Example/Example.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Example where
 
 -- | Example use.
diff --git a/latex-test/src/GadtConstructorArgs/GadtConstructorArgs.hs b/latex-test/src/GadtConstructorArgs/GadtConstructorArgs.hs
index 79ffb4d3..6d742bd7 100644
--- a/latex-test/src/GadtConstructorArgs/GadtConstructorArgs.hs
+++ b/latex-test/src/GadtConstructorArgs/GadtConstructorArgs.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE GADTs, PatternSynonyms #-}
 
 module GadtConstructorArgs (Boo(..)) where
diff --git a/latex-test/src/LinearTypes/LinearTypes.hs b/latex-test/src/LinearTypes/LinearTypes.hs
index cb4eb138..c4f9c84f 100644
--- a/latex-test/src/LinearTypes/LinearTypes.hs
+++ b/latex-test/src/LinearTypes/LinearTypes.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE LinearTypes #-}
 module LinearTypes where
 
diff --git a/latex-test/src/NamespacedIdentifier/NamespacedIdentifier.hs b/latex-test/src/NamespacedIdentifier/NamespacedIdentifier.hs
index 6f59d247..38fb7101 100644
--- a/latex-test/src/NamespacedIdentifier/NamespacedIdentifier.hs
+++ b/latex-test/src/NamespacedIdentifier/NamespacedIdentifier.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module NamespacedIdentifiers where
 
 -- | A link to:
diff --git a/latex-test/src/Simple/Simple.hs b/latex-test/src/Simple/Simple.hs
index 7c6b9744..d1c7cf6d 100644
--- a/latex-test/src/Simple/Simple.hs
+++ b/latex-test/src/Simple/Simple.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 module Simple (foo) where
 
 -- | This is foo.
diff --git a/latex-test/src/TypeFamilies3/TypeFamilies3.hs b/latex-test/src/TypeFamilies3/TypeFamilies3.hs
index bde05fb8..80279e36 100644
--- a/latex-test/src/TypeFamilies3/TypeFamilies3.hs
+++ b/latex-test/src/TypeFamilies3/TypeFamilies3.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE TypeFamilies #-}
 
 module TypeFamilies3 where
diff --git a/latex-test/src/UnboxedStuff/UnboxedStuff.hs b/latex-test/src/UnboxedStuff/UnboxedStuff.hs
index bd1b1302..dfeb7429 100644
--- a/latex-test/src/UnboxedStuff/UnboxedStuff.hs
+++ b/latex-test/src/UnboxedStuff/UnboxedStuff.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Haskell2010 #-}
 {-# LANGUAGE UnboxedSums, UnboxedTuples #-}
 module UnboxedStuff where
 
-- 
cgit v1.2.3