diff --git a/src/hb-algs.hh b/src/hb-algs.hh
index 7f5e4d8ff..6e6217b4b 100644
--- a/src/hb-algs.hh
+++ b/src/hb-algs.hh
@@ -171,9 +171,9 @@ auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN
   template <typename _T> \
   auto operator () (_T&& _v) const HB_AUTO_RETURN \
   (hb_partial<Pos> ( \
-		    /* The following ugly line is a hack hacky replacement for "this". */ \
+		    /* The following ugly line is a hacky replacement for "this". */ \
 		    /* https://github.com/harfbuzz/harfbuzz/issues/1730 */ \
-		    const_cast<const hb_decay<decltype (*this)> *> (this), \
+		    &*this, \
 		    hb_forward<_T> (_v))) \
   static_assert (true, "")