diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index a25eb46cb7..b89693edb7 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -140,9 +140,7 @@ void BGAnimation::LoadFromAniDir( CString sAniDir )
 		for( unsigned i=0; i<asImagePaths.size(); i++ )
 		{
 			const CString sPath = asImagePaths[i];
-			CString sDir, sFName, sExt;
-			splitrelpath( sPath, sDir, sFName, sExt );
-			if( sFName.Left(1) == "_" )
+			if( Basename(sPath).Left(1) == "_" )
 				continue;	// don't directly load files starting with an underscore
 			BGAnimationLayer* pLayer = new BGAnimationLayer;
 			pLayer->LoadFromAniLayerFile( asImagePaths[i] );
diff --git a/stepmania/src/ModelTypes.cpp b/stepmania/src/ModelTypes.cpp
index cae13e4679..f72d4a5124 100644
--- a/stepmania/src/ModelTypes.cpp
+++ b/stepmania/src/ModelTypes.cpp
@@ -32,11 +32,7 @@ void AnimatedTexture::Load( CString sTexOrIniPath )
 {
 	ASSERT( vFrames.empty() );	// don't load more than once
 
-	CString sDir, sFName, sExt;
-	splitrelpath( sTexOrIniPath, sDir, sFName, sExt );
-
-	bool bIsIni = sTexOrIniPath.Right(3).CompareNoCase("ini")== 0;
-	if( bIsIni )
+	if( GetExtension(sTexOrIniPath).CompareNoCase("ini")==0 )
 	{
 		IniFile ini;
 		ini.SetPath( sTexOrIniPath );
@@ -56,7 +52,7 @@ void AnimatedTexture::Load( CString sTexOrIniPath )
 				ini.GetValue( "AnimatedTexture", sDelayKey, fDelay ) ) 
 			{
 				RageTextureID ID;
-				ID.filename = sDir+sFileName;
+				ID.filename = Dirname(sTexOrIniPath) + sFileName;
 				ID.bStretch = true;
 				ID.bHotPinkColorKey = true;
 				AnimatedTextureState state = {