diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index ae58de452d6..66aca583c85 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -3351,7 +3351,7 @@ pg_class_aclmask_ext(Oid table_oid, Oid roleid, AclMode mask,
 				mask &= ~(ACL_INSERT | ACL_UPDATE | ACL_USAGE);
 			}
 			else if (IsSystemClass(table_oid, classForm) &&
-				classForm->relkind != RELKIND_VIEW)
+					 classForm->relkind != RELKIND_VIEW)
 			{
 				/*
 				 * Deny anyone permission to update a system catalog unless
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index 493c969b3be..56b87d878e8 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -3523,8 +3523,9 @@ LookupCreationNamespace(const char *nspname)
 /*
  * Common checks on switching namespaces.
  *
- * We complain if either the old or new namespaces is a temporary schema,
- * temporary toast schema, the TOAST schema, or the conflict schema.
+ * We complain if either the old or new namespaces is a temporary schema
+ * (or temporary toast schema), or if either the old or new namespaces is the
+ * TOAST schema.
  */
 void
 CheckSetNamespace(Oid oldNspOid, Oid nspOid)