diff --git a/xwords4/android/XWords4/jni/drawwrapper.c b/xwords4/android/XWords4/jni/drawwrapper.c
index 578824e95..20c7b6927 100644
--- a/xwords4/android/XWords4/jni/drawwrapper.c
+++ b/xwords4/android/XWords4/jni/drawwrapper.c
@@ -107,12 +107,11 @@ makeDSI( AndDraw* draw, int indx, const DrawScoreInfo* dsi )
 
 static XP_Bool
 and_draw_scoreBegin( DrawCtx* dctx, const XP_Rect* rect, 
-                     XP_U16 numPlayers, 
-                     const XP_S16* const scores,
-                     XP_S16 remCount, DrawFocusState dfs )
+                     XP_U16 numPlayers, const XP_S16* const scores,
+                     XP_S16 remCount, DrawFocusState XP_UNUSED(dfs) )
 {
     jboolean result;
-    DRAW_CBK_HEADER("scoreBegin", "(Landroid/graphics/Rect;I[III)Z" );
+    DRAW_CBK_HEADER("scoreBegin", "(Landroid/graphics/Rect;I[II)Z" );
 
     jint jarr[numPlayers];
     int ii;
@@ -123,8 +122,7 @@ and_draw_scoreBegin( DrawCtx* dctx, const XP_Rect* rect,
     jobject jrect = makeJRect( draw, JCACHE_RECT0, rect );
 
     result = (*env)->CallBooleanMethod( env, draw->jdraw, mid, 
-                                        jrect, numPlayers, jscores, remCount, 
-                                        dfs );
+                                        jrect, numPlayers, jscores, remCount );
 
     (*env)->DeleteLocalRef( env, jscores );
     return result;
@@ -220,15 +218,15 @@ and_draw_drawTimer( DrawCtx* dctx, const XP_Rect* rect, XP_U16 player,
 
 static XP_Bool
 and_draw_boardBegin( DrawCtx* dctx, const XP_Rect* rect, 
-                     XP_U16 cellWidth, XP_U16 cellHeight, DrawFocusState dfs )
+                     XP_U16 cellWidth, XP_U16 cellHeight, 
+                     DrawFocusState XP_UNUSED(dfs) )
 {
-    DRAW_CBK_HEADER( "boardBegin", "(Landroid/graphics/Rect;III)Z" );
+    DRAW_CBK_HEADER( "boardBegin", "(Landroid/graphics/Rect;II)Z" );
 
     jobject jrect = makeJRect( draw, JCACHE_RECT0, rect );
 
     jboolean result = (*env)->CallBooleanMethod( env, draw->jdraw, mid, 
-                                                 jrect, cellWidth, cellHeight,
-                                                 (jint)dfs );
+                                                 jrect, cellWidth, cellHeight );
     return result;
 }
 
@@ -281,15 +279,14 @@ and_draw_vertScrollBoard( DrawCtx* XP_UNUSED(dctx), XP_Rect* XP_UNUSED(rect),
 
 static XP_Bool
 and_draw_trayBegin( DrawCtx* dctx, const XP_Rect* rect, XP_U16 owner, 
-                    XP_S16 score, DrawFocusState dfs )
+                    XP_S16 score, DrawFocusState XP_UNUSED(dfs) )
 {
-    DRAW_CBK_HEADER( "trayBegin", "(Landroid/graphics/Rect;III)Z" );
+    DRAW_CBK_HEADER( "trayBegin", "(Landroid/graphics/Rect;II)Z" );
 
     jobject jrect = makeJRect( draw, JCACHE_RECT0, rect );
 
     jboolean result = (*env)->CallBooleanMethod( env, draw->jdraw, mid, 
-                                                 jrect, owner, score, 
-                                                 (jint)dfs );
+                                                 jrect, owner, score );
     return result;
 }
 
