diff --git a/xwords4/common/model.c b/xwords4/common/model.c
index f0b0668e7..b2a656d14 100644
--- a/xwords4/common/model.c
+++ b/xwords4/common/model.c
@@ -710,7 +710,7 @@ model_makeTurnFromStream( ModelCtxt* model, XP_U16 playerNum,
 
     numTiles = (XP_U16)stream_getBits( stream, NTILES_NBITS );
 
-    XP_STATUSF( "model_makeTurnFromStream: numTiles=%d", numTiles );
+    XP_LOGF( "%s: numTiles=%d", __func__, numTiles );
 
     while ( numTiles-- ) {
         XP_S16 foundAt;
diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 06116c38f..95f8dc92b 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -521,7 +521,7 @@ handleRegistrationMsg( ServerCtxt* server, XWStreamCtxt* stream )
 {
     XP_Bool success = XP_TRUE;
     XP_U16 playersInMsg, i;
-    XP_STATUSF( "handleRegistrationMsg" );
+    LOG_FUNC();
 
     /* code will have already been consumed */
     playersInMsg = (XP_U16)stream_getBits( stream, NPLAYERS_NBITS );
@@ -2374,7 +2374,7 @@ server_receiveMessage( ServerCtxt* server, XWStreamCtxt* incoming )
         /* This message is special: doesn't have the header that's possible
            once the game's in progress and communication's been
            established. */
-        XP_STATUSF( "somebody's registering!!!" );
+        XP_LOGF( "%s: somebody's registering!!!", __func__ );
         accepted = handleRegistrationMsg( server, incoming );
 
     } else if ( code == XWPROTO_CLIENT_SETUP ) {