diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index 8852f87ba..e64415d69 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -5848,8 +5848,9 @@ transform_info_imp(transform_display *dp, png_structp pp, png_infop pi)
    /* If png_set_filler is in action then fake the output color type to include
     * an alpha channel where appropriate.
     */
-   if (dp->output_bit_depth >= 8 && (dp->output_colour_type == PNG_COLOR_TYPE_RGB ||
-       dp->output_colour_type == PNG_COLOR_TYPE_GRAY) && dp->this.filler)
+   if (dp->output_bit_depth >= 8 &&
+       (dp->output_colour_type == PNG_COLOR_TYPE_RGB ||
+        dp->output_colour_type == PNG_COLOR_TYPE_GRAY) && dp->this.filler)
        dp->output_colour_type |= 4;
 
    /* Validate the combination of colour type and bit depth that we are getting
diff --git a/pngerror.c b/pngerror.c
index 8f84bfa9d..43e26ebbc 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1151,7 +1151,7 @@ PNG_FUNCTION(void, png_affirm,(png_const_structrp png_ptr,
 }
 
 #ifdef PNG_RANGE_CHECK_SUPPORTED
-/* The character/byte checking APIs. These do their own calls to png_assert
+/* The character/byte checking APIs. These do their own calls to png_affirm
  * because the caller provides the position.
  */
 char /* PRIVATE */
diff --git a/pngpriv.h b/pngpriv.h
index 125917683..8e35c7130 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -911,7 +911,7 @@ extern "C" {
  *
  * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
  */
-/* Assert handling */
+/* Affirm handling */
 PNG_INTERNAL_FUNCTION(void, png_affirm,(png_const_structrp png_ptr,
     param_deb(png_const_charp condition) unsigned int position), PNG_NORETURN);