@@ -373,13 +370,13 @@ and_draw_score_pendingScore( DrawCtx* dctx, const XP_Rect* rect,
 static void
 and_draw_objFinished( DrawCtx* dctx, BoardObjectType typ, 
                       const XP_Rect* rect, 
-                      DrawFocusState dfs )
+                      DrawFocusState XP_UNUSED(dfs) )
 {
-    DRAW_CBK_HEADER( "objFinished", "(ILandroid/graphics/Rect;I)V" );
+    DRAW_CBK_HEADER( "objFinished", "(ILandroid/graphics/Rect;)V" );
 
     jobject jrect = makeJRect( draw, JCACHE_RECT0, rect );
     (*env)->CallVoidMethod( env, draw->jdraw, mid, 
-                            (jint)typ, jrect, (jint)dfs );
+                            (jint)typ, jrect );
 }
 
 static void
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
index f60fdcd43..428fc8e7b 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
@@ -345,7 +345,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
 
     // DrawCtxt interface implementation
     public boolean scoreBegin( Rect rect, int numPlayers, int[] scores, 
-                               int remCount, int dfs )
+                               int remCount )
     {
         fillRectOther( rect, CommonPrefs.COLOR_BACKGRND );
         m_canvas.save( Canvas.CLIP_SAVE_FLAG );
@@ -472,8 +472,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
         }
     }
 
-    public boolean boardBegin( Rect rect, int cellWidth, int cellHeight, 
-                               int dfs )
+    public boolean boardBegin( Rect rect, int cellWidth, int cellHeight )
     {
         return true;
     }
@@ -589,7 +588,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
         }
     }
 
-    public boolean trayBegin ( Rect rect, int owner, int score, int dfs ) 
+    public boolean trayBegin ( Rect rect, int owner, int score ) 
     {
         m_trayOwner = owner;
         m_pendingScore = score;
@@ -646,7 +645,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
         drawCentered( getResources().getString( R.string.pts ), rect, null );
     }
 
-    public void objFinished( /*BoardObjectType*/int typ, Rect rect, int dfs )
+    public void objFinished( /*BoardObjectType*/int typ, Rect rect )
     {
         if ( DrawCtx.OBJ_SCORE == typ ) {
             m_canvas.restoreToCount(1); // in case new canvas...
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java
index 83ed1c179..b1767e1ef 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java
@@ -43,21 +43,19 @@ public interface DrawCtx {
     static final int OBJ_TRAY = 3;
 
 
-    boolean scoreBegin( Rect rect, int numPlayers, int[] scores, int remCount,
-                        int dfs );
+    boolean scoreBegin( Rect rect, int numPlayers, int[] scores, int remCount );
     void measureRemText( Rect r, int nTilesLeft, int[] width, int[] height );
     void measureScoreText( Rect r, DrawScoreInfo dsi, int[] width, int[] height );
     void drawRemText( Rect rInner, Rect rOuter, int nTilesLeft, boolean focussed );
     void score_drawPlayer( Rect rInner, Rect rOuter, DrawScoreInfo dsi );
     void drawTimer( Rect rect, int player, int secondsLeft );
-    boolean boardBegin( Rect rect, int cellWidth, int cellHeight, 
-                        int dfs );
+    boolean boardBegin( Rect rect, int cellWidth, int cellHeight );
 
     boolean drawCell( Rect rect, String text, int tile, 
                       int owner, int bonus, int hintAtts, int flags );
     void drawBoardArrow ( Rect rect, int bonus, boolean vert, int hintAtts,
                           int flags );
-    boolean trayBegin ( Rect rect, int owner, int score, int dfs );
+    boolean trayBegin ( Rect rect, int owner, int score );
     void drawTile( Rect rect, String text, int val, int flags );
     void drawTileMidDrag ( Rect rect, String text, int val, int owner, 
                            int flags );
@@ -72,7 +70,7 @@ public interface DrawCtx {
     public static final int BONUS_TRIPLE_WORD = 4;
     public static final int INTRADE_MW_TEXT = 5;
 
-    void objFinished( /*BoardObjectType*/int typ, Rect rect, int dfs );
+    void objFinished( /*BoardObjectType*/int typ, Rect rect );
 
     void dictChanged( int dictPtr );