diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index fd2c662c7..8da4fbb2e 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -667,7 +667,7 @@ bool Sequence::InsertSilence(sampleCount s0, sampleCount len)
       pos += idealSamples;
       len -= idealSamples;
    }
-   if (len) {
+   if (len != 0) {
       sTrack.mBlock.push_back(SeqBlock(
          make_blockfile<SilentBlockFile>(len), pos));
       pos += len;
@@ -1186,7 +1186,7 @@ bool Sequence::Set(samplePtr buffer, sampleFormat format,
 
    int b = FindBlock(start);
 
-   while (len) {
+   while (len != 0) {
       SeqBlock &block = mBlock[b];
       const sampleCount bstart = start - block.start;
       const sampleCount fileLength = block.f->GetLength();
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 50c23c9ca..cf77766ed 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -1580,10 +1580,10 @@ bool Effect::ProcessTrack(int count,
    }
 
    // Call the effect until we run out of input or delayed samples
-   while (inputRemaining || delayRemaining)
+   while (inputRemaining != 0 || delayRemaining != 0)
    {
       // Still working on the input samples
-      if (inputRemaining)
+      if (inputRemaining != 0)
       {
          // Need to refill the input buffers
          if (inputBufferCnt == 0)
@@ -1629,7 +1629,7 @@ bool Effect::ProcessTrack(int count,
             }
 
             // Might be able to use up some of the delayed samples
-            if (delayRemaining)
+            if (delayRemaining != 0)
             {
                // Don't use more than needed
                if (delayRemaining < cnt)
@@ -1642,7 +1642,7 @@ bool Effect::ProcessTrack(int count,
          }
       }
       // We've exhausted the input samples and are now working on the delay
-      else if (delayRemaining)
+      else if (delayRemaining != 0)
       {
          // Calculate the number of samples to process
          curBlockSize = mBlockSize;
@@ -1684,7 +1684,7 @@ bool Effect::ProcessTrack(int count,
       wxUnusedVar(processed);
 
       // Bump to next input buffer position
-      if (inputRemaining)
+      if (inputRemaining != 0)
       {
          for (int i = 0; i < mNumChannels; i++)
          {
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index f527bfd60..014a10573 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -1084,7 +1084,7 @@ bool EffectEqualization::ProcessOne(int count, WaveTrack * t,
    int wcopy = 0;
    int offset = (mM - 1)/2;
 
-   while(len)
+   while (len != 0)
    {
       sampleCount block = idealBlockLen;
       if (block > len)
diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp
index 837b8ecba..eb2a65e89 100644
--- a/src/effects/vamp/VampEffect.cpp
+++ b/src/effects/vamp/VampEffect.cpp
@@ -496,7 +496,7 @@ bool VampEffect::Process()
       sampleCount ls = lstart;
       sampleCount rs = rstart;
 
-      while (len)
+      while (len != 0)
       {
          int request = block;
          if (request > len) request = len;