Start refactoring to reduce executable type knowledge.

courgette/ensemble_apply.cc

Index: courgette/ensemble_apply.cc
diff --git a/courgette/ensemble_apply.cc b/courgette/ensemble_apply.cc
index 6efbc405b22953dfa856ec333ec5c11b99f826ba..499ccac54fa32970ff90f1aeadc1e2e078e5406d 100644
--- a/courgette/ensemble_apply.cc
+++ b/courgette/ensemble_apply.cc
@@ -136,13 +136,19 @@ Status EnsemblePatchApplication::ReadInitialParameters(
     if (!transformation_parameters->ReadVarint32(&kind))
       return C_BAD_ENSEMBLE_HEADER;
 
-    if (kind == CourgettePatchFile::T_COURGETTE_WIN32_X86) {
-      TransformationPatcher* patcher =
-          new CourgetteWin32X86Patcher(base_region_);
+    TransformationPatcher* patcher = NULL;
+
+    switch (kind)
+    {
+      case CourgettePatchFile::T_COURGETTE_WIN32_X86:
+        patcher = new CourgetteWin32X86Patcher(base_region_);
+        break;
+    }
+
+    if (patcher)
       patchers_.push_back(patcher);
-    } else {
+    else
       return C_BAD_ENSEMBLE_HEADER;
-    }
   }
 
   for (size_t i = 0;  i < patchers_.size();  ++i) {