diff --git a/configure b/configure
index d8b47fd920..81818c563e 100755
--- a/configure
+++ b/configure
@@ -960,7 +960,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1117,7 +1116,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1370,15 +1368,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1516,7 +1505,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1669,7 +1658,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index bfbc1fad8b..4466f394dc 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -323,11 +323,32 @@
       </li>
 <li class="listitem">
 	<p>
-	  Query logic has been substantially refactored (e.g. query_find
-	  function has been split into smaller functions) for improved
-	  readability, maintainability and testability. [RT #43929]
 	</p>
       </li>
+<li class="listitem">
+	<p>
+	  Several areas of code have been refactored for improved
+	  readability, maintainability, and testability:
+	</p>
+	<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem">
+	    <p>
+	      The <span class="command"><strong>named</strong></span> query logic implemented in
+	      <span class="command"><strong>query_find()</strong></span> has been split into
+	      smaller functions with a context structure to maintain state
+	      between them, and extensive comments have been added.
+	      [RT #43929]
+	    </p>
+	  </li>
+<li class="listitem">
+	    <p>
+	      Similarly the iterative query logic implemented in
+	      <span class="command"><strong>resquery_response()</strong></span> function has been
+	      split into smaller functions and comments added. [RT #45362]
+	    </p>
+	  </li>
+</ul></div>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>dnstap</strong></span> logfiles can now be configured to
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 4f209923c9..bd6874963e 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -284,11 +284,32 @@
       </li>
 <li class="listitem">
 	<p>
-	  Query logic has been substantially refactored (e.g. query_find
-	  function has been split into smaller functions) for improved
-	  readability, maintainability and testability. [RT #43929]
 	</p>
       </li>
+<li class="listitem">
+	<p>
+	  Several areas of code have been refactored for improved
+	  readability, maintainability, and testability:
+	</p>
+	<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem">
+	    <p>
+	      The <span class="command"><strong>named</strong></span> query logic implemented in
+	      <span class="command"><strong>query_find()</strong></span> has been split into
+	      smaller functions with a context structure to maintain state
+	      between them, and extensive comments have been added.
+	      [RT #43929]
+	    </p>
+	  </li>
+<li class="listitem">
+	    <p>
+	      Similarly the iterative query logic implemented in
+	      <span class="command"><strong>resquery_response()</strong></span> function has been
+	      split into smaller functions and comments added. [RT #45362]
+	    </p>
+	  </li>
+</ul></div>
+      </li>
 <li class="listitem">
 	<p>
 	  <span class="command"><strong>dnstap</strong></span> logfiles can now be configured to