diff --git a/xwords4/android/jni/xptypes.h b/xwords4/android/jni/xptypes.h
index 3ca66ca96..8fcf820ba 100644
--- a/xwords4/android/jni/xptypes.h
+++ b/xwords4/android/jni/xptypes.h
@@ -99,6 +99,7 @@ void android_gid_debugff(XP_U32 gid, const char* func, const char* file, int lin
 #define XP_DEBUGF(...) android_debugf( __VA_ARGS__ )
 #define XP_LOGF(...) android_debugf( __VA_ARGS__ )
 #define XP_LOGFF(...) android_debugff( __func__, __FILE__, __LINE__, __VA_ARGS__ )
+#define XP_RAW_LOGFF(...) raw_log( __func__, __VA_ARGS__ )
 #define XP_GID_LOGFF( GID, ... )                                    \
     android_gid_debugff( (GID), __func__, __FILE__, __LINE__, __VA_ARGS__ )
 
@@ -109,6 +110,7 @@ void android_gid_debugff(XP_U32 gid, const char* func, const char* file, int lin
 #define XP_LOGFF(...)
 #define XP_GID_LOGFF( GID, FMT, ... )
 #define XP_WARNF(...)
+#define XP_RAW_LOGFF(...)
 #endif
 
 XP_U32 and_ntohl(XP_U32 l);
diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c
index 9e3c0f699..9a961a442 100644
--- a/xwords4/android/jni/xwjni.c
+++ b/xwords4/android/jni/xwjni.c
@@ -420,7 +420,7 @@ JNIEXPORT void JNICALL
 Java_org_eehouse_android_xw4_jni_XwJNI_cleanGlobals
 ( JNIEnv* env, jclass C, jlong jniGlobalPtr )
 {
-    // LOG_FUNC();
+    // XP_LOGFF( "(jniGlobalPtr: %p)", jniGlobalPtr );
     if ( 0 != jniGlobalPtr ) {
         setGlobalState( env, NULL );
         JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
diff --git a/xwords4/common/xwmutex.c b/xwords4/common/xwmutex.c
index 1397a819e..2168ab695 100644
--- a/xwords4/common/xwmutex.c
+++ b/xwords4/common/xwmutex.c
@@ -105,6 +105,7 @@ void
 mtx_lock_prv( MutexState* state, XP_U16 waitSecs,
               const char* file, const char* caller, int lineNo )
 {
+    // XP_RAW_LOGFF( "(waitSecs=%d)", waitSecs );
     if ( 0 == waitSecs ) {
         waitSecs = state->waitSecs;
     }
@@ -123,6 +124,7 @@ mtx_lock_prv( MutexState* state, XP_U16 waitSecs,
     if ( 0 < waitSecs ) {
         removeCheckee( &ctd );
     }
+    // XP_RAW_LOGFF( "DONE" );
 }
 
 void
diff --git a/xwords4/linux/xptypes.h b/xwords4/linux/xptypes.h
index e5e7ea33c..432c7cd90 100644
--- a/xwords4/linux/xptypes.h
+++ b/xwords4/linux/xptypes.h
@@ -92,12 +92,14 @@ extern void linux_debugff(const char* func, const char* file, int line, const ch
     linux_debugff( __func__, SHORTFILE, __LINE__, FMT, ##__VA_ARGS__ )
 #define XP_LOG(STR) \
     linux_debugff( __func__, SHORTFILE, "%s", STR )
+#define XP_RAW_LOGFF XP_LOGFF
 
 #else
 # define XP_DEBUGF(ch,...)
 # define XP_LOGFF(fmt,...)
 # define XP_LOG(fmt)
-#endif
+#define XP_RAW_LOGFF(...)
+#endif  /* #ifdef DEBUG */
 
 #define XP_WARNF XP_DEBUGF