diff --git a/lib/CodeGen/MachineModuleInfo.cpp b/lib/CodeGen/MachineModuleInfo.cpp
index 473b605..bdd771b 100644
--- a/lib/CodeGen/MachineModuleInfo.cpp
+++ b/lib/CodeGen/MachineModuleInfo.cpp
@@ -250,10 +250,7 @@
   
 public:
   DISerializeVisitor(DISerializer &S, std::vector<Constant*> &E)
-  : DIVisitor()
-  , SR(S)
-  , Elements(E)
-  {}
+  : DIVisitor(), SR(S), Elements(E) {}
   
   /// Apply - Set the value of each of the fields.
   ///
@@ -337,10 +334,7 @@
   
 public:
   DIGetTypesVisitor(DISerializer &S, std::vector<const Type*> &F)
-  : DIVisitor()
-  , SR(S)
-  , Fields(F)
-  {}
+    : DIVisitor(), SR(S), Fields(F) {}
   
   /// Apply - Set the value of each of the fields.
   ///
@@ -511,8 +505,7 @@
   if (EmptyStructPtrTy) return EmptyStructPtrTy;
 
   // Construct the pointer to empty structure type.
-  const StructType *EmptyStructTy =
-    StructType::get(std::vector<const Type*>());
+  const StructType *EmptyStructTy = StructType::get(NULL, NULL);
 
   // Construct the pointer to empty structure type.
   EmptyStructPtrTy = PointerType::getUnqual(EmptyStructTy);
@@ -529,6 +522,7 @@
   if (!Ty) {
     // Set up fields vector.
     std::vector<const Type*> Fields;
+
     // Get types of fields.
     DIGetTypesVisitor GTAM(*this, Fields);
     GTAM.ApplyToFields(DD);
@@ -596,6 +590,7 @@
  
   // Set up elements vector
   std::vector<Constant*> Elements;
+
   // Add fields.
   DISerializeVisitor SRAM(*this, Elements);
   SRAM.ApplyToFields(DD);