JavaScriptExpert
diff --git a/‎psci/PSCi.hs‎
Lines changed: 7 additions & 5 deletions b/‎psci/PSCi.hs‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎purescript.cabal‎
Lines changed: 0 additions & 1 deletion b/‎purescript.cabal‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Control/Monad/Unify.hs‎
Lines changed: 0 additions & 160 deletions b/‎src/Control/Monad/Unify.hs‎
Lines changed: 0 additions & 160 deletions
diff --git a/‎src/Language/PureScript/Errors.hs‎
Lines changed: 2 additions & 15 deletions b/‎src/Language/PureScript/Errors.hs‎
Lines changed: 2 additions & 15 deletions
diff --git a/‎src/Language/PureScript/Kinds.hs‎
Lines changed: 1 addition & 2 deletions b/‎src/Language/PureScript/Kinds.hs‎
Lines changed: 1 addition & 2 deletions
@@ -35,12 +35,11 @@ import Control.Arrow (first)
 import Control.Monad
 import Control.Monad.Error.Class (MonadError(..))
 import Control.Monad.Trans.Class
-import Control.Monad.Trans.Except (runExceptT)
+import Control.Monad.Trans.Except (ExceptT(), runExceptT)
 import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)
 import Control.Monad.Trans.State.Strict
 import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Writer.Strict (runWriter)
-import qualified Control.Monad.Trans.State.Lazy as L
+import Control.Monad.Writer.Strict (Writer(), runWriter)
 
 import Options.Applicative as Opts
 
@@ -424,8 +423,11 @@ handleKindOf typ = do
     Right env' ->
       case M.lookup (P.Qualified (Just mName) $ P.ProperName "IT") (P.typeSynonyms env') of
         Just (_, typ') -> do
-          let chk = P.CheckState env' 0 0 (Just mName)
-              k   = fst . runWriter . runExceptT $ L.runStateT (P.unCheck (P.kindOf typ')) chk
+          let chk = (P.emptyCheckState env') { P.checkCurrentModule = Just mName }
+              k   = check (P.kindOf typ') chk
+
+              check :: StateT P.CheckState (ExceptT P.MultipleErrors (Writer P.MultipleErrors)) a -> P.CheckState -> Either P.MultipleErrors (a, P.CheckState)
+              check sew cs = fst . runWriter . runExceptT . runStateT sew $ cs
           case k of
             Left errStack   -> PSCI . outputStrLn . P.prettyPrintMultipleErrors False $ errStack
             Right (kind, _) -> PSCI . outputStrLn . P.prettyPrintKind $ kind
 
@@ -173,7 +173,6 @@ library
                      Language.PureScript.Publish.BoxesHelpers
 
                      Control.Monad.Logger
-                     Control.Monad.Unify
                      Control.Monad.Supply
                      Control.Monad.Supply.Class
 
 
@@ -32,7 +32,6 @@ import Data.Foldable (fold)
 import qualified Data.Map as M
 
 import Control.Monad
-import Control.Monad.Unify
 import Control.Monad.Writer
 import Control.Monad.Error.Class (MonadError(..))
 #if __GLASGOW_HASKELL__ < 710
@@ -183,12 +182,6 @@ data HintCategory
 
 data ErrorMessage = ErrorMessage [ErrorMessageHint] SimpleErrorMessage deriving (Show)
 
-instance UnificationError Type ErrorMessage where
-  occursCheckFailed t = ErrorMessage [] $ InfiniteType t
-
-instance UnificationError Kind ErrorMessage where
-  occursCheckFailed k = ErrorMessage [] $ InfiniteKind k
-
 -- |
 -- Get the error code for a particular error type
 --
@@ -291,12 +284,6 @@ errorCode em = case unwrapErrorMessage em of
 newtype MultipleErrors = MultipleErrors
   { runMultipleErrors :: [ErrorMessage] } deriving (Show, Monoid)
 
-instance UnificationError Type MultipleErrors where
-  occursCheckFailed t = MultipleErrors [occursCheckFailed t]
-
-instance UnificationError Kind MultipleErrors where
-  occursCheckFailed k = MultipleErrors [occursCheckFailed k]
-
 -- | Check whether a collection of errors is empty or not.
 nonEmpty :: MultipleErrors -> Bool
 nonEmpty = not . null . runMultipleErrors
@@ -326,7 +313,7 @@ addHint hint = onErrorMessages $ \(ErrorMessage hints se) -> ErrorMessage (hint
 data LabelType = TypeLabel | SkolemLabel String deriving (Show, Read, Eq, Ord)
 
 -- | A map from rigid type variable name/unknown variable pairs to new variables.
-type UnknownMap = M.Map (LabelType, Unknown) Unknown
+type UnknownMap = M.Map (LabelType, Int) Int
 
 -- | How critical the issue is
 data Level = Error | Warning deriving Show
@@ -340,7 +327,7 @@ unwrapErrorMessage (ErrorMessage _ se) = se
 replaceUnknowns :: Type -> State UnknownMap Type
 replaceUnknowns = everywhereOnTypesM replaceTypes
   where
-  lookupTable :: (LabelType, Unknown) -> UnknownMap -> (Unknown, UnknownMap)
+  lookupTable :: (LabelType, Int) -> UnknownMap -> (Int, UnknownMap)
   lookupTable x m = case M.lookup x m of
                       Nothing -> let i = length (filter (on (==) fst x) (M.keys m)) in (i, M.insert x i m)
                       Just i  -> (i, m)
 
@@ -24,7 +24,6 @@ import qualified Data.Aeson.TH as A
 #if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
 #endif
-import Control.Monad.Unify (Unknown)
 
 -- |
 -- The data type of kinds
@@ -33,7 +32,7 @@ data Kind
   -- |
   -- Unification variable of type Kind
   --
-  = KUnknown Unknown
+  = KUnknown Int
   -- |
   -- The kind of types
   --