diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h
index c18434d1f07..bb248c34ed1 100644
--- a/lib/AsmParser/ParserInternals.h
+++ b/lib/AsmParser/ParserInternals.h
@@ -67,8 +67,7 @@ static inline void ThrowException(const std::string &message,
 // discriminated union.
 //
 // Note that I can't implement this class in a straight forward manner with 
-// constructors and stuff because it goes in a union, and GCC doesn't like 
-// putting classes with ctor's in unions.  :(
+// constructors and stuff because it goes in a union.
 //
 struct ValID {
   enum {
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index 5706b5396ea..8049dc8c6a9 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1122,10 +1122,8 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
     
       if (I != CurModule.GlobalRefs.end()) {
 	V = I->second;             // Placeholder already exists, use it...
+        $2.destroy();
       } else {
-	// TODO: Include line number info by creating a subclass of
-	// TODO: GlobalVariable here that includes the said information!
-	
 	// Create a placeholder for the global variable reference...
 	GlobalVariable *GV = new GlobalVariable(PT->getElementType(),
                                                 false,