diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h
index 24c447431f..1dfe922797 100644
--- a/stepmania/src/XmlFile.h
+++ b/stepmania/src/XmlFile.h
@@ -12,15 +12,12 @@ struct XNode;
 typedef multimap<CString,XNode*> XNodes;
 
 #define FOREACH_Attr( pNode, Var ) \
-	XAttrs::iterator Var; \
-	CString &Var = NULL; \
-	for( Var = (pNode)->m_attrs.begin(); \
+	for( XAttrs::iterator Var = (pNode)->m_attrs.begin(); \
 		Var != (pNode)->m_attrs.end(); \
 		++Var )
 
 #define FOREACH_CONST_Attr( pNode, Var ) \
-	XAttrs::const_iterator Var; \
-	for( Var = (pNode)->m_attrs.begin(); \
+	for( XAttrs::const_iterator Var = (pNode)->m_attrs.begin(); \
 		Var != (pNode)->m_attrs.end(); \
 		++Var )
 
@@ -38,7 +35,6 @@ typedef multimap<CString,XNode*> XNodes;
 		Var##Iter != (pNode)->m_childs.end(); \
 		++Var##Iter, Var = Var##Iter->second )
 
-
 enum PCODE
 {
 	PIE_PARSE_WELL_FORMED = 0,