diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
index 679cd269..311b63ff 100644
--- a/Tools/CodeGen/KrancThorn.m
+++ b/Tools/CodeGen/KrancThorn.m
@@ -197,6 +197,13 @@ Thorn generation (main entry point for non-tensorial thorns)
     rhsGroups = Map[groupName, rhsGroupDefinitions];
     rhsODEGroups = Map[groupName, rhsODEGroupDefinitions];
 
+    (* Construct a source file for each calculation *)
+    allParams = Join[Map[ParamName, realParamDefs],
+                     Map[ParamName, intParamDefs],
+                     Map[unqualifiedName, inheritedRealParams], 
+                     Map[unqualifiedName, inheritedIntParams], 
+                     Map[unqualifiedName, inheritedKeywordParams]];
+
     calcs = Map[Join[#,
                      {ODEGroups -> Join[odeGroups, rhsODEGroups],
                       Parameters -> allParams,
@@ -272,12 +279,6 @@ Thorn generation (main entry point for non-tensorial thorns)
 
     ext = CodeGenC`SOURCESUFFIX;
 
-    (* Construct a source file for each calculation *)
-    allParams = Join[Map[ParamName, realParamDefs],
-                     Map[ParamName, intParamDefs],
-                     Map[unqualifiedName, inheritedRealParams], 
-                     Map[unqualifiedName, inheritedIntParams], 
-                     Map[unqualifiedName, inheritedKeywordParams]];
 
     InfoMessage[Terse, "Creating calculation source files"];
 
@@ -294,8 +295,6 @@ Thorn generation (main entry point for non-tensorial thorns)
                                If[!OptionValue[UseCaKernel], calcFilenames, {}],
       Map[lookup[#, Filename] &, boundarySources]]];
 
-    If[OptionValue[UseCaKernel], make = {make, CaKernelEpilogue[]}];
-
     (* Put all the above together and generate the Cactus thorn *)
     thornspec = {Name          -> thornName, 
                  Directory     -> parentDirectory,