diff --git a/src/hb-face.cc b/src/hb-face.cc
index 952e6a6a9..da73433cb 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -96,7 +96,7 @@ DEFINE_NULL_INSTANCE (hb_face_t) =
 #undef HB_SHAPER_IMPLEMENT
   },
 
-  HB_ATOMIC_PTR_INIT (nullptr), /* shape_plans */
+  /* Zero for the rest is fine. */
 };
 
 
diff --git a/src/hb-face.hh b/src/hb-face.hh
index 726f68837..5d22f4ada 100644
--- a/src/hb-face.hh
+++ b/src/hb-face.hh
@@ -54,7 +54,7 @@ struct hb_face_t
 
   struct hb_shaper_data_t shaper_data;	/* Various shaper data. */
 
-  hb_ot_face_t table;
+  hb_ot_face_t table;			/* All the face's tables. */
 
   /* Cache */
   struct plan_node_t