diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 2ef124a3b..3a89425c1 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -61,10 +61,10 @@ inline Type& Cast(TObject &X)
  * location of X plus Ofs bytes. */
 template<typename Type, typename TObject>
 inline const Type& StructAtOffset(const TObject &X, unsigned int offset)
-{ return * reinterpret_cast<const Type*> (CharP (&X) + offset); }
+{ return * reinterpret_cast<const Type*> (CharP(&X) + offset); }
 template<typename Type, typename TObject>
 inline Type& StructAtOffset(TObject &X, unsigned int offset)
-{ return * reinterpret_cast<Type*> (CharP (&X) + offset); }
+{ return * reinterpret_cast<Type*> (CharP(&X) + offset); }
 
 /* StructAfter<T>(X) returns the struct T& that is placed after X.
  * Works with X of variable size also.  X must implement get_size() */
@@ -144,7 +144,7 @@ ASSERT_STATIC (sizeof (Type) + 1 <= sizeof (_Null##Type))
 	HB_STMT_START { \
 	    if (sanitize_depth < HB_DEBUG_SANITIZE) \
 		fprintf (stderr, "SANITIZE(%p) %-*d-> %s\n", \
-			 (CharP (this) == CharP (&NullPool)) ? 0 : this, \
+			 (CharP(this) == CharP(&NullPool)) ? 0 : this, \
 			 sanitize_depth, sanitize_depth, \
 			 __PRETTY_FUNCTION__); \
 	} HB_STMT_END
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index aceb3b6b0..74d9b042b 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -44,7 +44,7 @@
 	HB_STMT_START { \
 	    if (apply_depth < HB_DEBUG_APPLY) \
 		fprintf (stderr, "APPLY(%p) %-*d-> %s\n", \
-			 (CharP (this) == CharP (&NullPool)) ? 0 : this, \
+			 (CharP(this) == CharP(&NullPool)) ? 0 : this, \
 			 apply_depth, apply_depth, \
 			 __PRETTY_FUNCTION__); \
 	} HB_STMT_END