diff --git a/Driver/Backend.cpp b/Driver/Backend.cpp
index dbe46fc..f16c069 100644
--- a/Driver/Backend.cpp
+++ b/Driver/Backend.cpp
@@ -89,9 +89,6 @@
       CodeGenPasses(0), PerModulePasses(0), PerFunctionPasses(0) {}
 
     ~BackendConsumer() {
-      // FIXME: Move out of destructor.
-      EmitAssembly();
-
       delete AsmOutStream;
       delete TheTargetData;
       delete ModuleProvider;
@@ -115,6 +112,11 @@
     
     virtual void HandleTranslationUnit(TranslationUnit& TU) {
       Gen->HandleTranslationUnit(TU);
+
+      EmitAssembly();      
+      // Force a flush here in case we never get released.
+      if (AsmOutStream)
+        AsmOutStream->flush();
     }
     
     virtual void HandleTagDeclDefinition(TagDecl *D) {
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 5fc86a7..4973a42 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -1363,6 +1363,9 @@
   // files.
   if (ClearSourceMgr)
     PP.getSourceManager().clearIDTables();
+
+  if (DisableFree)
+    Consumer.take();
 }
 
 static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag,