Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 15499)
+++ apps/playback.c	(working copy)
@@ -638,8 +638,7 @@
     int cur_idx;
     int offset = ci.new_track + wps_offset;
 
-    cur_idx = track_ridx + offset;
-    cur_idx &= MAX_TRACK_MASK;
+    cur_idx = (track_ridx + offset) & MAX_TRACK_MASK;
 
     if (cur_idx == track_ridx && *curtrack_id3.path)
         return &curtrack_id3;
@@ -681,8 +680,7 @@
     if (wps_offset == -1 && *prevtrack_id3.path)
         return &curtrack_id3;
 
-    next_idx++;
-    next_idx &= MAX_TRACK_MASK;
+    next_idx = (next_idx + 1) & MAX_TRACK_MASK;
 
     if (tracks[next_idx].id3_hid < 0)
         return NULL;
@@ -2042,8 +2028,7 @@
 
     CUR_TI->taginfo_ready = (CUR_TI->id3_hid >= 0);
 
-    int next_idx = track_ridx + 1;
-    next_idx &= MAX_TRACK_MASK;
+    int next_idx = (track_ridx + 1) & MAX_TRACK_MASK;
 
     if (tracks[next_idx].id3_hid >= 0)
         copy_mp3entry(&nexttrack_id3, bufgetid3(tracks[next_idx].id3_hid));
@@ -2077,8 +2062,7 @@
     /* Loop over all tracks from write-to-read */
     while (1)
     {
-        cur_idx++;
-        cur_idx &= MAX_TRACK_MASK;
+        cur_idx = (cur_idx + 1) & MAX_TRACK_MASK;
 
         if (cur_idx == track_ridx)
             break;
@@ -2443,8 +2427,7 @@
         buf_request_buffer_handle(tracks[track_widx].audio_hid);
     }
 
-    track_widx++;
-    track_widx &= MAX_TRACK_MASK;
+    track_widx = (track_widx + 1) & MAX_TRACK_MASK;
 
     return true;
 }
@@ -2470,8 +2453,7 @@
             }
             if (cur_idx == track_widx)
                 break;
-            cur_idx++;
-            cur_idx &= MAX_TRACK_MASK;
+            cur_idx = (cur_idx + 1) & MAX_TRACK_MASK;
         }
     }
 }
@@ -2610,8 +2592,7 @@
     }
 
     /* Move to the new track */
-    track_ridx += ci.new_track;
-    track_ridx &= MAX_TRACK_MASK;
+    track_ridx = (track_ridx + ci.new_track) & MAX_TRACK_MASK;
 
     buf_set_base_handle(CUR_TI->audio_hid);
 
@@ -2653,8 +2634,7 @@
 
         while (1)
         {
-            cur_idx++;
-            cur_idx &= MAX_TRACK_MASK;
+            cur_idx = (cur_idx + 1) & MAX_TRACK_MASK;
 
             /* if we've advanced past the wrap when cur_idx is zeroed */
             if (!cur_idx)
@@ -2747,8 +2727,7 @@
          */
         if (playlist_end)
         {
-            track_ridx++;
-            track_ridx &= MAX_TRACK_MASK;
+            track_ridx = (track_ridx + 1) & MAX_TRACK_MASK;
         }
     }
 
@@ -2841,8 +2820,7 @@
         track_widx = track_ridx;
         audio_clear_track_entries(true);
 
-        track_widx++;
-        track_widx &= MAX_TRACK_MASK;
+        track_widx = (track_widx + 1) & MAX_TRACK_MASK;
 
         /* Mark the current track as invalid to prevent skipping back to it */
         CUR_TI->taginfo_ready = false;