diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index 4c169ca1c..24092b9f6 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -529,7 +529,7 @@ private:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
    override;
 
    Result Release
@@ -619,7 +619,7 @@ protected:
    }
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override
    {
       (void)pProject;// Compiler food
@@ -771,7 +771,7 @@ private:
    }
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
    override;
 
    Result Release
@@ -1494,7 +1494,7 @@ void AdornedRulerPanel::HandleQPDrag(wxMouseEvent &/*event*/, wxCoord mousePosX)
 }
 
 auto AdornedRulerPanel::ScrubbingHandle::Preview
-(const TrackPanelMouseState &state, const AudacityProject *pProject)
+(const TrackPanelMouseState &state, AudacityProject *pProject)
 -> HitTestPreview
 {
    (void)state;// Compiler food
@@ -1510,7 +1510,7 @@ auto AdornedRulerPanel::ScrubbingHandle::Preview
 }
 
 auto AdornedRulerPanel::QPHandle::Preview
-(const TrackPanelMouseState &state, const AudacityProject *pProject)
+(const TrackPanelMouseState &state, AudacityProject *pProject)
 -> HitTestPreview
 {
    TranslatableString tooltip;
diff --git a/src/TrackPanelResizeHandle.cpp b/src/TrackPanelResizeHandle.cpp
index 18d27fc62..8e94cb1b9 100644
--- a/src/TrackPanelResizeHandle.cpp
+++ b/src/TrackPanelResizeHandle.cpp
@@ -237,7 +237,7 @@ UIHandle::Result TrackPanelResizeHandle::Drag
 }
 
 HitTestPreview TrackPanelResizeHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
    return HitPreview(mMode == IsResizingBetweenLinkedTracks);
 }
diff --git a/src/TrackPanelResizeHandle.h b/src/TrackPanelResizeHandle.h
index 223b6f63c..131d2f3ae 100644
--- a/src/TrackPanelResizeHandle.h
+++ b/src/TrackPanelResizeHandle.h
@@ -37,7 +37,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state,  const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/UIHandle.h b/src/UIHandle.h
index d4822d338..f39006ed2 100644
--- a/src/UIHandle.h
+++ b/src/UIHandle.h
@@ -85,7 +85,7 @@ public:
    // or called after Drag().
    // Specifies cursor and status bar message.
    virtual HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject) = 0;
+      (const TrackPanelMouseState &state, AudacityProject *pProject) = 0;
 
    // Assume previously Clicked and not yet Released or Cancelled.
    // event.pCell may be other than for Click; may be NULL, and rect empty.
diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
index b914ea9a7..d3ae3d387 100644
--- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
@@ -363,7 +363,7 @@ UIHandle::Result LabelGlyphHandle::Drag
 }
 
 HitTestPreview LabelGlyphHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
    return HitPreview( (mpHit->mEdge & 4 )!=0);
 }
diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h
index 11fbc86ae..cc7621d18 100644
--- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h
+++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h
@@ -72,7 +72,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp
index 63100d14a..f177f62ea 100644
--- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp
@@ -288,7 +288,7 @@ UIHandle::Result LabelTextHandle::Drag
 }
 
 HitTestPreview LabelTextHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
    return HitPreview();
 }
diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h
index dbd6a1de5..80928ca14 100644
--- a/src/tracks/labeltrack/ui/LabelTextHandle.h
+++ b/src/tracks/labeltrack/ui/LabelTextHandle.h
@@ -47,7 +47,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
index 70897dc74..90d093415 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
@@ -81,7 +81,7 @@ UIHandle::Result NoteTrackButtonHandle::Drag
 }
 
 HitTestPreview NoteTrackButtonHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
    // auto pTrack = pProject->GetTracks()->Lock(mpTrack);
    auto pTrack = mpTrack.lock();
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
index a0ffcd187..c92a4ae33 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
@@ -55,7 +55,7 @@ protected:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
index e9e08b056..14d6130d8 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
@@ -135,7 +135,7 @@ UIHandle::Result NoteTrackVZoomHandle::Drag
 }
 
 HitTestPreview NoteTrackVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
    return HitPreview(st.state);
 }
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
index e28b9aca7..301e1566d 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
@@ -45,7 +45,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp b/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
index ce55b36af..53254a629 100644
--- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
@@ -206,7 +206,7 @@ UIHandle::Result StretchHandle::Drag
 }
 
 HitTestPreview StretchHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
    const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
    return HitPreview( mStretchState.mMode, unsafe );
diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h
index 1592e5039..f022b079c 100644
--- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h
+++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h
@@ -75,7 +75,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
index 15e530fc0..09535250b 100644
--- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
@@ -206,7 +206,7 @@ UIHandle::Result CutlineHandle::Drag
 }
 
 HitTestPreview CutlineHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
    const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
    auto bCutline = (mLocation.typ == WaveTrackLocation::locationCutLine);
diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
index 6325cf319..2affdf444 100644
--- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
@@ -52,7 +52,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
index de70e2a8c..50e704b12 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
@@ -401,7 +401,7 @@ UIHandle::Result SampleHandle::Drag
 }
 
 HitTestPreview SampleHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
    const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
    return HitPreview(st.state, pProject, unsafe);
diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
index 05e4edfe8..875082883 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
@@ -53,7 +53,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
index 0a948c199..5edfe49c6 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
@@ -56,7 +56,7 @@ UIHandle::Result SpectrumVZoomHandle::Drag
 }
 
 HitTestPreview SpectrumVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
    return WaveTrackVZoomHandle::HitPreview(st.state);
 }
diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
index d97b596a4..2f9f106be 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
@@ -45,7 +45,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
index e7e54fb1b..f8a58130c 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
@@ -371,7 +371,7 @@ public:
    }
 
    HitTestPreview Preview(
-      const TrackPanelMouseState &state, const AudacityProject * ) override
+      const TrackPanelMouseState &state, AudacityProject * ) override
    {
       static auto resizeCursor =
          ::MakeCursor(wxCURSOR_ARROW, SubViewsCursorXpm, 16, 16);
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
index 0786babf2..ffb242440 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
@@ -55,7 +55,7 @@ UIHandle::Result WaveformVZoomHandle::Drag
 }
 
 HitTestPreview WaveformVZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
    return WaveTrackVZoomHandle::HitPreview(st.state);
 }
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
index 5fd56fb59..b74238313 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
@@ -45,7 +45,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/ui/BackgroundCell.cpp b/src/tracks/ui/BackgroundCell.cpp
index b07c8000b..a6a3234ee 100644
--- a/src/tracks/ui/BackgroundCell.cpp
+++ b/src/tracks/ui/BackgroundCell.cpp
@@ -70,7 +70,7 @@ public:
    { return RefreshCode::RefreshNone; }
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &, const AudacityProject *) override
+      (const TrackPanelMouseState &, AudacityProject *) override
    { return HitPreview(); }
 
    Result Release
diff --git a/src/tracks/ui/ButtonHandle.cpp b/src/tracks/ui/ButtonHandle.cpp
index 1fb78b093..f3a56fba3 100644
--- a/src/tracks/ui/ButtonHandle.cpp
+++ b/src/tracks/ui/ButtonHandle.cpp
@@ -71,7 +71,7 @@ UIHandle::Result ButtonHandle::Drag
 }
 
 HitTestPreview ButtonHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *)
+(const TrackPanelMouseState &st, AudacityProject *)
 {
    // No special cursor
    auto message = Tip(st.state);
diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h
index 42c82295f..95420bd61 100644
--- a/src/tracks/ui/ButtonHandle.h
+++ b/src/tracks/ui/ButtonHandle.h
@@ -59,7 +59,7 @@ protected:
       final override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       final override;
 
    Result Release
diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp
index e2da9614c..bb20e27af 100644
--- a/src/tracks/ui/EnvelopeHandle.cpp
+++ b/src/tracks/ui/EnvelopeHandle.cpp
@@ -248,7 +248,7 @@ UIHandle::Result EnvelopeHandle::Drag
 }
 
 HitTestPreview EnvelopeHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
    const bool unsafe = ProjectAudioIO::Get( *pProject ).IsAudioActive();
    static auto disabledCursor =
diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h
index 609a16bf1..b9436ada1 100644
--- a/src/tracks/ui/EnvelopeHandle.h
+++ b/src/tracks/ui/EnvelopeHandle.h
@@ -64,7 +64,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp
index b4ccfe2e5..0439afb14 100644
--- a/src/tracks/ui/SelectHandle.cpp
+++ b/src/tracks/ui/SelectHandle.cpp
@@ -895,7 +895,7 @@ UIHandle::Result SelectHandle::Drag
 }
 
 HitTestPreview SelectHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
    if (!HasSnap() && !mUseSnap)
       // Moved out of snapping; revert to un-escaped state
diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h
index dc3a1c93e..fd62b263b 100644
--- a/src/tracks/ui/SelectHandle.h
+++ b/src/tracks/ui/SelectHandle.h
@@ -65,7 +65,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/ui/SliderHandle.cpp b/src/tracks/ui/SliderHandle.cpp
index acd8de088..603e6bafb 100644
--- a/src/tracks/ui/SliderHandle.cpp
+++ b/src/tracks/ui/SliderHandle.cpp
@@ -74,7 +74,7 @@ UIHandle::Result SliderHandle::Drag
 }
 
 HitTestPreview SliderHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *)
+(const TrackPanelMouseState &, AudacityProject *)
 {
    // No special message or cursor
    return {};
diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h
index 40a7ce31f..d39057201 100644
--- a/src/tracks/ui/SliderHandle.h
+++ b/src/tracks/ui/SliderHandle.h
@@ -56,7 +56,7 @@ protected:
       final override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       final override;
 
    Result Release
diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
index 368caecf0..ed830e728 100644
--- a/src/tracks/ui/TimeShiftHandle.cpp
+++ b/src/tracks/ui/TimeShiftHandle.cpp
@@ -775,7 +775,7 @@ UIHandle::Result TimeShiftHandle::Drag
 }
 
 HitTestPreview TimeShiftHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *pProject)
+(const TrackPanelMouseState &, AudacityProject *pProject)
 {
    // After all that, it still may be unsafe to drag.
    // Even if so, make an informative cursor change from default to "banned."
diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h
index 556df7121..4cf8e5088 100644
--- a/src/tracks/ui/TimeShiftHandle.h
+++ b/src/tracks/ui/TimeShiftHandle.h
@@ -93,7 +93,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp
index c0fa049bb..b39d5d421 100644
--- a/src/tracks/ui/TrackSelectHandle.cpp
+++ b/src/tracks/ui/TrackSelectHandle.cpp
@@ -142,7 +142,7 @@ UIHandle::Result TrackSelectHandle::Drag
 }
 
 HitTestPreview TrackSelectHandle::Preview
-(const TrackPanelMouseState &, const AudacityProject *project)
+(const TrackPanelMouseState &, AudacityProject *project)
 {
    const auto trackCount = TrackList::Get( *project ).Leaders().size();
    auto message = Message(trackCount);
diff --git a/src/tracks/ui/TrackSelectHandle.h b/src/tracks/ui/TrackSelectHandle.h
index 5817c792d..3b4226397 100644
--- a/src/tracks/ui/TrackSelectHandle.h
+++ b/src/tracks/ui/TrackSelectHandle.h
@@ -38,7 +38,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release
diff --git a/src/tracks/ui/ZoomHandle.cpp b/src/tracks/ui/ZoomHandle.cpp
index b1f95bee0..6b7d7e661 100644
--- a/src/tracks/ui/ZoomHandle.cpp
+++ b/src/tracks/ui/ZoomHandle.cpp
@@ -118,7 +118,7 @@ UIHandle::Result ZoomHandle::Drag
 }
 
 HitTestPreview ZoomHandle::Preview
-(const TrackPanelMouseState &st, const AudacityProject *pProject)
+(const TrackPanelMouseState &st, AudacityProject *pProject)
 {
    return HitPreview(st.state, pProject);
 }
diff --git a/src/tracks/ui/ZoomHandle.h b/src/tracks/ui/ZoomHandle.h
index e02eb5a65..fda9693c1 100644
--- a/src/tracks/ui/ZoomHandle.h
+++ b/src/tracks/ui/ZoomHandle.h
@@ -41,7 +41,7 @@ public:
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;
 
    HitTestPreview Preview
-      (const TrackPanelMouseState &state, const AudacityProject *pProject)
+      (const TrackPanelMouseState &state, AudacityProject *pProject)
       override;
 
    Result Release