diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index 421e2534ae..1b5e0a3b3c 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -320,12 +320,13 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
 
 		for( unsigned i = 0; i < asDevices.size(); ++i )
 		{
-			if( asDevices[i] == "." || asDevices[i] == ".." )
+			const CString &sDevice = asDevices[i];
+			if( sDevice == "." || sDevice == ".." )
 				continue;
 
 			UsbStorageDevice usbd;
 
-			CString sPath = sBlockDevicePath + asDevices[i] + "/";
+			CString sPath = sBlockDevicePath + sDevice + "/";
 
 			/* Ignore non-removable devices. */
 			CString sBuf;
@@ -335,7 +336,7 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
 				continue;
 
 
-			usbd.sScsiDevice = "/dev/" + asDevices[i];
+			usbd.sScsiDevice = "/dev/" + sDevice;
 
 			/*
 			 * sPath/device should be a symlink to the actual device.  For USB