diff --git a/stepmania/src/EnumHelper.cpp b/stepmania/src/EnumHelper.cpp
index c32690961c..9c402bbf62 100644
--- a/stepmania/src/EnumHelper.cpp
+++ b/stepmania/src/EnumHelper.cpp
@@ -53,7 +53,7 @@ const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_
 }
 
 /*
- * (c) 2004 Chris Danford
+ * (c) 2006 Glenn Maynard
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h
index c0d6c03d5a..1b19d86552 100644
--- a/stepmania/src/EnumHelper.h
+++ b/stepmania/src/EnumHelper.h
@@ -82,11 +82,10 @@ namespace Enum
 		/* Look up the string value. */
 		EnumTraits<T>::EnumToString.PushSelf( L );
 		lua_rawgeti( L, -1, iVal + 1 );
-		lua_replace( L, -2 );
+		lua_remove( L, -2 );
 	}
 };
 
-static const RString EMPTY_STRING;
 const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_ptr<RString> *pNameCache ); // XToString helper
 
 #define XToString2(X) \
@@ -167,7 +166,7 @@ namespace LuaHelpers { void Push( lua_State *L, const X &Object ) { Enum::Push<X
 #endif
 
 /*
- * (c) 2004 Chris Danford
+ * (c) 2004-2006 Chris Danford, Glenn Maynard
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a