3 files changed, 11 insertions, 4 deletions
diff --git a/compiler/main/Constants.hs b/compiler/main/Constants.hs
index 22bd4e6e02..0f23fc242e 100644
--- a/compiler/main/Constants.hs
+++ b/compiler/main/Constants.hs
@@ -17,9 +17,6 @@ mAX_TUPLE_SIZE :: Int
 mAX_TUPLE_SIZE = 62 -- Should really match the number
                     -- of decls in Data.Tuple
 
-mAX_CTUPLE_SIZE :: Int   -- Constraint tuples
-mAX_CTUPLE_SIZE = 8      -- Should match the number of decls in GHC.Classes
-
 -- | Default maximum depth for both class instance search and type family
 -- reduction. See also Trac #5395.
 mAX_REDUCTION_DEPTH :: Int
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 5ae104b1da..0acbdff8a5 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -90,7 +90,9 @@ import BasicTypes       ( HValue )
 import ByteCodeGen      ( byteCodeGen, coreExprToBCOs )
 import Linker
 import CoreTidy         ( tidyExpr )
-import Type             ( Type, Kind )
+import Type             ( Type )
+import PrelNames
+import {- Kind parts of -} Type         ( Kind )
 import CoreLint         ( lintInteractiveExpr )
 import VarEnv           ( emptyTidyEnv )
 import Panic
@@ -99,6 +101,7 @@ import ConLike
 import GHC.Exts
 #endif
 
+import DsMeta           ( templateHaskellNames )
 import Module
 import Packages
 import RdrName
@@ -189,6 +192,12 @@ newHscEnv dflags = do
                      hsc_type_env_var = Nothing }
 
 
+knownKeyNames :: [Name]      -- Put here to avoid loops involving DsMeta,
+knownKeyNames =              -- where templateHaskellNames are defined
+    map getName wiredInThings
+        ++ basicKnownKeyNames
+        ++ templateHaskellNames
+
 -- -----------------------------------------------------------------------------
 
 getWarnings :: Hsc WarningMessages
diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index e2876a43d3..914a1459df 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -43,6 +43,7 @@ import CmdLineParser
 import FastString
 import SrcLoc
 import Util
+-- import Maybes                ( firstJusts )
 import Panic
 
 import Control.Monad