diff --git a/stepmania/src/IniFile.cpp b/stepmania/src/IniFile.cpp
index ec89f25417..8be2ca5879 100644
--- a/stepmania/src/IniFile.cpp
+++ b/stepmania/src/IniFile.cpp
@@ -114,7 +114,7 @@ int IniFile::GetNumKeys()
 }
 
 //returns number of values stored for specified key, or -1 if key found
-int IniFile::GetNumValues(CString keyname)
+int IniFile::GetNumValues(const CString &keyname)
 {
 	int keynum = FindKey(keyname);
 	if (keynum == -1)
@@ -125,7 +125,7 @@ int IniFile::GetNumValues(CString keyname)
 
 //gets value of [keyname] valuename = 
 //overloaded to return CString, int, and double
-bool IniFile::GetValue(CString keyname, CString valuename, CString& value)
+bool IniFile::GetValue(const CString &keyname, const CString &valuename, CString& value)
 {
 	int keynum = FindKey(keyname), valuenum = FindValue(keynum,valuename);
 
@@ -147,7 +147,7 @@ bool IniFile::GetValue(CString keyname, CString valuename, CString& value)
 
 //gets value of [keyname] valuename = 
 //overloaded to return CString, int, and double
-bool IniFile::GetValueI(CString keyname, CString valuename, int& value)
+bool IniFile::GetValueI(const CString &keyname, const CString &valuename, int& value)
 {
 	CString sValue;
 	bool bSuccess = GetValue(keyname,valuename,sValue);
@@ -159,7 +159,7 @@ bool IniFile::GetValueI(CString keyname, CString valuename, int& value)
 
 //gets value of [keyname] valuename = 
 //overloaded to return CString, int, and double
-bool IniFile::GetValueF(CString keyname, CString valuename, float& value)
+bool IniFile::GetValueF(const CString &keyname, const CString &valuename, float& value)
 {
 	CString sValue;
 	bool bSuccess = GetValue(keyname,valuename,sValue);
@@ -171,7 +171,7 @@ bool IniFile::GetValueF(CString keyname, CString valuename, float& value)
 
 //gets value of [keyname] valuename = 
 //overloaded to return CString, int, and double
-bool IniFile::GetValueB(CString keyname, CString valuename, bool& value)
+bool IniFile::GetValueB(const CString &keyname, const CString &valuename, bool& value)
 {
 	CString sValue;
 	bool bSuccess = GetValue(keyname,valuename,sValue);
@@ -185,7 +185,7 @@ bool IniFile::GetValueB(CString keyname, CString valuename, bool& value)
 //specify the optional paramter as false (0) if you do not want it to create
 //the key if it doesn't exist. Returns true if data entered, false otherwise
 //overloaded to accept CString, int, and double
-bool IniFile::SetValue(CString keyname, CString valuename, CString value, bool create)
+bool IniFile::SetValue(const CString &keyname, const CString &valuename, const CString &value, bool create)
 {
 	int keynum = FindKey(keyname), valuenum = 0;
 	//find key
@@ -218,7 +218,7 @@ bool IniFile::SetValue(CString keyname, CString valuename, CString value, bool c
 //specify the optional paramter as false (0) if you do not want it to create
 //the key if it doesn't exist. Returns true if data entered, false otherwise
 //overloaded to accept CString, int, and double
-bool IniFile::SetValueI(CString keyname, CString valuename, int value, bool create)
+bool IniFile::SetValueI(const CString &keyname, const CString &valuename, int value, bool create)
 {
 	CString temp;
 	temp.Format("%d",value);
@@ -229,7 +229,7 @@ bool IniFile::SetValueI(CString keyname, CString valuename, int value, bool crea
 //specify the optional paramter as false (0) if you do not want it to create
 //the key if it doesn't exist. Returns true if data entered, false otherwise
 //overloaded to accept CString, int, and double
-bool IniFile::SetValueF(CString keyname, CString valuename, float value, bool create)
+bool IniFile::SetValueF(const CString &keyname, const CString &valuename, float value, bool create)
 {
 	CString temp;
 	temp.Format("%f",value);
@@ -240,7 +240,7 @@ bool IniFile::SetValueF(CString keyname, CString valuename, float value, bool cr
 //specify the optional paramter as false (0) if you do not want it to create
 //the key if it doesn't exist. Returns true if data entered, false otherwise
 //overloaded to accept CString, int, and double
-bool IniFile::SetValueB(CString keyname, CString valuename, bool value, bool create)
+bool IniFile::SetValueB(const CString &keyname, const CString &valuename, bool value, bool create)
 {
 	CString temp;
 	temp.Format("%d",value);
@@ -249,7 +249,7 @@ bool IniFile::SetValueB(CString keyname, CString valuename, bool value, bool cre
 
 //deletes specified value
 //returns true if value existed and deleted, false otherwise
-bool IniFile::DeleteValue(CString keyname, CString valuename)
+bool IniFile::DeleteValue(const CString &keyname, const CString &valuename)
 {
 	int keynum = FindKey(keyname), valuenum = FindValue(keynum,valuename);
 	if (keynum == -1 || valuenum == -1)
@@ -262,7 +262,7 @@ bool IniFile::DeleteValue(CString keyname, CString valuename)
 
 //deletes specified key and all values contained within
 //returns true if key existed and deleted, false otherwise
-bool IniFile::DeleteKey(CString keyname)
+bool IniFile::DeleteKey(const CString &keyname)
 {
 	int keynum = FindKey(keyname);
 	if (keynum == -1)
@@ -274,7 +274,7 @@ bool IniFile::DeleteKey(CString keyname)
 
 //deletes specified key and all values contained within
 //returns true if key existed and deleted, false otherwise
-IniFile::key* IniFile::GetKey(CString keyname)
+IniFile::key* IniFile::GetKey(const CString &keyname)
 {
 	int keynum = FindKey(keyname);
 	if (keynum == -1)
@@ -287,7 +287,7 @@ IniFile::key* IniFile::GetKey(CString keyname)
 /////////////////////////////////////////////////////////////////////
 
 //returns index of specified key, or -1 if not found
-int IniFile::FindKey(CString keyname)
+int IniFile::FindKey(const CString &keyname)
 {
 	int keynum = 0;
 	while ( keynum < keys.GetSize() && names[keynum] != keyname)
@@ -298,7 +298,7 @@ int IniFile::FindKey(CString keyname)
 }
 
 //returns index of specified value, in the specified key, or -1 if not found
-int IniFile::FindValue(int keynum, CString valuename)
+int IniFile::FindValue(int keynum, const CString &valuename)
 {
 	if (keynum == -1)
 		return -1;
diff --git a/stepmania/src/IniFile.h b/stepmania/src/IniFile.h
index c74a92bda7..81ccbf735b 100644
--- a/stepmania/src/IniFile.h
+++ b/stepmania/src/IniFile.h
@@ -41,10 +41,10 @@ private:
 	//all private functions
 private:
 	//returns index of specified value, in the specified key, or -1 if not found
-	int FindValue(int keynum, CString valuename);
+	int FindValue(int keynum, const CString &valuename);
 
 	//returns index of specified key, or -1 if not found
-	int FindKey(CString keyname);
+	int FindKey(const CString &keyname);
 
 
 	//public variables
@@ -80,32 +80,32 @@ public:
 	int GetNumKeys();
 
 	//returns number of values stored for specified key
-	int GetNumValues(CString keyname);
+	int GetNumValues(const CString &keyname);
 
 	//gets value of [keyname] valuename = 
 	//overloaded to return CString, int, and double,
 	//returns "", or 0 if key/value not found.  Sets error member to show problem
-	bool GetValue(CString key, CString valuename, CString& value);
-	bool GetValueI(CString key, CString valuename, int& value);
-	bool GetValueF(CString key, CString valuename, float& value);
-	bool GetValueB(CString key, CString valuename, bool& value);
+	bool GetValue(const CString &key, const CString &valuename, CString& value);
+	bool GetValueI(const CString &key, const CString &valuename, int& value);
+	bool GetValueF(const CString &key, const CString &valuename, float& value);
+	bool GetValueB(const CString &key, const CString &valuename, bool& value);
 
 	//sets value of [keyname] valuename =.
 	//specify the optional paramter as false (0) if you do not want it to create
 	//the key if it doesn't exist. Returns true if data entered, false otherwise
 	//overloaded to accept CString, int, and double
-	bool SetValue(CString key, CString valuename, CString value, bool create = 1);
-	bool SetValueI(CString key, CString valuename, int value, bool create = 1);
-	bool SetValueF(CString key, CString valuename, float value, bool create = 1);
-	bool SetValueB(CString key, CString valuename, bool value, bool create = 1);
+	bool SetValue(const CString &key, const CString &valuename, const CString &value, bool create = 1);
+	bool SetValueI(const CString &key, const CString &valuename, int value, bool create = 1);
+	bool SetValueF(const CString &key, const CString &valuename, float value, bool create = 1);
+	bool SetValueB(const CString &key, const CString &valuename, bool value, bool create = 1);
 
 	//deletes specified value
 	//returns true if value existed and deleted, false otherwise
-	bool DeleteValue(CString keyname, CString valuename);
+	bool DeleteValue(const CString &keyname, const CString &valuename);
 
 	//deletes specified key and all values contained within
 	//returns true if key existed and deleted, false otherwise
-	bool DeleteKey(CString keyname);
+	bool DeleteKey(const CString &keyname);
 
-	key* GetKey(CString keyname);
+	key* GetKey(const CString &keyname);
 };