diff --git a/ClangSynth/source/parameter.hpp b/ClangSynth/source/parameter.hpp
index 309ffbba..8f0fb0ae 100644
--- a/ClangSynth/source/parameter.hpp
+++ b/ClangSynth/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -362,7 +363,7 @@ struct GlobalParameter : public ParameterInterface {
       auto indexStr = std::to_string(idx);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
         Scales::wavetableAmp.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::wavetableAmp, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
     value[ID::lfoInterpolation] = std::make_unique<UIntValue>(
diff --git a/CubicPadSynth/source/parameter.hpp b/CubicPadSynth/source/parameter.hpp
index 42e6e3ff..fd995b3c 100755
--- a/CubicPadSynth/source/parameter.hpp
+++ b/CubicPadSynth/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -25,9 +26,9 @@
 #include "../../common/parameterInterface.hpp"
 
 #ifdef TEST_DSP
-#include "../../test/value.hpp"
+  #include "../../test/value.hpp"
 #else
-#include "../../common/value.hpp"
+  #include "../../common/value.hpp"
 #endif
 
 constexpr int32_t nOvertone = 360;
@@ -216,7 +217,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLFOWavetable; ++idx) {
       auto indexStr = std::to_string(idx + 1);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * idx / double(nLFOWavetable))),
+        Scales::lfoWavetable.invmap(
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLFOWavetable))),
         Scales::lfoWavetable, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
 
diff --git a/EsPhaser/source/parameter.hpp b/EsPhaser/source/parameter.hpp
index 2965a8bf..16565a54 100644
--- a/EsPhaser/source/parameter.hpp
+++ b/EsPhaser/source/parameter.hpp
@@ -18,15 +18,16 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
 #include "../../common/parameterInterface.hpp"
 
 #ifdef TEST_DSP
-#include "../../test/value.hpp"
+  #include "../../test/value.hpp"
 #else
-#include "../../common/value.hpp"
+  #include "../../common/value.hpp"
 #endif
 
 namespace Steinberg {
@@ -102,8 +103,8 @@ struct GlobalParameter : public ParameterInterface {
     value[ID::stereoOffset] = std::make_unique<LinearValue>(
       0.5, Scales::phase, "stereoOffset", Info::kCanAutomate);
     value[ID::cascadeOffset] = std::make_unique<LinearValue>(
-      Scales::cascadeOffset.invmap(SomeDSP::twopi / 16.0), Scales::cascadeOffset,
-      "cascadeOffset", Info::kCanAutomate);
+      Scales::cascadeOffset.invmap(double(2) * std::numbers::pi_v<double> / 16.0),
+      Scales::cascadeOffset, "cascadeOffset", Info::kCanAutomate);
     value[ID::stage]
       = std::make_unique<UIntValue>(15, Scales::stage, "stage", Info::kCanAutomate);
 
diff --git a/FDNCymbal/CMakeLists.txt b/FDNCymbal/CMakeLists.txt
index 1b90b13e..c83f743f 100644
--- a/FDNCymbal/CMakeLists.txt
+++ b/FDNCymbal/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+cmake_minimum_required(VERSION 3.20)
+
 
 include(../common/cmake/non_simd.cmake)
 
diff --git a/GlitchSprinkler/source/parameter.hpp b/GlitchSprinkler/source/parameter.hpp
index 67618dc9..cd93adcf 100644
--- a/GlitchSprinkler/source/parameter.hpp
+++ b/GlitchSprinkler/source/parameter.hpp
@@ -298,7 +298,8 @@ struct GlobalParameter : public ParameterInterface {
         Scales::defaultScale.invmap(ratio), Scales::defaultScale,
         ("polynomialPointX" + indexStr).c_str(), Info::kCanAutomate);
       value[ID::polynomialPointY0 + idx] = std::make_unique<LinearValue>(
-        Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio)),
+        Scales::polynomialPointY.invmap(
+          0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio)),
         Scales::polynomialPointY, ("polynomialPointY" + indexStr).c_str(),
         Info::kCanAutomate);
     }
diff --git a/LightPadSynth/source/parameter.hpp b/LightPadSynth/source/parameter.hpp
index 4b18e254..15eea9e9 100755
--- a/LightPadSynth/source/parameter.hpp
+++ b/LightPadSynth/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -25,9 +26,9 @@
 #include "../../common/parameterInterface.hpp"
 
 #ifdef TEST_DSP
-#include "../../test/value.hpp"
+  #include "../../test/value.hpp"
 #else
-#include "../../common/value.hpp"
+  #include "../../common/value.hpp"
 #endif
 
 constexpr int32_t nOvertone = 360;
@@ -216,7 +217,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLFOWavetable; ++idx) {
       auto indexStr = std::to_string(idx + 1);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * idx / double(nLFOWavetable))),
+        Scales::lfoWavetable.invmap(
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLFOWavetable))),
         Scales::lfoWavetable, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
 
