diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
index 7c6fb08d..bc95c214 100644
--- a/src/sfizz/Synth.cpp
+++ b/src/sfizz/Synth.cpp
@@ -1069,19 +1069,10 @@ Voice* Synth::Impl::findFreeVoice() noexcept
     return {};
 }
 
-int Synth::getNumActiveVoices(bool recompute) const noexcept
+int Synth::getNumActiveVoices() const noexcept
 {
     Impl& impl = *impl_;
-    if (!recompute)
-        return impl.activeVoices_;
-
-    int active { 0 };
-    for (auto& voice: impl.voiceList_) {
-        if (!voice.isFree())
-            active++;
-    }
-
-    return active;
+    return static_cast<int>(impl.voiceList_.getNumActiveVoices());
 }
 
 void Synth::setSamplesPerBlock(int samplesPerBlock) noexcept
diff --git a/src/sfizz/Synth.h b/src/sfizz/Synth.h
index bb93ab6c..b9611835 100644
--- a/src/sfizz/Synth.h
+++ b/src/sfizz/Synth.h
@@ -416,7 +416,7 @@ public:
      *
      * @return int
      */
-    int getNumActiveVoices(bool recompute = false) const noexcept;
+    int getNumActiveVoices() const noexcept;
     /**
      * @brief Get the total number of voices in the synth (the polyphony)
      *
diff --git a/src/sfizz/VoiceList.h b/src/sfizz/VoiceList.h
index 660c1090..51013d5a 100644
--- a/src/sfizz/VoiceList.h
+++ b/src/sfizz/VoiceList.h
@@ -155,6 +155,11 @@ struct VoiceList : public Voice::StateListener
         checkEnginePolyphony(delay);
     }
 
+    unsigned getNumActiveVoices() const
+    {
+        return activeVoices_.size();
+    }
+
 private:
     std::vector<Voice> list_;
     std::vector<Voice*> activeVoices_;
diff --git a/tests/FilesT.cpp b/tests/FilesT.cpp
index b0a19757..02004ab7 100644
--- a/tests/FilesT.cpp
+++ b/tests/FilesT.cpp
@@ -489,7 +489,7 @@ TEST_CASE("[Files] Off modes")
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/off_mode.sfz");
     REQUIRE( synth.getNumRegions() == 3 );
     synth.noteOn(0, 64, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     const auto* fastVoice =
         synth.getVoiceView(0)->getRegion()->offMode == SfzOffMode::fast ?
             synth.getVoiceView(0) :
@@ -499,12 +499,12 @@ TEST_CASE("[Files] Off modes")
             synth.getVoiceView(1) :
             synth.getVoiceView(0) ;
     synth.noteOn(100, 63, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     REQUIRE( numPlayingVoices(synth) == 1 );
     AudioBuffer<float> buffer { 2, 256 };
     for (unsigned i = 0; i < 10; ++i) // Not enough for the "normal" voice to die
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     REQUIRE( fastVoice->isFree() );
     REQUIRE( !normalVoice->isFree() );
 }
diff --git a/tests/FlexEGT.cpp b/tests/FlexEGT.cpp
index 439ead5c..a7a2e634 100644
--- a/tests/FlexEGT.cpp
+++ b/tests/FlexEGT.cpp
@@ -394,25 +394,25 @@ TEST_CASE("[FlexEG] Free-running flex AmpEG (no sustain)")
     synth.noteOn(0, 60, 0);
     sfz::AudioBuffer<float> buffer { 2, 256 };
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     synth.noteOn(0, 62, 0);
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     synth.noteOn(0, 64, 0);
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     synth.noteOff(0, 64, 0); // the release stage is 0 duration
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 }
diff --git a/tests/PolyphonyT.cpp b/tests/PolyphonyT.cpp
index c7541391..58a5cd54 100644
--- a/tests/PolyphonyT.cpp
+++ b/tests/PolyphonyT.cpp
@@ -84,7 +84,7 @@ TEST_CASE("[Polyphony] group polyphony limits")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
 }
@@ -100,7 +100,7 @@ TEST_CASE("[Polyphony] Hierarchy polyphony limits")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
 }
@@ -116,7 +116,7 @@ TEST_CASE("[Polyphony] Hierarchy polyphony limits (group)")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
 }
@@ -133,7 +133,7 @@ TEST_CASE("[Polyphony] Hierarchy polyphony limits (master)")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
 }
@@ -155,7 +155,7 @@ TEST_CASE("[Polyphony] Hierarchy polyphony limits (limit in another master)")
     synth.noteOn(0, 66, 64);
     synth.noteOn(0, 66, 64);
     synth.noteOn(0, 66, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 6);
+    REQUIRE( synth.getNumActiveVoices() == 6);
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 5); // One is releasing
 }
@@ -172,7 +172,7 @@ TEST_CASE("[Polyphony] Hierarchy polyphony limits (global)")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
 }
@@ -194,25 +194,25 @@ TEST_CASE("[Polyphony] Polyphony in master")
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
     synth.noteOn(0, 65, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
     synth.allSoundOff();
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0);
+    REQUIRE( synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 63, 64);
     synth.noteOn(0, 63, 64);
     synth.noteOn(0, 63, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 ); // One is releasing
     synth.allSoundOff();
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0);
+    REQUIRE( synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 61, 64);
     synth.noteOn(0, 61, 64);
     synth.noteOn(0, 61, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 3 );
 }
@@ -228,7 +228,7 @@ TEST_CASE("[Polyphony] Self-masking")
     synth.noteOn(0, 64, 63 );
     synth.noteOn(0, 64, 62 );
     synth.noteOn(0, 64, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 ); // One of these is releasing
+    REQUIRE( synth.getNumActiveVoices() == 3 ); // One of these is releasing
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
@@ -249,7 +249,7 @@ TEST_CASE("[Polyphony] Not self-masking")
     synth.noteOn(0, 66, 63 );
     synth.noteOn(0, 66, 62 );
     synth.noteOn(0, 66, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 ); // One of these is releasing
+    REQUIRE( synth.getNumActiveVoices() == 3 ); // One of these is releasing
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
@@ -270,7 +270,7 @@ TEST_CASE("[Polyphony] Self-masking with the exact same velocity")
     synth.noteOn(0, 64, 64);
     synth.noteOn(0, 64, 63 );
     synth.noteOn(0, 64, 63 );
-    REQUIRE( synth.getNumActiveVoices(true) == 3 ); // One of these is releasing
+    REQUIRE( synth.getNumActiveVoices() == 3 ); // One of these is releasing
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 64_norm);
@@ -289,7 +289,7 @@ TEST_CASE("[Polyphony] Self-masking only works from low to high")
     )");
     synth.noteOn(0, 64, 63 );
     synth.noteOn(0, 64, 62 );
-    REQUIRE( synth.getNumActiveVoices(true) == 2 ); // Both notes are playing
+    REQUIRE( synth.getNumActiveVoices() == 2 ); // Both notes are playing
     REQUIRE( numPlayingVoices(synth) == 2 ); // id
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
     REQUIRE(!synth.getVoiceView(0)->releasedOrFree());
@@ -307,7 +307,7 @@ TEST_CASE("[Polyphony] Note polyphony checks works across regions in the same po
     )");
     synth.noteOn(0, 64, 62 );
     synth.noteOn(0, 64, 63 );
-    REQUIRE( synth.getNumActiveVoices(true) == 4);
+    REQUIRE( synth.getNumActiveVoices() == 4);
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 1 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 62_norm);
@@ -330,12 +330,12 @@ TEST_CASE("[Polyphony] Note polyphony checks works across regions in the same po
         <region> sw_last=37 key=48 transpose=12 note_polyphony=1 sample=*tri
     )");
     synth.noteOn(0, 48, 63 );
-    REQUIRE( synth.getNumActiveVoices(true) == 1);
+    REQUIRE( synth.getNumActiveVoices() == 1);
     synth.cc(0, 64, 127);
     synth.noteOn(0, 37, 127);
     synth.noteOff(0, 37, 0);
     synth.noteOn(0, 48, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.renderBlock(buffer);
     REQUIRE( numPlayingVoices(synth) == 1 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
@@ -355,7 +355,7 @@ TEST_CASE("[Polyphony] Note polyphony do not operate across polyphony groups")
     )");
     synth.noteOn(0, 64, 62 );
     synth.noteOn(0, 64, 63 );
-    REQUIRE( synth.getNumActiveVoices(true) == 4); // Both notes are playing
+    REQUIRE( synth.getNumActiveVoices() == 4); // Both notes are playing
     synth.renderBlock(buffer);
     REQUIRE(numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 62_norm);
@@ -378,12 +378,12 @@ TEST_CASE("[Polyphony] Note polyphony do not operate across polyphony groups (wi
         <region> group=2 sw_last=37 key=48 transpose=12 note_polyphony=1 sample=*tri
     )");
     synth.noteOn(0, 48, 63 );
-    REQUIRE( synth.getNumActiveVoices(true) == 1);
+    REQUIRE( synth.getNumActiveVoices() == 1);
     synth.cc(0, 64, 127);
     synth.noteOn(0, 37, 127);
     synth.noteOff(0, 37, 0);
     synth.noteOn(0, 48, 64);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.renderBlock(buffer);
     REQUIRE(numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
@@ -401,10 +401,10 @@ TEST_CASE("[Polyphony] Note polyphony operates on release voices")
     )");
     synth.noteOn(0, 48, 63 );
     synth.noteOff(10, 48, 0 );
-    REQUIRE( synth.getNumActiveVoices(true) == 1);
+    REQUIRE( synth.getNumActiveVoices() == 1);
     synth.noteOn(20, 48, 65 );
     synth.noteOff(30, 48, 10 );
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.renderBlock(buffer);
     REQUIRE(numPlayingVoices(synth) == 1 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
@@ -422,11 +422,11 @@ TEST_CASE("[Polyphony] Note polyphony operates on release voices (masking works
     )");
     synth.noteOn(0, 48, 63 );
     synth.noteOff(10, 48, 0 );
-    REQUIRE( synth.getNumActiveVoices(true) == 1);
+    REQUIRE( synth.getNumActiveVoices() == 1);
     REQUIRE( numPlayingVoices(synth) == 1 );
     synth.noteOn(20, 48, 61 );
     synth.noteOff(30, 48, 10 );
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     REQUIRE( numPlayingVoices(synth) == 2 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
     REQUIRE(!synth.getVoiceView(0)->releasedOrFree());
@@ -449,10 +449,10 @@ TEST_CASE("[Polyphony] Note polyphony operates on release voices and sustain ped
     synth.noteOff(3, 48, 0 );
     synth.noteOn(4, 48, 63 );
     synth.noteOff(5, 48, 0 );
-    REQUIRE( synth.getNumActiveVoices(true) == 3);
+    REQUIRE( synth.getNumActiveVoices() == 3);
     REQUIRE( numPlayingVoices(synth) == 3 );
     synth.cc(20, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 6 );
+    REQUIRE( synth.getNumActiveVoices() == 6 );
     REQUIRE( numPlayingVoices(synth) == 1 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 61_norm);
     REQUIRE( synth.getVoiceView(0)->releasedOrFree());
@@ -483,10 +483,10 @@ TEST_CASE("[Polyphony] Note polyphony operates on release voices and sustain ped
     synth.noteOff(3, 48, 0 );
     synth.noteOn(4, 48, 61 );
     synth.noteOff(5, 48, 0 );
-    REQUIRE( synth.getNumActiveVoices(true) == 3);
+    REQUIRE( synth.getNumActiveVoices() == 3);
     REQUIRE( numPlayingVoices(synth) == 3 );
     synth.cc(20, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 6 );
+    REQUIRE( synth.getNumActiveVoices() == 6 );
     REQUIRE( numPlayingVoices(synth) == 3 );
     REQUIRE( synth.getVoiceView(0)->getTriggerEvent().value == 63_norm);
     REQUIRE( synth.getVoiceView(0)->releasedOrFree());
diff --git a/tests/RegionActivationT.cpp b/tests/RegionActivationT.cpp
index b67690ee..22723ff9 100644
--- a/tests/RegionActivationT.cpp
+++ b/tests/RegionActivationT.cpp
@@ -186,14 +186,14 @@ TEST_CASE("[Keyswitches] Normal lastKeyswitch range")
         <region> sw_last=41 key=62 sample=*saw
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 41, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
 }
 
 TEST_CASE("[Keyswitches] No lastKeyswitch range")
@@ -204,19 +204,19 @@ TEST_CASE("[Keyswitches] No lastKeyswitch range")
         <region> sw_last=41 key=62 sample=*saw
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 41, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
 }
 
 TEST_CASE("[Keyswitches] Out of lastKeyswitch range")
@@ -228,14 +228,14 @@ TEST_CASE("[Keyswitches] Out of lastKeyswitch range")
         <region> sw_last=43 key=62 sample=*saw
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 43, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
 }
 
 TEST_CASE("[Keyswitches] Overlapping key and lastKeyswitch range")
@@ -247,19 +247,19 @@ TEST_CASE("[Keyswitches] Overlapping key and lastKeyswitch range")
         <region> sw_last=41 key=62 sample=*saw
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 41, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     synth.noteOn(0, 43, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     synth.noteOn(0, 62, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 3);
+    REQUIRE(synth.getNumActiveVoices() == 3);
 }
 
 TEST_CASE("[Keyswitches] sw_down, in range")
@@ -270,13 +270,13 @@ TEST_CASE("[Keyswitches] sw_down, in range")
         <region> sw_down=40 key=60 sample=*sine
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOff(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
 }
 
 TEST_CASE("[Keyswitches] sw_down, out of range")
@@ -287,13 +287,13 @@ TEST_CASE("[Keyswitches] sw_down, out of range")
         <region> sw_down=40 key=60 sample=*sine
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOff(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
 }
 
 TEST_CASE("[Keyswitches] sw_up, in range")
@@ -304,13 +304,13 @@ TEST_CASE("[Keyswitches] sw_up, in range")
         <region> sw_up=40 key=60 sample=*sine
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOff(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
 }
 
 TEST_CASE("[Keyswitches] sw_up, out of range")
@@ -321,13 +321,13 @@ TEST_CASE("[Keyswitches] sw_up, out of range")
         <region> sw_up=40 key=60 sample=*sine
     )");
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOn(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     synth.noteOff(0, 40, 64);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
 }
 
 TEST_CASE("[Keyswitches] sw_default")
@@ -387,18 +387,18 @@ TEST_CASE("[Keyswitches] sw_previous in range")
     // the test assumes that sw_previous regions are disabled by default
     REQUIRE(!synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 51, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     REQUIRE(synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 51, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(!synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     REQUIRE(synth.getRegionView(0)->isSwitchedOn());
 }
 
@@ -411,15 +411,15 @@ TEST_CASE("[Keyswitches] sw_previous out of range")
     )");
     REQUIRE(!synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 51, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     REQUIRE(synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 51, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(!synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 60, 64);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getRegionView(0)->isSwitchedOn());
     synth.noteOn(0, 61, 64);
     REQUIRE(!synth.getRegionView(0)->isSwitchedOn());
diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp
index 71303217..d1cd9156 100644
--- a/tests/SynthT.cpp
+++ b/tests/SynthT.cpp
@@ -28,11 +28,11 @@ TEST_CASE("[Synth] Play and check active voices")
 
     synth.noteOn(0, 36, 24);
     synth.noteOn(0, 36, 89);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     // Render for a while
     for (int i = 0; i < 200; ++i)
         synth.renderBlock(buffer);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
 }
 
 TEST_CASE("[Synth] All sound off")
@@ -41,9 +41,9 @@ TEST_CASE("[Synth] All sound off")
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/groups_avl.sfz");
     synth.noteOn(0, 36, 24);
     synth.noteOn(0, 36, 89);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     synth.allSoundOff();
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
 }
 
 TEST_CASE("[Synth] Change the number of voice while playing")
@@ -56,9 +56,9 @@ TEST_CASE("[Synth] Change the number of voice while playing")
     synth.noteOn(0, 36, 24);
     synth.noteOn(0, 36, 89);
     synth.renderBlock(buffer);
-    REQUIRE(synth.getNumActiveVoices(true) == 2);
+    REQUIRE(synth.getNumActiveVoices() == 2);
     synth.setNumVoices(8);
-    REQUIRE(synth.getNumActiveVoices(true) == 0);
+    REQUIRE(synth.getNumActiveVoices() == 0);
     REQUIRE(synth.getNumVoices() == 8);
 }
 
@@ -136,15 +136,15 @@ TEST_CASE("[Synth] All notes offs/all sounds off")
     )");
     synth.noteOn(0, 60, 63);
     synth.noteOn(0, 62, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.cc(0, 120, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     synth.noteOn(0, 62, 63);
     synth.noteOn(0, 60, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.cc(0, 123, 63);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 }
 
 TEST_CASE("[Synth] Reset all controllers")
@@ -570,14 +570,14 @@ TEST_CASE("[Synth] sample quality")
 
     // default sample quality
     synth.noteOn(0, 60, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == sfz::Default::sampleQuality);
     synth.allSoundOff();
 
     // default sample quality, freewheeling
     synth.enableFreeWheeling();
     synth.noteOn(0, 60, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == sfz::Default::sampleQualityInFreewheelingMode);
     synth.allSoundOff();
     synth.disableFreeWheeling();
@@ -585,7 +585,7 @@ TEST_CASE("[Synth] sample quality")
     // user-defined sample quality
     synth.setSampleQuality(sfz::Synth::ProcessLive, 3);
     synth.noteOn(0, 60, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == 3);
     synth.allSoundOff();
 
@@ -593,21 +593,21 @@ TEST_CASE("[Synth] sample quality")
     synth.enableFreeWheeling();
     synth.setSampleQuality(sfz::Synth::ProcessFreewheeling, 8);
     synth.noteOn(0, 60, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == 8);
     synth.allSoundOff();
     synth.disableFreeWheeling();
 
     // region sample quality
     synth.noteOn(0, 61, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == 5);
     synth.allSoundOff();
 
     // region sample quality, freewheeling
     synth.enableFreeWheeling();
     synth.noteOn(0, 61, 100);
-    REQUIRE(synth.getNumActiveVoices(true) == 1);
+    REQUIRE(synth.getNumActiveVoices() == 1);
     REQUIRE(synth.getVoiceView(0)->getCurrentSampleQuality() == 5);
     synth.allSoundOff();
     synth.disableFreeWheeling();
@@ -630,7 +630,7 @@ TEST_CASE("[Synth] Sister voices")
     REQUIRE( synth.getVoiceView(0)->getNextSisterVoice() == synth.getVoiceView(0) );
     REQUIRE( synth.getVoiceView(0)->getPreviousSisterVoice() == synth.getVoiceView(0) );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(1)) == 2 );
     REQUIRE( synth.getVoiceView(1)->getNextSisterVoice() == synth.getVoiceView(2) );
     REQUIRE( synth.getVoiceView(1)->getPreviousSisterVoice() == synth.getVoiceView(2) );
@@ -638,7 +638,7 @@ TEST_CASE("[Synth] Sister voices")
     REQUIRE( synth.getVoiceView(2)->getNextSisterVoice() == synth.getVoiceView(1) );
     REQUIRE( synth.getVoiceView(2)->getPreviousSisterVoice() == synth.getVoiceView(1) );
     synth.noteOn(0, 63, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 6 );
+    REQUIRE( synth.getNumActiveVoices() == 6 );
     REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(3)) == 3 );
     REQUIRE( synth.getVoiceView(3)->getNextSisterVoice() == synth.getVoiceView(4) );
     REQUIRE( synth.getVoiceView(3)->getPreviousSisterVoice() == synth.getVoiceView(5) );
@@ -678,15 +678,15 @@ TEST_CASE("[Synth] Sisters and off-by")
         <group> group=2 <region> key=63 sample=*saw
     )");
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(0)) == 2 );
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.noteOn(0, 63, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     for (unsigned i = 0; i < 100; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     REQUIRE( sfz::SisterVoiceRing::countSisterVoices(synth.getVoiceView(0)) == 1 );
 }
 
@@ -750,9 +750,9 @@ TEST_CASE("[Synth] Release")
     synth.noteOn(0, 62, 85);
     synth.cc(0, 64, 127);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
 }
 
 TEST_CASE("[Synth] Release (pedal was already down)")
@@ -765,9 +765,9 @@ TEST_CASE("[Synth] Release (pedal was already down)")
     synth.cc(0, 64, 127);
     synth.noteOn(0, 62, 85);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
 }
 
 
@@ -780,12 +780,12 @@ TEST_CASE("[Synth] Release samples don't play unless there is another playing re
     )");
     synth.noteOn(0, 62, 85);
     synth.noteOff(0, 62, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.cc(0, 64, 127);
     synth.noteOn(0, 62, 85);
     synth.noteOff(0, 62, 0);
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 }
 
 TEST_CASE("[Synth] Release key (Different sustain CC)")
@@ -798,7 +798,7 @@ TEST_CASE("[Synth] Release key (Different sustain CC)")
     synth.noteOn(0, 62, 85);
     synth.cc(0, 54, 127);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] Release (Different sustain CC)")
@@ -812,9 +812,9 @@ TEST_CASE("[Synth] Release (Different sustain CC)")
     synth.noteOn(0, 62, 85);
     synth.cc(0, 54, 127);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     synth.cc(0, 54, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
 }
 
 TEST_CASE("[Synth] Sustain threshold default")
@@ -826,7 +826,7 @@ TEST_CASE("[Synth] Sustain threshold default")
     synth.noteOn(0, 62, 85);
     synth.cc(0, 64, 1);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 }
 
 TEST_CASE("[Synth] Sustain threshold")
@@ -840,15 +840,15 @@ TEST_CASE("[Synth] Sustain threshold")
     synth.noteOn(0, 62, 85);
     synth.cc(0, 64, 1);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.noteOn(0, 62, 85);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 4 );
+    REQUIRE( synth.getNumActiveVoices() == 4 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 5 );
+    REQUIRE( synth.getNumActiveVoices() == 5 );
     synth.cc(0, 64, 64);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 5 );
+    REQUIRE( synth.getNumActiveVoices() == 5 );
 }
 
 TEST_CASE("[Synth] Release (Multiple notes, release_key ignores the pedal)")
@@ -864,7 +864,7 @@ TEST_CASE("[Synth] Release (Multiple notes, release_key ignores the pedal)")
     synth.noteOff(0, 64, 0);
     synth.noteOff(0, 63, 2);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
 
     std::vector<float> requiredVelocities { 34_norm, 78_norm, 85_norm};
     std::vector<float> actualVelocities;
@@ -890,9 +890,9 @@ TEST_CASE("[Synth] Release (Multiple notes, release, cleared the delayed voices
     synth.noteOff(0, 64, 0);
     synth.noteOff(0, 63, 2);
     synth.noteOff(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 6 );
+    REQUIRE( synth.getNumActiveVoices() == 6 );
 
     std::vector<float> requiredVelocities { 34_norm, 78_norm, 85_norm, 34_norm, 78_norm, 85_norm };
     std::vector<float> actualVelocities;
@@ -920,9 +920,9 @@ TEST_CASE("[Synth] Release (Multiple notes after pedal is down, release, cleared
     synth.noteOff(2, 64, 0);
     synth.noteOff(2, 63, 2);
     synth.noteOff(2, 62, 3);
-    REQUIRE( synth.getNumActiveVoices(true) == 3 );
+    REQUIRE( synth.getNumActiveVoices() == 3 );
     synth.cc(3, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 6 );
+    REQUIRE( synth.getNumActiveVoices() == 6 );
 
     std::vector<float> requiredVelocities { 34_norm, 78_norm, 85_norm, 34_norm, 78_norm, 85_norm };
     std::vector<float> actualVelocities;
@@ -948,9 +948,9 @@ TEST_CASE("[Synth] Release (Multiple note ons during pedal down)")
     synth.noteOff(0, 62, 0);
     synth.noteOn(0, 62, 78);
     synth.noteOff(0, 62, 2);
-    REQUIRE( synth.getNumActiveVoices(true) == 2 );
+    REQUIRE( synth.getNumActiveVoices() == 2 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 4 );
+    REQUIRE( synth.getNumActiveVoices() == 4 );
 
     std::vector<float> requiredVelocities { 78_norm, 85_norm, 78_norm, 85_norm };
     std::vector<float> actualVelocities;
@@ -974,25 +974,25 @@ TEST_CASE("[Synth] No release sample after the main sample stopped sounding by d
             loopmode=one_shot ampeg_attack=0.02 ampeg_release=0.1
     )");
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i) {
         synth.renderBlock(buffer);
     }
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOff(0, 62, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     synth.noteOn(0, 62, 85);
     synth.cc(0, 64, 127);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i) {
         synth.renderBlock(buffer);
     }
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOff(0, 62, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     REQUIRE( synth.getRegionView(1)->delayedReleases.empty() );
 }
@@ -1009,25 +1009,25 @@ TEST_CASE("[Synth] If rt_dead is active the release sample can sound after the a
             loopmode=one_shot ampeg_attack=0.02 ampeg_release=0.1
     )");
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i) {
         synth.renderBlock(buffer);
     }
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOff(0, 62, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     synth.noteOn(0, 62, 85);
     synth.cc(0, 64, 127);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     for (unsigned i = 0; i < 100; ++i) {
         synth.renderBlock(buffer);
     }
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOff(0, 62, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.cc(0, 64, 0);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 
     REQUIRE( synth.getRegionView(1)->delayedReleases.empty() );
 }
@@ -1041,9 +1041,9 @@ TEST_CASE("[Synth] sw_default works at a global level")
         <region> sw_last=37 key=63 sample=*sine
     )");
     synth.noteOn(0, 63, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] sw_default works at a master level")
@@ -1055,9 +1055,9 @@ TEST_CASE("[Synth] sw_default works at a master level")
         <region> sw_last=37 key=63 sample=*sine
     )");
     synth.noteOn(0, 63, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] sw_default works at a group level")
@@ -1069,9 +1069,9 @@ TEST_CASE("[Synth] sw_default works at a group level")
         <region> sw_last=37 key=63 sample=*sine
     )");
     synth.noteOn(0, 63, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] Used CCs")
@@ -1169,10 +1169,10 @@ TEST_CASE("[Synth] Activate also on the sustain CC")
         <region> locc64=64 key=53 sample=*sine
     )");
     synth.noteOn(0, 53, 127);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.cc(1, 64, 127);
     synth.noteOn(2, 53, 127);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] Trigger also on the sustain CC")
@@ -1182,7 +1182,7 @@ TEST_CASE("[Synth] Trigger also on the sustain CC")
         <region> on_locc64=64 sample=*sine
     )");
     synth.cc(0, 64, 127);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
 }
 
 TEST_CASE("[Synth] end=-1 voices are immediately killed after triggering but they kill other voices")
@@ -1197,11 +1197,11 @@ TEST_CASE("[Synth] end=-1 voices are immediately killed after triggering but the
         <region> key=63 end=-1 sample=*saw group=2
     )");
     synth.noteOn(0, 60, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 61, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     REQUIRE( numPlayingVoices(synth) == 1 );
     synth.noteOn(1, 63, 85);
     synth.renderBlock(buffer);
@@ -1220,11 +1220,11 @@ TEST_CASE("[Synth] end=0 voices are immediately killed after triggering but they
         <region> key=63 end=0 sample=*saw group=2
     )");
     synth.noteOn(0, 60, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 61, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 62, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     REQUIRE( numPlayingVoices(synth) == 1 );
     synth.noteOn(1, 63, 85);
     synth.renderBlock(buffer);
@@ -1242,19 +1242,19 @@ TEST_CASE("[Synth] ampeg_sustain = 0 puts the ampeg envelope in free-running mod
     )");
 
     synth.noteOn(0, 60, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
     synth.noteOn(0, 61, 85);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     // Render a bit; this does not kill the voice
     for (unsigned i = 0; i < 5; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 1 );
+    REQUIRE( synth.getNumActiveVoices() == 1 );
     // Render about half a second
     for (unsigned i = 0; i < 100; ++i)
         synth.renderBlock(buffer);
-    REQUIRE( synth.getNumActiveVoices(true) == 0 );
+    REQUIRE( synth.getNumActiveVoices() == 0 );
 }
 
 TEST_CASE("[Synth] Off by standard")