diff --git a/src/Disco/Effects/Store.hs b/src/Disco/Effects/Store.hs
index 131b7414..de33615d 100644
--- a/src/Disco/Effects/Store.hs
+++ b/src/Disco/Effects/Store.hs
@@ -11,10 +11,10 @@
 -- Polysemy effect for a memory store with integer keys.
 module Disco.Effects.Store where
 
-import Data.Proxy
 import qualified Data.IntMap.Lazy as IntMap
 import Data.IntSet (IntSet)
 import qualified Data.IntSet as IntSet
+import Data.Proxy
 
 import Disco.Effects.Counter
 import Polysemy
diff --git a/src/Disco/Messages.hs b/src/Disco/Messages.hs
index 86b079b9..ccd686bf 100644
--- a/src/Disco/Messages.hs
+++ b/src/Disco/Messages.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DeriveFunctor #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE QuantifiedConstraints #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 -- |
 -- Module      :  Disco.Messages
diff --git a/src/Disco/Pretty.hs b/src/Disco/Pretty.hs
index 8890f54a..1c73dcb0 100644
--- a/src/Disco/Pretty.hs
+++ b/src/Disco/Pretty.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DerivingVia #-}
+{-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE ImportQualifiedPost #-}
 
 -- TODO: the calls to 'error' should be replaced with logging/error capabilities.
 
@@ -17,7 +17,7 @@ module Disco.Pretty (
   module Disco.Pretty.DSL,
   module Disco.Pretty,
   module Disco.Pretty.Prec,
-  Doc
+  Doc,
 )
 where
 
@@ -26,12 +26,12 @@ import Prelude hiding ((<>))
 import Data.Bifunctor
 import Data.Char (isAlpha)
 import Data.List.NonEmpty (NonEmpty)
-import qualified Data.List.NonEmpty as NE
+import Data.List.NonEmpty qualified as NE
 import Data.Map (Map)
-import qualified Data.Map as M
+import Data.Map qualified as M
 import Data.Ratio
 import Data.Set (Set)
-import qualified Data.Set as S
+import Data.Set qualified as S
 import Disco.Effects.LFresh
 import Disco.Pretty.DSL
 import Disco.Pretty.Prec
diff --git a/src/Disco/Typecheck.hs b/src/Disco/Typecheck.hs
index 6abf5ba8..ef84d37a 100644
--- a/src/Disco/Typecheck.hs
+++ b/src/Disco/Typecheck.hs
@@ -41,7 +41,7 @@ import qualified Disco.Subst as Subst
 import Disco.Syntax.Operators
 import Disco.Syntax.Prims
 import Disco.Typecheck.Constraints
-import Disco.Typecheck.Solve (SolutionLimit (..), solveConstraint, SolveError)
+import Disco.Typecheck.Solve (SolutionLimit (..), SolveError, solveConstraint)
 import Disco.Typecheck.Util
 import Disco.Types
 import Disco.Types.Rules
diff --git a/src/Disco/Typecheck/Solve.hs b/src/Disco/Typecheck/Solve.hs
index 9825f75a..a689af26 100644
--- a/src/Disco/Typecheck/Solve.hs
+++ b/src/Disco/Typecheck/Solve.hs
@@ -14,7 +14,6 @@
 -- checking/inference.
 module Disco.Typecheck.Solve where
 
-import Data.Proxy
 import Control.Arrow ((&&&), (***))
 import Control.Lens hiding (use, (%=), (.=))
 import Control.Monad (forM, join, unless, zipWithM)
@@ -37,6 +36,7 @@ import Data.Maybe (
   mapMaybe,
  )
 import Data.Monoid (First (..))
+import Data.Proxy
 import Data.Semigroup (sconcat)
 import Data.Set (Set)
 import Data.Set qualified as S