diff --git a/LongPhaser/source/parameter.hpp b/LongPhaser/source/parameter.hpp
index e5fe32ec..06cf3eaf 100644
--- a/LongPhaser/source/parameter.hpp
+++ b/LongPhaser/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -145,7 +146,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLfoWavetable; ++idx) {
       auto indexStr = std::to_string(idx);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::bipolarScale.invmap(sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+        Scales::bipolarScale.invmap(
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
     value[ID::lfoTempoSync] = std::make_unique<UIntValue>(
diff --git a/OrdinaryPhaser/source/parameter.hpp b/OrdinaryPhaser/source/parameter.hpp
index b3ece22e..bea65199 100644
--- a/OrdinaryPhaser/source/parameter.hpp
+++ b/OrdinaryPhaser/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -148,7 +149,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLfoWavetable; ++idx) {
       auto indexStr = std::to_string(idx);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::bipolarScale.invmap(sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+        Scales::bipolarScale.invmap(
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
     value[ID::lfoInterpolation] = std::make_unique<UIntValue>(
diff --git a/ParallelDetune/source/parameter.hpp b/ParallelDetune/source/parameter.hpp
index ab08d28c..3018004a 100644
--- a/ParallelDetune/source/parameter.hpp
+++ b/ParallelDetune/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -185,7 +186,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLfoWavetable; ++idx) {
       auto indexStr = std::to_string(idx);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::bipolarScale.invmap(sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+        Scales::bipolarScale.invmap(
+          sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
     value[ID::lfoInterpolation] = std::make_unique<UIntValue>(
diff --git a/PitchShiftDelay/source/parameter.hpp b/PitchShiftDelay/source/parameter.hpp
index 7e2a5667..4ee2f632 100644
--- a/PitchShiftDelay/source/parameter.hpp
+++ b/PitchShiftDelay/source/parameter.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -117,7 +118,8 @@ struct GlobalParameter : public ParameterInterface {
     for (size_t idx = 0; idx < nLfoWavetable; ++idx) {
       auto indexStr = std::to_string(idx);
       value[ID::lfoWavetable0 + idx] = std::make_unique<LinearValue>(
-        Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+        Scales::lfoWavetable.invmap(
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::lfoWavetable, (lfoWavetableLabel + indexStr).c_str(), Info::kCanAutomate);
     }
     value[ID::lfoTempoSync] = std::make_unique<UIntValue>(
diff --git a/TestBedSynth/source/parameter.hpp b/TestBedSynth/source/parameter.hpp
index 7640e2d7..49bdb585 100644
--- a/TestBedSynth/source/parameter.hpp
+++ b/TestBedSynth/source/parameter.hpp
@@ -19,6 +19,7 @@
 
 #include <array>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -190,11 +191,11 @@ struct GlobalParameter : public ParameterInterface {
 
       value[ID::osc0Waveform0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nOscWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nOscWavetable))),
         Scales::bipolarScale, ("lfo0Waveform" + indexStr).c_str(), Info::kCanAutomate);
       value[ID::osc1Waveform0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nOscWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nOscWavetable))),
         Scales::bipolarScale, ("lfo1Waveform" + indexStr).c_str(), Info::kCanAutomate);
     }
 
@@ -323,11 +324,11 @@ struct GlobalParameter : public ParameterInterface {
 
       value[ID::lfo0Waveform0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, ("lfo0Waveform" + indexStr).c_str(), Info::kCanAutomate);
       value[ID::lfo1Waveform0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, ("lfo1Waveform" + indexStr).c_str(), Info::kCanAutomate);
     }
 
@@ -357,11 +358,11 @@ struct GlobalParameter : public ParameterInterface {
 
       value[ID::waveMod0Gain0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, ("waveMod0Gain" + indexStr).c_str(), Info::kCanAutomate);
       value[ID::waveMod1Gain0 + idx] = std::make_unique<LinearValue>(
         Scales::bipolarScale.invmap(
-          std::sin(SomeDSP::twopi * idx / double(nLfoWavetable))),
+          std::sin(double(2) * std::numbers::pi_v<double> * idx / double(nLfoWavetable))),
         Scales::bipolarScale, ("waveMod1Gain" + indexStr).c_str(), Info::kCanAutomate);
       value[ID::waveMod0Delay0 + idx] = std::make_unique<UIntValue>(
         idx / double(nLfoWavetable - 1), Scales::waveModDelay,
diff --git a/common/dsp/scale.hpp b/common/dsp/scale.hpp
index c1de8b89..74e7abb6 100644
--- a/common/dsp/scale.hpp
+++ b/common/dsp/scale.hpp
@@ -260,8 +260,8 @@ template<typename T> class SemitoneScale {
   T getMin() { return minToZero ? 0 : minFreq; }
   T getMax() { return maxFreq; }
 
-  inline T noteToFreq(T note) { return T(440) * std::exp2((note - 69) / T(12)); }
-  inline T freqToNote(T freq) { return T(69) + T(12) * std::log2(freq / T(440)); }
+  inline T noteToFreq(T note) const { return T(440) * std::exp2((note - 69) / T(12)); }
+  inline T freqToNote(T freq) const { return T(69) + T(12) * std::log2(freq / T(440)); }
 
 protected:
   bool minToZero;
diff --git a/presets/json/ClangSynth.type.json b/presets/json/ClangSynth.type.json
index 363da49e..c4c15448 100644
--- a/presets/json/ClangSynth.type.json
+++ b/presets/json/ClangSynth.type.json
@@ -947,7 +947,7 @@
     "id": 118,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 0 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -955,7 +955,7 @@
     "id": 119,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 1 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -963,7 +963,7 @@
     "id": 120,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 2 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -971,7 +971,7 @@
     "id": 121,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 3 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -979,7 +979,7 @@
     "id": 122,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 4 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -987,7 +987,7 @@
     "id": 123,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 5 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -995,7 +995,7 @@
     "id": 124,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 6 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1003,7 +1003,7 @@
     "id": 125,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 7 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1011,7 +1011,7 @@
     "id": 126,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 8 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1019,7 +1019,7 @@
     "id": 127,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 9 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1027,7 +1027,7 @@
     "id": 128,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 10 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1035,7 +1035,7 @@
     "id": 129,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 11 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1043,7 +1043,7 @@
     "id": 130,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 12 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1051,7 +1051,7 @@
     "id": 131,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 13 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1059,7 +1059,7 @@
     "id": 132,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 14 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1067,7 +1067,7 @@
     "id": 133,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 15 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1075,7 +1075,7 @@
     "id": 134,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 16 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1083,7 +1083,7 @@
     "id": 135,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 17 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1091,7 +1091,7 @@
     "id": 136,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 18 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1099,7 +1099,7 @@
     "id": 137,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 19 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1107,7 +1107,7 @@
     "id": 138,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 20 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1115,7 +1115,7 @@
     "id": 139,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 21 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1123,7 +1123,7 @@
     "id": 140,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 22 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1131,7 +1131,7 @@
     "id": 141,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 23 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1139,7 +1139,7 @@
     "id": 142,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 24 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1147,7 +1147,7 @@
     "id": 143,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 25 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1155,7 +1155,7 @@
     "id": 144,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 26 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1163,7 +1163,7 @@
     "id": 145,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 27 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1171,7 +1171,7 @@
     "id": 146,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 28 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1179,7 +1179,7 @@
     "id": 147,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 29 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1187,7 +1187,7 @@
     "id": 148,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 30 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1195,7 +1195,7 @@
     "id": 149,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 31 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1203,7 +1203,7 @@
     "id": 150,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 32 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1211,7 +1211,7 @@
     "id": 151,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 33 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1219,7 +1219,7 @@
     "id": 152,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 34 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1227,7 +1227,7 @@
     "id": 153,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 35 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1235,7 +1235,7 @@
     "id": 154,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 36 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1243,7 +1243,7 @@
     "id": 155,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 37 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1251,7 +1251,7 @@
     "id": 156,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 38 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1259,7 +1259,7 @@
     "id": 157,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 39 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1267,7 +1267,7 @@
     "id": 158,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 40 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1275,7 +1275,7 @@
     "id": 159,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 41 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1283,7 +1283,7 @@
     "id": 160,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 42 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1291,7 +1291,7 @@
     "id": 161,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 43 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1299,7 +1299,7 @@
     "id": 162,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 44 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1307,7 +1307,7 @@
     "id": 163,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 45 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1315,7 +1315,7 @@
     "id": 164,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 46 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1323,7 +1323,7 @@
     "id": 165,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 47 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1331,7 +1331,7 @@
     "id": 166,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 48 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1339,7 +1339,7 @@
     "id": 167,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 49 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1347,7 +1347,7 @@
     "id": 168,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 50 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1355,7 +1355,7 @@
     "id": 169,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 51 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1363,7 +1363,7 @@
     "id": 170,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 52 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1371,7 +1371,7 @@
     "id": 171,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 53 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1379,7 +1379,7 @@
     "id": 172,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 54 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1387,7 +1387,7 @@
     "id": 173,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 55 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1395,7 +1395,7 @@
     "id": 174,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 56 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1403,7 +1403,7 @@
     "id": 175,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 57 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1411,7 +1411,7 @@
     "id": 176,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 58 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1419,7 +1419,7 @@
     "id": 177,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 59 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1427,7 +1427,7 @@
     "id": 178,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 60 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1435,7 +1435,7 @@
     "id": 179,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 61 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1443,7 +1443,7 @@
     "id": 180,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 62 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -1451,7 +1451,7 @@
     "id": 181,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::wavetableAmp.invmap(\n          std::sin(SomeDSP::twopi * 63 / double(nLfoWavetable)))",
+    "default": "Scales::wavetableAmp.invmap(\n          std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLfoWavetable)))",
     "scale": "Scales::wavetableAmp",
     "flags": "Info::kCanAutomate"
   },
@@ -2615,4 +2615,4 @@
     "scale": "Scales::fdnOvertoneAdd",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/CubicPadSynth.type.json b/presets/json/CubicPadSynth.type.json
index 6ef80c9d..75401875 100644
--- a/presets/json/CubicPadSynth.type.json
+++ b/presets/json/CubicPadSynth.type.json
@@ -11531,7 +11531,7 @@
     "id": 1441,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 0 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11539,7 +11539,7 @@
     "id": 1442,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 1 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11547,7 +11547,7 @@
     "id": 1443,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 2 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11555,7 +11555,7 @@
     "id": 1444,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 3 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11563,7 +11563,7 @@
     "id": 1445,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 4 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11571,7 +11571,7 @@
     "id": 1446,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 5 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11579,7 +11579,7 @@
     "id": 1447,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 6 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11587,7 +11587,7 @@
     "id": 1448,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 7 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11595,7 +11595,7 @@
     "id": 1449,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 8 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11603,7 +11603,7 @@
     "id": 1450,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 9 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11611,7 +11611,7 @@
     "id": 1451,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 10 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11619,7 +11619,7 @@
     "id": 1452,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 11 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11627,7 +11627,7 @@
     "id": 1453,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 12 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11635,7 +11635,7 @@
     "id": 1454,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 13 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11643,7 +11643,7 @@
     "id": 1455,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 14 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11651,7 +11651,7 @@
     "id": 1456,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 15 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11659,7 +11659,7 @@
     "id": 1457,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 16 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11667,7 +11667,7 @@
     "id": 1458,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 17 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11675,7 +11675,7 @@
     "id": 1459,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 18 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11683,7 +11683,7 @@
     "id": 1460,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 19 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11691,7 +11691,7 @@
     "id": 1461,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 20 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11699,7 +11699,7 @@
     "id": 1462,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 21 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11707,7 +11707,7 @@
     "id": 1463,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 22 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11715,7 +11715,7 @@
     "id": 1464,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 23 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11723,7 +11723,7 @@
     "id": 1465,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 24 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11731,7 +11731,7 @@
     "id": 1466,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 25 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11739,7 +11739,7 @@
     "id": 1467,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 26 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11747,7 +11747,7 @@
     "id": 1468,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 27 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11755,7 +11755,7 @@
     "id": 1469,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 28 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11763,7 +11763,7 @@
     "id": 1470,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 29 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11771,7 +11771,7 @@
     "id": 1471,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 30 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11779,7 +11779,7 @@
     "id": 1472,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 31 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11787,7 +11787,7 @@
     "id": 1473,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 32 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11795,7 +11795,7 @@
     "id": 1474,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 33 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11803,7 +11803,7 @@
     "id": 1475,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 34 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11811,7 +11811,7 @@
     "id": 1476,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 35 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11819,7 +11819,7 @@
     "id": 1477,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 36 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11827,7 +11827,7 @@
     "id": 1478,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 37 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11835,7 +11835,7 @@
     "id": 1479,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 38 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11843,7 +11843,7 @@
     "id": 1480,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 39 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11851,7 +11851,7 @@
     "id": 1481,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 40 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11859,7 +11859,7 @@
     "id": 1482,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 41 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11867,7 +11867,7 @@
     "id": 1483,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 42 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11875,7 +11875,7 @@
     "id": 1484,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 43 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11883,7 +11883,7 @@
     "id": 1485,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 44 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11891,7 +11891,7 @@
     "id": 1486,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 45 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11899,7 +11899,7 @@
     "id": 1487,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 46 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11907,7 +11907,7 @@
     "id": 1488,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 47 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11915,7 +11915,7 @@
     "id": 1489,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 48 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11923,7 +11923,7 @@
     "id": 1490,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 49 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11931,7 +11931,7 @@
     "id": 1491,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 50 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11939,7 +11939,7 @@
     "id": 1492,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 51 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11947,7 +11947,7 @@
     "id": 1493,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 52 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11955,7 +11955,7 @@
     "id": 1494,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 53 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11963,7 +11963,7 @@
     "id": 1495,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 54 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11971,7 +11971,7 @@
     "id": 1496,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 55 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11979,7 +11979,7 @@
     "id": 1497,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 56 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11987,7 +11987,7 @@
     "id": 1498,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 57 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11995,7 +11995,7 @@
     "id": 1499,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 58 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12003,7 +12003,7 @@
     "id": 1500,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 59 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12011,7 +12011,7 @@
     "id": 1501,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 60 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12019,7 +12019,7 @@
     "id": 1502,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 61 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12027,7 +12027,7 @@
     "id": 1503,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 62 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12035,7 +12035,7 @@
     "id": 1504,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 63 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12511,4 +12511,4 @@
     "scale": "Scales::boolScale",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/EsPhaser.type.json b/presets/json/EsPhaser.type.json
index cb906587..d15af0d9 100644
--- a/presets/json/EsPhaser.type.json
+++ b/presets/json/EsPhaser.type.json
@@ -75,7 +75,7 @@
     "id": 9,
     "name": "cascadeOffset",
     "type": "d",
-    "default": "Scales::cascadeOffset.invmap(SomeDSP::twopi / 16.0)",
+    "default": "Scales::cascadeOffset.invmap(double(2) * std::numbers::pi_v<double> / 16.0)",
     "scale": "Scales::cascadeOffset",
     "flags": "Info::kCanAutomate"
   },
@@ -95,4 +95,4 @@
     "scale": "Scales::smoothness",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/GlitchSprinkler.type.json b/presets/json/GlitchSprinkler.type.json
index d0034126..16fa4bc2 100644
--- a/presets/json/GlitchSprinkler.type.json
+++ b/presets/json/GlitchSprinkler.type.json
@@ -331,7 +331,7 @@
     "id": 41,
     "name": "polynomialPointY0",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -339,7 +339,7 @@
     "id": 42,
     "name": "polynomialPointY1",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -347,7 +347,7 @@
     "id": 43,
     "name": "polynomialPointY2",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -355,7 +355,7 @@
     "id": 44,
     "name": "polynomialPointY3",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -363,7 +363,7 @@
     "id": 45,
     "name": "polynomialPointY4",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -371,7 +371,7 @@
     "id": 46,
     "name": "polynomialPointY5",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -379,7 +379,7 @@
     "id": 47,
     "name": "polynomialPointY6",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -387,7 +387,7 @@
     "id": 48,
     "name": "polynomialPointY7",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -395,7 +395,7 @@
     "id": 49,
     "name": "polynomialPointY8",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -403,7 +403,7 @@
     "id": 50,
     "name": "polynomialPointY9",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -411,7 +411,7 @@
     "id": 51,
     "name": "polynomialPointY10",
     "type": "d",
-    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(SomeDSP::twopi * ratio))",
+    "default": "Scales::polynomialPointY.invmap(0.5 * std::sin(double(2) * std::numbers::pi_v<double> * ratio))",
     "scale": "Scales::polynomialPointY",
     "flags": "Info::kCanAutomate"
   },
@@ -3103,4 +3103,4 @@
     "scale": "Scales::defaultScale",
     "flags": "Info::kIsHidden"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/LightPadSynth.type.json b/presets/json/LightPadSynth.type.json
index 70b1563d..d7aaa997 100644
--- a/presets/json/LightPadSynth.type.json
+++ b/presets/json/LightPadSynth.type.json
@@ -11531,7 +11531,7 @@
     "id": 1441,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 0 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11539,7 +11539,7 @@
     "id": 1442,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 1 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11547,7 +11547,7 @@
     "id": 1443,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 2 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11555,7 +11555,7 @@
     "id": 1444,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 3 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11563,7 +11563,7 @@
     "id": 1445,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 4 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11571,7 +11571,7 @@
     "id": 1446,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 5 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11579,7 +11579,7 @@
     "id": 1447,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 6 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11587,7 +11587,7 @@
     "id": 1448,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 7 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11595,7 +11595,7 @@
     "id": 1449,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 8 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11603,7 +11603,7 @@
     "id": 1450,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 9 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11611,7 +11611,7 @@
     "id": 1451,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 10 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11619,7 +11619,7 @@
     "id": 1452,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 11 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11627,7 +11627,7 @@
     "id": 1453,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 12 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11635,7 +11635,7 @@
     "id": 1454,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 13 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11643,7 +11643,7 @@
     "id": 1455,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 14 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11651,7 +11651,7 @@
     "id": 1456,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 15 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11659,7 +11659,7 @@
     "id": 1457,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 16 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11667,7 +11667,7 @@
     "id": 1458,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 17 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11675,7 +11675,7 @@
     "id": 1459,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 18 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11683,7 +11683,7 @@
     "id": 1460,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 19 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11691,7 +11691,7 @@
     "id": 1461,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 20 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11699,7 +11699,7 @@
     "id": 1462,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 21 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11707,7 +11707,7 @@
     "id": 1463,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 22 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11715,7 +11715,7 @@
     "id": 1464,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 23 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11723,7 +11723,7 @@
     "id": 1465,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 24 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11731,7 +11731,7 @@
     "id": 1466,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 25 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11739,7 +11739,7 @@
     "id": 1467,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 26 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11747,7 +11747,7 @@
     "id": 1468,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 27 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11755,7 +11755,7 @@
     "id": 1469,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 28 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11763,7 +11763,7 @@
     "id": 1470,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 29 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11771,7 +11771,7 @@
     "id": 1471,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 30 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11779,7 +11779,7 @@
     "id": 1472,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 31 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11787,7 +11787,7 @@
     "id": 1473,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 32 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11795,7 +11795,7 @@
     "id": 1474,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 33 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11803,7 +11803,7 @@
     "id": 1475,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 34 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11811,7 +11811,7 @@
     "id": 1476,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 35 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11819,7 +11819,7 @@
     "id": 1477,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 36 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11827,7 +11827,7 @@
     "id": 1478,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 37 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11835,7 +11835,7 @@
     "id": 1479,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 38 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11843,7 +11843,7 @@
     "id": 1480,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 39 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11851,7 +11851,7 @@
     "id": 1481,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 40 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11859,7 +11859,7 @@
     "id": 1482,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 41 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11867,7 +11867,7 @@
     "id": 1483,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 42 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11875,7 +11875,7 @@
     "id": 1484,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 43 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11883,7 +11883,7 @@
     "id": 1485,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 44 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11891,7 +11891,7 @@
     "id": 1486,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 45 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11899,7 +11899,7 @@
     "id": 1487,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 46 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11907,7 +11907,7 @@
     "id": 1488,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 47 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11915,7 +11915,7 @@
     "id": 1489,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 48 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11923,7 +11923,7 @@
     "id": 1490,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 49 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11931,7 +11931,7 @@
     "id": 1491,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 50 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11939,7 +11939,7 @@
     "id": 1492,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 51 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11947,7 +11947,7 @@
     "id": 1493,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 52 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11955,7 +11955,7 @@
     "id": 1494,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 53 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11963,7 +11963,7 @@
     "id": 1495,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 54 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11971,7 +11971,7 @@
     "id": 1496,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 55 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11979,7 +11979,7 @@
     "id": 1497,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 56 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11987,7 +11987,7 @@
     "id": 1498,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 57 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -11995,7 +11995,7 @@
     "id": 1499,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 58 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12003,7 +12003,7 @@
     "id": 1500,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 59 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12011,7 +12011,7 @@
     "id": 1501,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 60 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12019,7 +12019,7 @@
     "id": 1502,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 61 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12027,7 +12027,7 @@
     "id": 1503,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 62 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12035,7 +12035,7 @@
     "id": 1504,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 63 / double(nLFOWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLFOWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -12503,4 +12503,4 @@
     "scale": "Scales::boolScale",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/LongPhaser.type.json b/presets/json/LongPhaser.type.json
index 47728123..ad7ecdcf 100644
--- a/presets/json/LongPhaser.type.json
+++ b/presets/json/LongPhaser.type.json
@@ -99,7 +99,7 @@
     "id": 12,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 0 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -107,7 +107,7 @@
     "id": 13,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 1 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -115,7 +115,7 @@
     "id": 14,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 2 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -123,7 +123,7 @@
     "id": 15,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 3 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -131,7 +131,7 @@
     "id": 16,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 4 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -139,7 +139,7 @@
     "id": 17,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 5 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -147,7 +147,7 @@
     "id": 18,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 6 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -155,7 +155,7 @@
     "id": 19,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 7 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -163,7 +163,7 @@
     "id": 20,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 8 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -171,7 +171,7 @@
     "id": 21,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 9 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -179,7 +179,7 @@
     "id": 22,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 10 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -187,7 +187,7 @@
     "id": 23,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 11 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -195,7 +195,7 @@
     "id": 24,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 12 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -203,7 +203,7 @@
     "id": 25,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 13 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -211,7 +211,7 @@
     "id": 26,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 14 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -219,7 +219,7 @@
     "id": 27,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 15 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -227,7 +227,7 @@
     "id": 28,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 16 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -235,7 +235,7 @@
     "id": 29,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 17 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -243,7 +243,7 @@
     "id": 30,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 18 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -251,7 +251,7 @@
     "id": 31,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 19 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -259,7 +259,7 @@
     "id": 32,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 20 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -267,7 +267,7 @@
     "id": 33,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 21 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -275,7 +275,7 @@
     "id": 34,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 22 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -283,7 +283,7 @@
     "id": 35,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 23 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -291,7 +291,7 @@
     "id": 36,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 24 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -299,7 +299,7 @@
     "id": 37,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 25 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -307,7 +307,7 @@
     "id": 38,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 26 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -315,7 +315,7 @@
     "id": 39,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 27 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -323,7 +323,7 @@
     "id": 40,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 28 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -331,7 +331,7 @@
     "id": 41,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 29 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -339,7 +339,7 @@
     "id": 42,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 30 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -347,7 +347,7 @@
     "id": 43,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 31 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -355,7 +355,7 @@
     "id": 44,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 32 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -363,7 +363,7 @@
     "id": 45,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 33 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -371,7 +371,7 @@
     "id": 46,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 34 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -379,7 +379,7 @@
     "id": 47,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 35 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -387,7 +387,7 @@
     "id": 48,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 36 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -395,7 +395,7 @@
     "id": 49,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 37 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -403,7 +403,7 @@
     "id": 50,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 38 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -411,7 +411,7 @@
     "id": 51,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 39 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -419,7 +419,7 @@
     "id": 52,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 40 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -427,7 +427,7 @@
     "id": 53,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 41 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -435,7 +435,7 @@
     "id": 54,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 42 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -443,7 +443,7 @@
     "id": 55,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 43 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -451,7 +451,7 @@
     "id": 56,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 44 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -459,7 +459,7 @@
     "id": 57,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 45 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -467,7 +467,7 @@
     "id": 58,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 46 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -475,7 +475,7 @@
     "id": 59,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 47 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -483,7 +483,7 @@
     "id": 60,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 48 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -491,7 +491,7 @@
     "id": 61,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 49 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -499,7 +499,7 @@
     "id": 62,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 50 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -507,7 +507,7 @@
     "id": 63,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 51 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -515,7 +515,7 @@
     "id": 64,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 52 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -523,7 +523,7 @@
     "id": 65,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 53 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -531,7 +531,7 @@
     "id": 66,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 54 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -539,7 +539,7 @@
     "id": 67,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 55 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -547,7 +547,7 @@
     "id": 68,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 56 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -555,7 +555,7 @@
     "id": 69,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 57 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -563,7 +563,7 @@
     "id": 70,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 58 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -571,7 +571,7 @@
     "id": 71,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 59 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -579,7 +579,7 @@
     "id": 72,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 60 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -587,7 +587,7 @@
     "id": 73,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 61 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -595,7 +595,7 @@
     "id": 74,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 62 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -603,7 +603,7 @@
     "id": 75,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 63 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -679,4 +679,4 @@
     "scale": "Scales::boolScale",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/OrdinaryPhaser.type.json b/presets/json/OrdinaryPhaser.type.json
index be278047..ae263b79 100644
--- a/presets/json/OrdinaryPhaser.type.json
+++ b/presets/json/OrdinaryPhaser.type.json
@@ -99,7 +99,7 @@
     "id": 12,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 0 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -107,7 +107,7 @@
     "id": 13,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 1 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -115,7 +115,7 @@
     "id": 14,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 2 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -123,7 +123,7 @@
     "id": 15,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 3 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -131,7 +131,7 @@
     "id": 16,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 4 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -139,7 +139,7 @@
     "id": 17,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 5 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -147,7 +147,7 @@
     "id": 18,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 6 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -155,7 +155,7 @@
     "id": 19,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 7 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -163,7 +163,7 @@
     "id": 20,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 8 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -171,7 +171,7 @@
     "id": 21,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 9 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -179,7 +179,7 @@
     "id": 22,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 10 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -187,7 +187,7 @@
     "id": 23,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 11 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -195,7 +195,7 @@
     "id": 24,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 12 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -203,7 +203,7 @@
     "id": 25,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 13 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -211,7 +211,7 @@
     "id": 26,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 14 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -219,7 +219,7 @@
     "id": 27,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 15 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -227,7 +227,7 @@
     "id": 28,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 16 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -235,7 +235,7 @@
     "id": 29,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 17 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -243,7 +243,7 @@
     "id": 30,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 18 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -251,7 +251,7 @@
     "id": 31,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 19 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -259,7 +259,7 @@
     "id": 32,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 20 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -267,7 +267,7 @@
     "id": 33,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 21 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -275,7 +275,7 @@
     "id": 34,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 22 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -283,7 +283,7 @@
     "id": 35,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 23 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -291,7 +291,7 @@
     "id": 36,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 24 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -299,7 +299,7 @@
     "id": 37,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 25 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -307,7 +307,7 @@
     "id": 38,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 26 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -315,7 +315,7 @@
     "id": 39,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 27 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -323,7 +323,7 @@
     "id": 40,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 28 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -331,7 +331,7 @@
     "id": 41,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 29 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -339,7 +339,7 @@
     "id": 42,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 30 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -347,7 +347,7 @@
     "id": 43,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 31 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -355,7 +355,7 @@
     "id": 44,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 32 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -363,7 +363,7 @@
     "id": 45,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 33 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -371,7 +371,7 @@
     "id": 46,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 34 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -379,7 +379,7 @@
     "id": 47,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 35 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -387,7 +387,7 @@
     "id": 48,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 36 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -395,7 +395,7 @@
     "id": 49,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 37 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -403,7 +403,7 @@
     "id": 50,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 38 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -411,7 +411,7 @@
     "id": 51,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 39 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -419,7 +419,7 @@
     "id": 52,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 40 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -427,7 +427,7 @@
     "id": 53,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 41 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -435,7 +435,7 @@
     "id": 54,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 42 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -443,7 +443,7 @@
     "id": 55,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 43 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -451,7 +451,7 @@
     "id": 56,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 44 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -459,7 +459,7 @@
     "id": 57,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 45 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -467,7 +467,7 @@
     "id": 58,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 46 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -475,7 +475,7 @@
     "id": 59,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 47 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -483,7 +483,7 @@
     "id": 60,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 48 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -491,7 +491,7 @@
     "id": 61,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 49 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -499,7 +499,7 @@
     "id": 62,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 50 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -507,7 +507,7 @@
     "id": 63,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 51 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -515,7 +515,7 @@
     "id": 64,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 52 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -523,7 +523,7 @@
     "id": 65,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 53 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -531,7 +531,7 @@
     "id": 66,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 54 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -539,7 +539,7 @@
     "id": 67,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 55 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -547,7 +547,7 @@
     "id": 68,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 56 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -555,7 +555,7 @@
     "id": 69,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 57 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -563,7 +563,7 @@
     "id": 70,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 58 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -571,7 +571,7 @@
     "id": 71,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 59 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -579,7 +579,7 @@
     "id": 72,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 60 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -587,7 +587,7 @@
     "id": 73,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 61 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -595,7 +595,7 @@
     "id": 74,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 62 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -603,7 +603,7 @@
     "id": 75,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 63 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -679,4 +679,4 @@
     "scale": "Scales::boolScale",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/ParallelDetune.type.json b/presets/json/ParallelDetune.type.json
index 8210a110..3382ddb5 100644
--- a/presets/json/ParallelDetune.type.json
+++ b/presets/json/ParallelDetune.type.json
@@ -499,7 +499,7 @@
     "id": 62,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 0 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -507,7 +507,7 @@
     "id": 63,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 1 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -515,7 +515,7 @@
     "id": 64,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 2 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -523,7 +523,7 @@
     "id": 65,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 3 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -531,7 +531,7 @@
     "id": 66,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 4 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -539,7 +539,7 @@
     "id": 67,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 5 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -547,7 +547,7 @@
     "id": 68,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 6 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -555,7 +555,7 @@
     "id": 69,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 7 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -563,7 +563,7 @@
     "id": 70,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 8 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -571,7 +571,7 @@
     "id": 71,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 9 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -579,7 +579,7 @@
     "id": 72,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 10 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -587,7 +587,7 @@
     "id": 73,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 11 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -595,7 +595,7 @@
     "id": 74,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 12 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -603,7 +603,7 @@
     "id": 75,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 13 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -611,7 +611,7 @@
     "id": 76,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 14 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -619,7 +619,7 @@
     "id": 77,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 15 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -627,7 +627,7 @@
     "id": 78,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 16 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -635,7 +635,7 @@
     "id": 79,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 17 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -643,7 +643,7 @@
     "id": 80,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 18 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -651,7 +651,7 @@
     "id": 81,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 19 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -659,7 +659,7 @@
     "id": 82,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 20 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -667,7 +667,7 @@
     "id": 83,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 21 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -675,7 +675,7 @@
     "id": 84,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 22 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -683,7 +683,7 @@
     "id": 85,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 23 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -691,7 +691,7 @@
     "id": 86,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 24 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -699,7 +699,7 @@
     "id": 87,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 25 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -707,7 +707,7 @@
     "id": 88,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 26 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -715,7 +715,7 @@
     "id": 89,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 27 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -723,7 +723,7 @@
     "id": 90,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 28 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -731,7 +731,7 @@
     "id": 91,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 29 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -739,7 +739,7 @@
     "id": 92,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 30 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -747,7 +747,7 @@
     "id": 93,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 31 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -755,7 +755,7 @@
     "id": 94,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 32 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -763,7 +763,7 @@
     "id": 95,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 33 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -771,7 +771,7 @@
     "id": 96,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 34 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -779,7 +779,7 @@
     "id": 97,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 35 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -787,7 +787,7 @@
     "id": 98,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 36 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -795,7 +795,7 @@
     "id": 99,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 37 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -803,7 +803,7 @@
     "id": 100,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 38 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -811,7 +811,7 @@
     "id": 101,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 39 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -819,7 +819,7 @@
     "id": 102,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 40 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -827,7 +827,7 @@
     "id": 103,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 41 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -835,7 +835,7 @@
     "id": 104,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 42 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -843,7 +843,7 @@
     "id": 105,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 43 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -851,7 +851,7 @@
     "id": 106,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 44 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -859,7 +859,7 @@
     "id": 107,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 45 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -867,7 +867,7 @@
     "id": 108,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 46 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -875,7 +875,7 @@
     "id": 109,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 47 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -883,7 +883,7 @@
     "id": 110,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 48 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -891,7 +891,7 @@
     "id": 111,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 49 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -899,7 +899,7 @@
     "id": 112,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 50 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -907,7 +907,7 @@
     "id": 113,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 51 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -915,7 +915,7 @@
     "id": 114,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 52 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -923,7 +923,7 @@
     "id": 115,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 53 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -931,7 +931,7 @@
     "id": 116,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 54 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -939,7 +939,7 @@
     "id": 117,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 55 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -947,7 +947,7 @@
     "id": 118,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 56 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -955,7 +955,7 @@
     "id": 119,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 57 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -963,7 +963,7 @@
     "id": 120,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 58 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -971,7 +971,7 @@
     "id": 121,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 59 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -979,7 +979,7 @@
     "id": 122,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 60 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -987,7 +987,7 @@
     "id": 123,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 61 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -995,7 +995,7 @@
     "id": 124,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 62 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -1003,7 +1003,7 @@
     "id": 125,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::bipolarScale.invmap(sin(SomeDSP::twopi * 63 / double(nLfoWavetable)))",
+    "default": "Scales::bipolarScale.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLfoWavetable)))",
     "scale": "Scales::bipolarScale",
     "flags": "Info::kCanAutomate"
   },
@@ -1071,4 +1071,4 @@
     "scale": "Scales::parameterSmoothingSecond",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]
diff --git a/presets/json/PitchShiftDelay.type.json b/presets/json/PitchShiftDelay.type.json
index 1eefb045..255a8647 100644
--- a/presets/json/PitchShiftDelay.type.json
+++ b/presets/json/PitchShiftDelay.type.json
@@ -11,7 +11,7 @@
     "id": 1,
     "name": "lfoWavetable0",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 0 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 0 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -19,7 +19,7 @@
     "id": 2,
     "name": "lfoWavetable1",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 1 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 1 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -27,7 +27,7 @@
     "id": 3,
     "name": "lfoWavetable2",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 2 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 2 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -35,7 +35,7 @@
     "id": 4,
     "name": "lfoWavetable3",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 3 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 3 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -43,7 +43,7 @@
     "id": 5,
     "name": "lfoWavetable4",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 4 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 4 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -51,7 +51,7 @@
     "id": 6,
     "name": "lfoWavetable5",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 5 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 5 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -59,7 +59,7 @@
     "id": 7,
     "name": "lfoWavetable6",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 6 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 6 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -67,7 +67,7 @@
     "id": 8,
     "name": "lfoWavetable7",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 7 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 7 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -75,7 +75,7 @@
     "id": 9,
     "name": "lfoWavetable8",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 8 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 8 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -83,7 +83,7 @@
     "id": 10,
     "name": "lfoWavetable9",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 9 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 9 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -91,7 +91,7 @@
     "id": 11,
     "name": "lfoWavetable10",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 10 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 10 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -99,7 +99,7 @@
     "id": 12,
     "name": "lfoWavetable11",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 11 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 11 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -107,7 +107,7 @@
     "id": 13,
     "name": "lfoWavetable12",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 12 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 12 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -115,7 +115,7 @@
     "id": 14,
     "name": "lfoWavetable13",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 13 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 13 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -123,7 +123,7 @@
     "id": 15,
     "name": "lfoWavetable14",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 14 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 14 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -131,7 +131,7 @@
     "id": 16,
     "name": "lfoWavetable15",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 15 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 15 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -139,7 +139,7 @@
     "id": 17,
     "name": "lfoWavetable16",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 16 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 16 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -147,7 +147,7 @@
     "id": 18,
     "name": "lfoWavetable17",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 17 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 17 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -155,7 +155,7 @@
     "id": 19,
     "name": "lfoWavetable18",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 18 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 18 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -163,7 +163,7 @@
     "id": 20,
     "name": "lfoWavetable19",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 19 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 19 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -171,7 +171,7 @@
     "id": 21,
     "name": "lfoWavetable20",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 20 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 20 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -179,7 +179,7 @@
     "id": 22,
     "name": "lfoWavetable21",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 21 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 21 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -187,7 +187,7 @@
     "id": 23,
     "name": "lfoWavetable22",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 22 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 22 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -195,7 +195,7 @@
     "id": 24,
     "name": "lfoWavetable23",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 23 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 23 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -203,7 +203,7 @@
     "id": 25,
     "name": "lfoWavetable24",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 24 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 24 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -211,7 +211,7 @@
     "id": 26,
     "name": "lfoWavetable25",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 25 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 25 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -219,7 +219,7 @@
     "id": 27,
     "name": "lfoWavetable26",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 26 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 26 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -227,7 +227,7 @@
     "id": 28,
     "name": "lfoWavetable27",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 27 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 27 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -235,7 +235,7 @@
     "id": 29,
     "name": "lfoWavetable28",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 28 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 28 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -243,7 +243,7 @@
     "id": 30,
     "name": "lfoWavetable29",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 29 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 29 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -251,7 +251,7 @@
     "id": 31,
     "name": "lfoWavetable30",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 30 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 30 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -259,7 +259,7 @@
     "id": 32,
     "name": "lfoWavetable31",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 31 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 31 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -267,7 +267,7 @@
     "id": 33,
     "name": "lfoWavetable32",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 32 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 32 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -275,7 +275,7 @@
     "id": 34,
     "name": "lfoWavetable33",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 33 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 33 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -283,7 +283,7 @@
     "id": 35,
     "name": "lfoWavetable34",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 34 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 34 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -291,7 +291,7 @@
     "id": 36,
     "name": "lfoWavetable35",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 35 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 35 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -299,7 +299,7 @@
     "id": 37,
     "name": "lfoWavetable36",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 36 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 36 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -307,7 +307,7 @@
     "id": 38,
     "name": "lfoWavetable37",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 37 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 37 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -315,7 +315,7 @@
     "id": 39,
     "name": "lfoWavetable38",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 38 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 38 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -323,7 +323,7 @@
     "id": 40,
     "name": "lfoWavetable39",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 39 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 39 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -331,7 +331,7 @@
     "id": 41,
     "name": "lfoWavetable40",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 40 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 40 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -339,7 +339,7 @@
     "id": 42,
     "name": "lfoWavetable41",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 41 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 41 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -347,7 +347,7 @@
     "id": 43,
     "name": "lfoWavetable42",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 42 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 42 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -355,7 +355,7 @@
     "id": 44,
     "name": "lfoWavetable43",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 43 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 43 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -363,7 +363,7 @@
     "id": 45,
     "name": "lfoWavetable44",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 44 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 44 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -371,7 +371,7 @@
     "id": 46,
     "name": "lfoWavetable45",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 45 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 45 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -379,7 +379,7 @@
     "id": 47,
     "name": "lfoWavetable46",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 46 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 46 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -387,7 +387,7 @@
     "id": 48,
     "name": "lfoWavetable47",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 47 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 47 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -395,7 +395,7 @@
     "id": 49,
     "name": "lfoWavetable48",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 48 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 48 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -403,7 +403,7 @@
     "id": 50,
     "name": "lfoWavetable49",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 49 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 49 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -411,7 +411,7 @@
     "id": 51,
     "name": "lfoWavetable50",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 50 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 50 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -419,7 +419,7 @@
     "id": 52,
     "name": "lfoWavetable51",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 51 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 51 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -427,7 +427,7 @@
     "id": 53,
     "name": "lfoWavetable52",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 52 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 52 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -435,7 +435,7 @@
     "id": 54,
     "name": "lfoWavetable53",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 53 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 53 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -443,7 +443,7 @@
     "id": 55,
     "name": "lfoWavetable54",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 54 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 54 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -451,7 +451,7 @@
     "id": 56,
     "name": "lfoWavetable55",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 55 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 55 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -459,7 +459,7 @@
     "id": 57,
     "name": "lfoWavetable56",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 56 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 56 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -467,7 +467,7 @@
     "id": 58,
     "name": "lfoWavetable57",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 57 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 57 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -475,7 +475,7 @@
     "id": 59,
     "name": "lfoWavetable58",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 58 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 58 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -483,7 +483,7 @@
     "id": 60,
     "name": "lfoWavetable59",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 59 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 59 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -491,7 +491,7 @@
     "id": 61,
     "name": "lfoWavetable60",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 60 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 60 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -499,7 +499,7 @@
     "id": 62,
     "name": "lfoWavetable61",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 61 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 61 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -507,7 +507,7 @@
     "id": 63,
     "name": "lfoWavetable62",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 62 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 62 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -515,7 +515,7 @@
     "id": 64,
     "name": "lfoWavetable63",
     "type": "d",
-    "default": "Scales::lfoWavetable.invmap(sin(SomeDSP::twopi * 63 / double(nLfoWavetable)))",
+    "default": "Scales::lfoWavetable.invmap(std::sin(double(2) * std::numbers::pi_v<double> * 63 / double(nLfoWavetable)))",
     "scale": "Scales::lfoWavetable",
     "flags": "Info::kCanAutomate"
   },
@@ -719,4 +719,4 @@
     "scale": "Scales::smoothingTime",
     "flags": "Info::kCanAutomate"
   }
-]
\ No newline at end of file
+]