diff --git a/data/CompState.hs b/data/CompState.hs
index e00e870..6bc46a0 100644
--- a/data/CompState.hs
+++ b/data/CompState.hs
@@ -84,9 +84,9 @@ data CompState = CompState {
     csNames :: Map String A.NameDef,
     csUnscopedNames :: Map String String,
     csNameCounter :: Int,
-    csTypeContext :: [Maybe A.Type],
 
     -- Set by passes
+    csTypeContext :: [Maybe A.Type],
     csNonceCounter :: Int,
     csFunctionReturns :: Map String [A.Type],
     csPulledItems :: [[PulledItem]],
@@ -115,8 +115,8 @@ emptyState = CompState {
     csNames = Map.empty,
     csUnscopedNames = Map.empty,
     csNameCounter = 0,
-    csTypeContext = [],
 
+    csTypeContext = [],
     csNonceCounter = 0,
     csFunctionReturns = Map.empty,
     csPulledItems = [],
@@ -327,4 +327,4 @@ ghostVarPrefix = "##"
 
 -- | A suffix put on all ghost variables, such as Rain's timers
 ghostVarSuffix :: String
-ghostVarSuffix = "_##"
\ No newline at end of file
+ghostVarSuffix = "_##"