diff --git a/compiler/simplCore/CommonContext.lhs b/compiler/simplCore/CommonContext.lhs
index 9199e70154a6df664c2d4f69c18ceb5bfb3b6437..1cfcbe99128c0c626ae68255afc6df9b2e59cc1c 100644
--- a/compiler/simplCore/CommonContext.lhs
+++ b/compiler/simplCore/CommonContext.lhs
@@ -52,6 +52,8 @@ findInterestingLet (Let (Rec pairs) body) =
 process :: Var -> CoreExpr -> CoreExpr -> (Var, CoreExpr, CoreExpr)
 process v e body
   | idArity v <= 0 = (v, e, body)
+  -- TODO: check for non value args here. For now, ignore this let then
+  -- Possibly later: Check if all uses have the same type argument
   | otherwise
   = case contextOf v body of
         OneUse cts | not (null cts) ->
diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index 92784d33b37a411fa1f24ee40a0d789398179002..110c461d3925824262a82fec2ab95921a040288c 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -190,8 +190,6 @@ getCoreToDo dflags
     demand_analyser = (CoreDoPasses ([
                            CoreDoStrictness,
                            CoreDoWorkerWrapper,
-                           simpl_phase 0 ["post-worker-wrapper"] max_iter,
-                           CoreCommonContext,
                            simpl_phase 0 ["post-worker-wrapper"] max_iter
                            ]))
 
@@ -293,6 +291,9 @@ getCoreToDo dflags
                         -- reduce the possiblility of shadowing
                         -- Reason: see Note [Shadowing] in SpecConstr.lhs
 
+        CoreCommonContext,
+        simpl_phase 0 ["post-common-context"] max_iter,
+
         runWhen spec_constr CoreDoSpecConstr,
 
         maybe_rule_check (Phase 0),