diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp
index 56fa8badd3..2ed38d8ef3 100644
--- a/stepmania/src/BannerCache.cpp
+++ b/stepmania/src/BannerCache.cpp
@@ -66,7 +66,7 @@ void BannerCache::LoadBanner( CString BannerPath )
 		if( m_BannerPathToImage.find(BannerPath) != m_BannerPathToImage.end() )
 			return; /* already loaded */
 
-		Checkpoint( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) );
+		CHECKPOINT_M( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) );
 		SDL_Surface *img = mySDL_LoadSurface( CachePath );
 		if( img == NULL )
 		{
diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index c7e9194902..3b88ff3857 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -87,7 +87,7 @@ BitmapText::~BitmapText()
 
 bool BitmapText::LoadFromFont( CString sFontFilePath )
 {
-	Checkpoint( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.c_str()) );
+	CHECKPOINT_M( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.c_str()) );
 
 	if( m_pFont ) {
 		FONT->UnloadFont( m_pFont );
@@ -105,7 +105,7 @@ bool BitmapText::LoadFromFont( CString sFontFilePath )
 
 bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
 {
-	Checkpoint( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) );
+	CHECKPOINT_M( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) );
 
 	if( m_pFont ) {
 		FONT->UnloadFont( m_pFont );
diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index 30a3079193..28aaf67145 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -759,7 +759,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
 	}
 
 	/* The font is not already loaded.  Figure out what we have. */
-	Checkpoint( ssprintf("Font::Load(\"%s\",\"%s\").", sFontOrTextureFilePath.c_str(), Chars.c_str()) );
+	CHECKPOINT_M( ssprintf("Font::Load(\"%s\",\"%s\").", sFontOrTextureFilePath.c_str(), Chars.c_str()) );
 
 	path = sFontOrTextureFilePath;
 	Chars = sChars;
diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp
index 8a6c901790..0b9d40a89c 100644
--- a/stepmania/src/FontManager.cpp
+++ b/stepmania/src/FontManager.cpp
@@ -89,7 +89,7 @@ Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sCha
 
 void FontManager::UnloadFont( Font *fp )
 {
-	Checkpoint( ssprintf("FontManager::UnloadFont(%s).", fp->path.c_str()) );
+	CHECKPOINT_M( ssprintf("FontManager::UnloadFont(%s).", fp->path.c_str()) );
 
 	for( std::map<CString, Font*>::iterator i = m_mapPathToFont.begin();
 		i != m_mapPathToFont.end(); ++i)