diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 37c8507dc7..db152f3e08 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -237,10 +237,8 @@
 
 STATIC_ASSERT(NS_PROCESSING_LIMIT > NS_RR_LIMIT,
 	      "The maximum number of NS RRs processed for each "
-	      "delegation "
-	      "(NS_PROCESSING_LIMIT) must be larger than the large "
-	      "delegation "
-	      "threshold (NS_RR_LIMIT).");
+	      "delegation (NS_PROCESSING_LIMIT) must be larger than the large "
+	      "delegation threshold (NS_RR_LIMIT).");
 
 /* Hash table for zone counters */
 #ifndef RES_DOMAIN_HASH_BITS
@@ -7319,8 +7317,7 @@ rctx_cookiecheck(respctx_t *rctx) {
 					    sizeof(addrbuf));
 			isc_log_write(DNS_LOGCATEGORY_RESOLVER,
 				      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
-				      "missing expected cookie "
-				      "from %s",
+				      "missing expected cookie from %s",
 				      addrbuf);
 		}
 		rctx->retryopts |= DNS_FETCHOPT_TCP;
@@ -7354,8 +7351,7 @@ rctx_cookiecheck(respctx_t *rctx) {
 					    sizeof(addrbuf));
 			isc_log_write(DNS_LOGCATEGORY_RESOLVER,
 				      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
-				      "missing required "
-				      "cookie from %s",
+				      "missing required cookie from %s",
 				      addrbuf);
 		}
 
@@ -8699,11 +8695,10 @@ rctx_authority_negative(respctx_t *rctx) {
 					if (rctx->ns_name != NULL &&
 					    name != rctx->ns_name)
 					{
-						log_formerr(fctx, "multiple NS "
-								  "RRsets "
-								  "in "
-								  "authority "
-								  "section");
+						log_formerr(
+							fctx,
+							"multiple NS RRsets in "
+							"authority section");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}
@@ -8724,11 +8719,10 @@ rctx_authority_negative(respctx_t *rctx) {
 					if (rctx->soa_name != NULL &&
 					    name != rctx->soa_name)
 					{
-						log_formerr(fctx, "multiple "
-								  "SOA RRs "
-								  "in "
-								  "authority "
-								  "section");
+						log_formerr(
+							fctx,
+							"multiple SOA RRs in "
+							"authority section");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}
@@ -8817,8 +8811,8 @@ rctx_authority_dnssec(respctx_t *rctx) {
 				 * one DS RRset.
 				 */
 				if (rctx->ns_name == NULL) {
-					log_formerr(fctx, "DS with no "
-							  "referral");
+					log_formerr(fctx,
+						    "DS with no referral");
 					rctx->result = DNS_R_FORMERR;
 					return ISC_R_COMPLETE;
 				}
@@ -8827,10 +8821,9 @@ rctx_authority_dnssec(respctx_t *rctx) {
 					if (rctx->ds_name != NULL &&
 					    name != rctx->ds_name)
 					{
-						log_formerr(fctx, "DS doesn't "
-								  "match "
-								  "referral "
-								  "(NS)");
+						log_formerr(fctx,
+							    "DS doesn't match "
+							    "referral (NS)");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}