diff --git a/tools/llvmc2/driver/CompilationGraph.cpp b/tools/llvmc2/driver/CompilationGraph.cpp
index 838b940..81283ba 100644
--- a/tools/llvmc2/driver/CompilationGraph.cpp
+++ b/tools/llvmc2/driver/CompilationGraph.cpp
@@ -109,12 +109,8 @@
 }
 
 void CompilationGraph::insertNode(Tool* V) {
-  if (NodesMap.count(V->Name()) == 0) {
-    Node N;
-    N.OwningGraph = this;
-    N.ToolPtr = V;
-    NodesMap[V->Name()] = N;
-  }
+  if (NodesMap.count(V->Name()) == 0)
+    NodesMap[V->Name()] = Node(this, V);
 }
 
 void CompilationGraph::insertEdge(const std::string& A, Edge* Edg) {
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index a68c056..7836172 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -20,12 +20,14 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Streams.h"
+
 #include <algorithm>
 #include <cassert>
 #include <functional>
 #include <stdexcept>
 #include <string>
 #include <typeinfo>
+
 using namespace llvm;
 
 namespace {