diff --git a/srec_cat/arglex3.h b/srec_cat/arglex3.h
index 0be69592..943f2ab4 100644
--- a/srec_cat/arglex3.h
+++ b/srec_cat/arglex3.h
@@ -65,7 +65,7 @@ class srec_cat_arglex3:
     srec_cat_arglex3(const srec_cat_arglex3 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     srec_cat_arglex3 &operator=(const srec_cat_arglex3 &) = delete;
 
diff --git a/srecord/arglex.h b/srecord/arglex.h
index b06863b8..7b9a10c8 100644
--- a/srecord/arglex.h
+++ b/srecord/arglex.h
@@ -391,4 +391,4 @@ class arglex
 
 };
 
-#endif // LIB_ARGLEX_H
\ No newline at end of file
+#endif // LIB_ARGLEX_H
diff --git a/srecord/arglex/tool.h b/srecord/arglex/tool.h
index 2b4ab929..5094dd9b 100644
--- a/srecord/arglex/tool.h
+++ b/srecord/arglex/tool.h
@@ -464,17 +464,17 @@ class arglex_tool:
     defcon_t contradictory_bytes;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     arglex_tool() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     arglex_tool(const arglex_tool &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     arglex_tool &operator=(const arglex_tool &) = delete;
 
diff --git a/srecord/arglex/tool/get_interval.cc b/srecord/arglex/tool/get_interval.cc
index 83334fb3..5adb92eb 100644
--- a/srecord/arglex/tool/get_interval.cc
+++ b/srecord/arglex/tool/get_interval.cc
@@ -47,6 +47,22 @@ srecord::arglex_tool::get_interval_factor(const char *name)
             return retval;
         }
 
+    case token_within:
+        {
+            token_next();
+            srecord::input::pointer ifp = get_input();
+            interval result = srecord::input_interval(ifp);
+            return result;
+        }
+
+    case token_over:
+        {
+            token_next();
+            srecord::input::pointer ifp = get_input();
+            interval result = srecord::input_interval(ifp);
+            return result.flatten();
+        }
+
     default:
         {
             if (!can_get_number())
@@ -78,22 +94,6 @@ srecord::arglex_tool::get_interval_factor(const char *name)
             interval result(n1, n2);
             return result;
         }
-
-    case token_within:
-        {
-            token_next();
-            srecord::input::pointer ifp = get_input();
-            interval result = srecord::input_interval(ifp);
-            return result;
-        }
-
-    case token_over:
-        {
-            token_next();
-            srecord::input::pointer ifp = get_input();
-            interval result = srecord::input_interval(ifp);
-            return result.flatten();
-        }
     }
 }
 
diff --git a/srecord/arglex/tool/input.cc b/srecord/arglex/tool/input.cc
index 90d45930..b71b1861 100644
--- a/srecord/arglex/tool/input.cc
+++ b/srecord/arglex/tool/input.cc
@@ -207,7 +207,7 @@ srecord::arglex_tool::get_simple_input()
     case token_paren_begin:
         {
             token_next();
-            input::pointer ifp = get_input();
+            input::pointer ifp_local = get_input();
             for (;;)
             {
                 switch (token_cur())
@@ -216,12 +216,12 @@ srecord::arglex_tool::get_simple_input()
                 case arglex_tool::token_string:
                 case arglex_tool::token_stdio:
                 case arglex_tool::token_generator:
-                    ifp = input_catenate::create(ifp, get_input());
+                    ifp_local = input_catenate::create(ifp_local, get_input());
                     break;
 
                 case token_paren_end:
                     token_next();
-                    return ifp;
+                    return ifp_local;
 
                 default:
                     fatal_error
@@ -238,7 +238,6 @@ srecord::arglex_tool::get_simple_input()
         token_next();
         ifp = input_generator::create(this);
         return ifp;
-        break;
 
     case token_string:
         fn = value_string();
@@ -270,9 +269,6 @@ srecord::arglex_tool::get_simple_input()
     {
     case token_motorola:
         token_next();
-        // fall through...
-
-    default:
         ifp = input_file_motorola::create(fn);
         break;
 
@@ -484,7 +480,6 @@ srecord::arglex_tool::get_simple_input()
         ifp = input_file_wilson::create(fn);
         break;
     }
-    // assert(ifp);
 
     //
     // Process any additional format-specific command line options.
diff --git a/srecord/input.h b/srecord/input.h
index f22f6b98..57069b1d 100644
--- a/srecord/input.h
+++ b/srecord/input.h
@@ -168,12 +168,12 @@ class input
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input(const input &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input &operator=(const input &) = delete;
 };
diff --git a/srecord/input/catenate.h b/srecord/input/catenate.h
index 5f349fd3..51c3e77a 100644
--- a/srecord/input/catenate.h
+++ b/srecord/input/catenate.h
@@ -91,17 +91,17 @@ class input_catenate:
     pointer in2;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_catenate() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_catenate(const input_catenate &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_catenate &operator=(const input_catenate &) = delete;
 };
diff --git a/srecord/input/file.h b/srecord/input/file.h
index a84aa0c9..3e4957d4 100644
--- a/srecord/input/file.h
+++ b/srecord/input/file.h
@@ -320,17 +320,17 @@ class input_file:
     void *get_fp();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file(const input_file &) = delete;
 
     /**
-      * the assignment operator.  Do not use.
+      * the assignment operator.
       */
     input_file &operator=(const input_file &) = delete;
 };
diff --git a/srecord/input/file/aomf.cc b/srecord/input/file/aomf.cc
index db8456e6..b7701ee4 100644
--- a/srecord/input/file/aomf.cc
+++ b/srecord/input/file/aomf.cc
@@ -121,7 +121,7 @@ srecord::input_file_aomf::~input_file_aomf()
 
 srecord::input_file_aomf::input_file_aomf(const std::string &a_filename) :
     srecord::input_file(a_filename)
-    
+
 {
 }
 
diff --git a/srecord/input/file/aomf.h b/srecord/input/file/aomf.h
index 2f987f36..29b2084c 100644
--- a/srecord/input/file/aomf.h
+++ b/srecord/input/file/aomf.h
@@ -134,12 +134,12 @@ class input_file_aomf:
     int slurp();
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_aomf(const input_file_aomf &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_aomf &operator=(const input_file_aomf &) = delete;
 };
diff --git a/srecord/input/file/ascii_hex.h b/srecord/input/file/ascii_hex.h
index d727d43b..4d467c8d 100644
--- a/srecord/input/file/ascii_hex.h
+++ b/srecord/input/file/ascii_hex.h
@@ -97,17 +97,17 @@ class input_file_ascii_hex:
     enum { state_initial, state_body, state_ignore } state;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ascii_hex() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ascii_hex(const input_file_ascii_hex &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ascii_hex &operator=(const input_file_ascii_hex &) = delete;
 };
diff --git a/srecord/input/file/atmel_generic.h b/srecord/input/file/atmel_generic.h
index df1ba57e..8e5dbc64 100644
--- a/srecord/input/file/atmel_generic.h
+++ b/srecord/input/file/atmel_generic.h
@@ -102,19 +102,20 @@ class input_file_atmel_generic:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_atmel_generic() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_atmel_generic(const input_file_atmel_generic &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_file_atmel_generic &operator=(const input_file_atmel_generic &) = delete;
+    input_file_atmel_generic &operator=(
+        const input_file_atmel_generic &) = delete;
 };
 
 };
diff --git a/srecord/input/file/binary.h b/srecord/input/file/binary.h
index cbc755c6..b35db591 100644
--- a/srecord/input/file/binary.h
+++ b/srecord/input/file/binary.h
@@ -76,17 +76,17 @@ class input_file_binary:
     bool is_binary() const override;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_binary() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_binary(const input_file_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_binary &operator=(const input_file_binary &) = delete;
 };
diff --git a/srecord/input/file/brecord.h b/srecord/input/file/brecord.h
index ad6ac4c4..30b65d0f 100644
--- a/srecord/input/file/brecord.h
+++ b/srecord/input/file/brecord.h
@@ -79,17 +79,17 @@ class input_file_brecord:
     bool seen_some_input;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_brecord() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_brecord(const input_file_brecord &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_brecord &operator=(const input_file_brecord &) = delete;
 };
diff --git a/srecord/input/file/cosmac.h b/srecord/input/file/cosmac.h
index 7a283de7..24b638c8 100644
--- a/srecord/input/file/cosmac.h
+++ b/srecord/input/file/cosmac.h
@@ -92,17 +92,17 @@ class input_file_cosmac:
     bool seen_some_input;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_cosmac() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_cosmac(const input_file_cosmac &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_cosmac &operator=(const input_file_cosmac &) = delete;
 };
diff --git a/srecord/input/file/dec_binary.cc b/srecord/input/file/dec_binary.cc
index 04d3b659..36992167 100644
--- a/srecord/input/file/dec_binary.cc
+++ b/srecord/input/file/dec_binary.cc
@@ -24,7 +24,7 @@
 srecord::input_file_dec_binary::input_file_dec_binary(
         const std::string &a_file_name) :
     srecord::input_file(a_file_name)
-    
+
 {
 }
 
diff --git a/srecord/input/file/dec_binary.h b/srecord/input/file/dec_binary.h
index b9e32993..5fdd07fb 100644
--- a/srecord/input/file/dec_binary.h
+++ b/srecord/input/file/dec_binary.h
@@ -110,12 +110,12 @@ class input_file_dec_binary:
     unsigned long current_address{0};
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_dec_binary(const input_file_dec_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_dec_binary &operator=(const input_file_dec_binary &) = delete;
 };
diff --git a/srecord/input/file/emon52.h b/srecord/input/file/emon52.h
index 808c3371..176421d2 100644
--- a/srecord/input/file/emon52.h
+++ b/srecord/input/file/emon52.h
@@ -75,17 +75,17 @@ class input_file_emon52:
     void skip_white_space();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_emon52() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_emon52(const input_file_emon52 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_emon52 &operator=(const input_file_emon52 &) = delete;
 };
diff --git a/srecord/input/file/fairchild.h b/srecord/input/file/fairchild.h
index 6fe3037e..7cc5737e 100644
--- a/srecord/input/file/fairchild.h
+++ b/srecord/input/file/fairchild.h
@@ -99,12 +99,12 @@ class input_file_fairchild:
     bool file_contains_data;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_fairchild() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_fairchild(const input_file_fairchild &) = delete;
 
diff --git a/srecord/input/file/fastload.h b/srecord/input/file/fastload.h
index 6f1c3526..5f5658a6 100644
--- a/srecord/input/file/fastload.h
+++ b/srecord/input/file/fastload.h
@@ -106,17 +106,17 @@ class input_file_fastload:
     void expect_white_space();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_fastload() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_fastload(const input_file_fastload &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_fastload &operator=(const input_file_fastload &) = delete;
 };
diff --git a/srecord/input/file/formatted_binary.h b/srecord/input/file/formatted_binary.h
index ba184e17..d3958470 100644
--- a/srecord/input/file/formatted_binary.h
+++ b/srecord/input/file/formatted_binary.h
@@ -112,7 +112,8 @@ class input_file_formatted_binary:
     /**
       * The assignment operator.
       */
-    input_file_formatted_binary &operator=(const input_file_formatted_binary &) = delete;
+    input_file_formatted_binary &operator=(
+        const input_file_formatted_binary &) = delete;
 };
 
 };
diff --git a/srecord/input/file/four_packed_code.h b/srecord/input/file/four_packed_code.h
index c0c1153b..df7b26ea 100644
--- a/srecord/input/file/four_packed_code.h
+++ b/srecord/input/file/four_packed_code.h
@@ -127,19 +127,20 @@ class input_file_four_packed_code:
     unsigned long running_address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_four_packed_code() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_four_packed_code(const input_file_four_packed_code &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_file_four_packed_code &operator=(const input_file_four_packed_code &) = delete;
+    input_file_four_packed_code &operator=(
+        const input_file_four_packed_code &) = delete;
 };
 
 };
diff --git a/srecord/input/file/hexdump.h b/srecord/input/file/hexdump.h
index 40b20bd2..1b4976f1 100644
--- a/srecord/input/file/hexdump.h
+++ b/srecord/input/file/hexdump.h
@@ -109,17 +109,17 @@ class input_file_hexdump:
     unsigned current_token_value{};
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_hexdump() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_hexdump(const input_file_hexdump &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_hexdump &operator=(const input_file_hexdump &) = delete;
 };
diff --git a/srecord/input/file/hp64k.h b/srecord/input/file/hp64k.h
index afaecc93..2de8b9aa 100644
--- a/srecord/input/file/hp64k.h
+++ b/srecord/input/file/hp64k.h
@@ -96,17 +96,17 @@ class input_file_hp64k:
     enum { need_hdr, need_pir, data } state;
 
     /**
-     * The default constructor.  Do not use.
+     * The default constructor.
      */
     input_file_hp64k() = delete;
 
     /**
-     * The copy constructor.  Do not use.
+     * The copy constructor.
      */
     input_file_hp64k(const input_file_hp64k &) = delete;
 
     /**
-     * The assignment operator.  Do not use.
+     * The assignment operator.
      */
     input_file_hp64k &operator=(const input_file_hp64k &) = delete;
 };
diff --git a/srecord/input/file/idt.h b/srecord/input/file/idt.h
index 0d7e12c3..96bcaebe 100644
--- a/srecord/input/file/idt.h
+++ b/srecord/input/file/idt.h
@@ -94,17 +94,17 @@ class input_file_idt:
     void record_format_error();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_idt() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_idt(const input_file_idt &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_idt &operator=(const input_file_idt &) = delete;
 };
diff --git a/srecord/input/file/intel.h b/srecord/input/file/intel.h
index da15eb52..82013e2a 100644
--- a/srecord/input/file/intel.h
+++ b/srecord/input/file/intel.h
@@ -129,17 +129,17 @@ class input_file_intel:
     bool end_seen;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_intel() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_intel(const input_file_intel &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_intel &operator=(const input_file_intel &) = delete;
 };
diff --git a/srecord/input/file/intel16.h b/srecord/input/file/intel16.h
index 81211208..19814341 100644
--- a/srecord/input/file/intel16.h
+++ b/srecord/input/file/intel16.h
@@ -123,17 +123,17 @@ class input_file_intel16:
     bool end_seen;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_intel16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_intel16(const input_file_intel16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_intel16 &operator=(const input_file_intel16 &) = delete;
 };
diff --git a/srecord/input/file/mif.h b/srecord/input/file/mif.h
index c0152729..36618642 100644
--- a/srecord/input/file/mif.h
+++ b/srecord/input/file/mif.h
@@ -174,17 +174,17 @@ class input_file_mif:
     unsigned width_in_bytes;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_mif() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_mif(const input_file_mif &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_mif &operator=(const input_file_mif &) = delete;
 };
diff --git a/srecord/input/file/mips_flash.h b/srecord/input/file/mips_flash.h
index 1b13c44e..16755d45 100644
--- a/srecord/input/file/mips_flash.h
+++ b/srecord/input/file/mips_flash.h
@@ -145,17 +145,17 @@ class input_file_mips_flash:
     bool seen_reset;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_mips_flash() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_mips_flash(const input_file_mips_flash &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_mips_flash &operator=(const input_file_mips_flash &) = delete;
 };
diff --git a/srecord/input/file/mos_tech.h b/srecord/input/file/mos_tech.h
index a31f0d1d..499140e5 100644
--- a/srecord/input/file/mos_tech.h
+++ b/srecord/input/file/mos_tech.h
@@ -92,17 +92,17 @@ class input_file_mos_tech:
     int data_record_count;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_mos_tech() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_mos_tech(const input_file_mos_tech &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_mos_tech &operator=(const input_file_mos_tech &) = delete;
 };
diff --git a/srecord/input/file/motorola.h b/srecord/input/file/motorola.h
index 35a40061..ef50ef34 100644
--- a/srecord/input/file/motorola.h
+++ b/srecord/input/file/motorola.h
@@ -120,17 +120,17 @@ class input_file_motorola:
     unsigned address_shift;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_motorola() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_motorola(const input_file_motorola &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_motorola &operator=(const input_file_motorola &) = delete;
 };
diff --git a/srecord/input/file/msbin.h b/srecord/input/file/msbin.h
index b2f01ef7..a8544698 100644
--- a/srecord/input/file/msbin.h
+++ b/srecord/input/file/msbin.h
@@ -185,17 +185,17 @@ class input_file_msbin:
     bool is_binary() const override;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_msbin() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_msbin(const input_file_msbin &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_msbin &operator=(const input_file_msbin &) = delete;
 };
diff --git a/srecord/input/file/needham.h b/srecord/input/file/needham.h
index 7b9dfba6..eb3d4f43 100644
--- a/srecord/input/file/needham.h
+++ b/srecord/input/file/needham.h
@@ -72,17 +72,17 @@ class input_file_needham:
     unsigned long address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_needham() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_needham(const input_file_needham &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_needham &operator=(const input_file_needham &) = delete;
 };
diff --git a/srecord/input/file/os65v.h b/srecord/input/file/os65v.h
index 5a02193c..8d228348 100644
--- a/srecord/input/file/os65v.h
+++ b/srecord/input/file/os65v.h
@@ -68,17 +68,17 @@ class input_file_os65v:
     input_file_os65v(const std::string &file_name);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_os65v() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_os65v(const input_file_os65v &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_os65v &operator=(const input_file_os65v &) = delete;
 
diff --git a/srecord/input/file/ppb.cc b/srecord/input/file/ppb.cc
index 54dcd363..352d4a78 100644
--- a/srecord/input/file/ppb.cc
+++ b/srecord/input/file/ppb.cc
@@ -25,8 +25,6 @@
 
 srecord::input_file_ppb::input_file_ppb(const std::string &filename) :
     input_file(filename),
-    address(0),
-    data_seen(false),
     packet_address(-1UL),
     packet_length(0),
     packet_used(0)
diff --git a/srecord/input/file/ppb.h b/srecord/input/file/ppb.h
index 6da9d74c..9c692f6b 100644
--- a/srecord/input/file/ppb.h
+++ b/srecord/input/file/ppb.h
@@ -68,21 +68,6 @@ class input_file_ppb:
       */
     input_file_ppb(const std::string &filename);
 
-    /**
-      * The address instance variable is used to remember the current
-      * address of the next data record.  This is set and advanced by
-      * the #read method.
-      */
-    record::address_t address;
-
-    /**
-      * The data_seen instance variable is used to remember whether or
-      * not any data has been seen in the file.  This is used to issue
-      * an error when there is apparently no data in the file, and this
-      * helps #guess to figure out the file is not of this type.
-      */
-    bool data_seen;
-
     /**
       * The packet_address instance variable is used to remember the
       * address of the first byte in the most recently read packet.
@@ -121,17 +106,17 @@ class input_file_ppb:
     void packet_format_error();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ppb() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ppb(const input_file_ppb &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ppb &operator=(const input_file_ppb &) = delete;
 };
diff --git a/srecord/input/file/ppx.h b/srecord/input/file/ppx.h
index e231aac0..77e5ea76 100644
--- a/srecord/input/file/ppx.h
+++ b/srecord/input/file/ppx.h
@@ -144,17 +144,17 @@ class input_file_ppx:
     size_t buffer_length;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ppx() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ppx(const input_file_ppx &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ppx &operator=(const input_file_ppx &) = delete;
 };
diff --git a/srecord/input/file/signetics.h b/srecord/input/file/signetics.h
index d2ca73ac..9a9c3548 100644
--- a/srecord/input/file/signetics.h
+++ b/srecord/input/file/signetics.h
@@ -74,17 +74,17 @@ class input_file_signetics:
     input_file_signetics(const std::string &file_name);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_signetics() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_signetics(const input_file_signetics &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_signetics &operator=(const input_file_signetics &) = delete;
 
diff --git a/srecord/input/file/spasm.h b/srecord/input/file/spasm.h
index 1fa69c3d..1614f10a 100644
--- a/srecord/input/file/spasm.h
+++ b/srecord/input/file/spasm.h
@@ -102,17 +102,17 @@ class input_file_spasm:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_spasm() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_spasm(const input_file_spasm &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_spasm &operator=(const input_file_spasm &) = delete;
 };
diff --git a/srecord/input/file/spectrum.h b/srecord/input/file/spectrum.h
index 54d1f905..f5cdf7d7 100644
--- a/srecord/input/file/spectrum.h
+++ b/srecord/input/file/spectrum.h
@@ -97,17 +97,17 @@ class input_file_spectrum:
     int get_binary();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_spectrum() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_spectrum(const input_file_spectrum &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_spectrum &operator=(const input_file_spectrum &) = delete;
 };
diff --git a/srecord/input/file/stewie.h b/srecord/input/file/stewie.h
index 91b0cfc8..9c9186b4 100644
--- a/srecord/input/file/stewie.h
+++ b/srecord/input/file/stewie.h
@@ -110,17 +110,17 @@ class input_file_stewie:
     bool termination_seen;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_stewie() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_stewie(const input_file_stewie &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_stewie &operator=(const input_file_stewie &) = delete;
 };
diff --git a/srecord/input/file/tektronix.h b/srecord/input/file/tektronix.h
index 7ed8474c..a90efa79 100644
--- a/srecord/input/file/tektronix.h
+++ b/srecord/input/file/tektronix.h
@@ -111,17 +111,17 @@ class input_file_tektronix:
     bool termination_seen;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_tektronix() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_tektronix(const input_file_tektronix &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_tektronix &operator=(const input_file_tektronix &) = delete;
 };
diff --git a/srecord/input/file/tektronix_extended.h b/srecord/input/file/tektronix_extended.h
index 0e141bd4..ad11b55c 100644
--- a/srecord/input/file/tektronix_extended.h
+++ b/srecord/input/file/tektronix_extended.h
@@ -97,12 +97,6 @@ class input_file_tektronix_extended:
       */
     bool seen_some_input;
 
-    /**
-      * The header_seen instance variable is used to remember whether
-      * the header record has been seen yet.
-      */
-    bool header_seen{};
-
     /**
       * The termination_seen instance variable is used to remember
       * whether the termination record has been seen yet.
@@ -116,19 +110,21 @@ class input_file_tektronix_extended:
     unsigned char nibble_sum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_tektronix_extended() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_file_tektronix_extended(const input_file_tektronix_extended &) = delete;
+    input_file_tektronix_extended(
+        const input_file_tektronix_extended &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_file_tektronix_extended &operator=(const input_file_tektronix_extended &) = delete;
+    input_file_tektronix_extended &operator=(
+        const input_file_tektronix_extended &) = delete;
 };
 
 };
diff --git a/srecord/input/file/ti_tagged.h b/srecord/input/file/ti_tagged.h
index 79ec441e..2acb09fe 100644
--- a/srecord/input/file/ti_tagged.h
+++ b/srecord/input/file/ti_tagged.h
@@ -94,17 +94,17 @@ class input_file_ti_tagged:
     int csum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ti_tagged() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ti_tagged(const input_file_ti_tagged &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ti_tagged &operator=(const input_file_ti_tagged &) = delete;
 };
diff --git a/srecord/input/file/ti_tagged_16.h b/srecord/input/file/ti_tagged_16.h
index 1e2ab2d8..4bf1de8d 100644
--- a/srecord/input/file/ti_tagged_16.h
+++ b/srecord/input/file/ti_tagged_16.h
@@ -94,19 +94,20 @@ class input_file_ti_tagged_16:
     int csum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ti_tagged_16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ti_tagged_16(const input_file_ti_tagged_16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_file_ti_tagged_16 &operator=(const input_file_ti_tagged_16 &) = delete;
+    input_file_ti_tagged_16 &operator=(
+        const input_file_ti_tagged_16 &) = delete;
 };
 
 };
diff --git a/srecord/input/file/ti_txt.h b/srecord/input/file/ti_txt.h
index 3d453c65..9bff6311 100644
--- a/srecord/input/file/ti_txt.h
+++ b/srecord/input/file/ti_txt.h
@@ -66,12 +66,6 @@ class input_file_ti_txt:
       */
     input_file_ti_txt(const std::string &file_name);
 
-    /**
-      * The garbage_warning instance variable is used to remember whether
-      * a warning has already been issued if the file contains garbage.
-      */
-    bool garbage_warning{};
-
     /**
       * The seen_some_input instance variable is used to remember whether
       * any data has been seen in the input to date.
@@ -122,17 +116,17 @@ class input_file_ti_txt:
     void get_next_token();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ti_txt() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ti_txt(const input_file_ti_txt &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ti_txt &operator=(const input_file_ti_txt &) = delete;
 };
diff --git a/srecord/input/file/trs80.cc b/srecord/input/file/trs80.cc
index c9919f1d..7bfda345 100644
--- a/srecord/input/file/trs80.cc
+++ b/srecord/input/file/trs80.cc
@@ -38,7 +38,7 @@ srecord::input_file_trs80::input_file_trs80(
     const std::string &a_file_name
 ) :
     srecord::input_file(a_file_name)
-    
+
 {
 }
 
diff --git a/srecord/input/file/trs80.h b/srecord/input/file/trs80.h
index be571a6e..3c4e14af 100644
--- a/srecord/input/file/trs80.h
+++ b/srecord/input/file/trs80.h
@@ -100,12 +100,12 @@ class input_file_trs80:
     record *pending{0};
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_trs80(const input_file_trs80 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_trs80 &operator=(const input_file_trs80 &) = delete;
 };
diff --git a/srecord/input/file/vmem.h b/srecord/input/file/vmem.h
index 476fcaea..ad951f0b 100644
--- a/srecord/input/file/vmem.h
+++ b/srecord/input/file/vmem.h
@@ -79,17 +79,17 @@ class input_file_vmem:
     unsigned long address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_vmem() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_vmem(const input_file_vmem &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_vmem &operator=(const input_file_vmem &) = delete;
 };
diff --git a/srecord/input/file/wilson.h b/srecord/input/file/wilson.h
index 47a898da..4e612811 100644
--- a/srecord/input/file/wilson.h
+++ b/srecord/input/file/wilson.h
@@ -103,17 +103,17 @@ class input_file_wilson:
     bool termination_seen;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_wilson() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_wilson(const input_file_wilson &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_wilson &operator=(const input_file_wilson &) = delete;
 
diff --git a/srecord/input/filter.h b/srecord/input/filter.h
index 3c09ccf4..8f744290 100644
--- a/srecord/input/filter.h
+++ b/srecord/input/filter.h
@@ -74,17 +74,17 @@ class input_filter:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter(const input_filter &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter &operator=(const input_filter &) = delete;
 };
diff --git a/srecord/input/filter/and.h b/srecord/input/filter/and.h
index 4198236d..ed10f910 100644
--- a/srecord/input/filter/and.h
+++ b/srecord/input/filter/and.h
@@ -73,17 +73,17 @@ class input_filter_and:
     int value;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_and() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_and(const input_filter_and &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_and &operator=(const input_filter_and &) = delete;
 };
diff --git a/srecord/input/filter/bitrev.h b/srecord/input/filter/bitrev.h
index 9499e793..b15b7289 100644
--- a/srecord/input/filter/bitrev.h
+++ b/srecord/input/filter/bitrev.h
@@ -61,17 +61,17 @@ class input_filter_bitrev:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_bitrev() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_bitrev(const input_filter_bitrev &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_bitrev &operator=(const input_filter_bitrev &) = delete;
 };
diff --git a/srecord/input/filter/byte_swap.cc b/srecord/input/filter/byte_swap.cc
index 24d67b3d..d24a0b87 100644
--- a/srecord/input/filter/byte_swap.cc
+++ b/srecord/input/filter/byte_swap.cc
@@ -25,7 +25,7 @@
 srecord::input_filter_byte_swap::input_filter_byte_swap(
         const srecord::input::pointer &arg) :
     srecord::input_filter(arg),
-    
+
     buffer_pos(0),
     mask(1)
 {
diff --git a/srecord/input/filter/byte_swap.h b/srecord/input/filter/byte_swap.h
index 8ec2c9ea..591d1d2e 100644
--- a/srecord/input/filter/byte_swap.h
+++ b/srecord/input/filter/byte_swap.h
@@ -85,17 +85,17 @@ class input_filter_byte_swap:
     record::address_t mask;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_byte_swap() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_byte_swap(const input_filter_byte_swap &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_byte_swap &operator=(const input_filter_byte_swap &) = delete;
 };
diff --git a/srecord/input/filter/checksum.h b/srecord/input/filter/checksum.h
index ddde1d75..4f967140 100644
--- a/srecord/input/filter/checksum.h
+++ b/srecord/input/filter/checksum.h
@@ -119,17 +119,17 @@ class input_filter_checksum:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_checksum() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_checksum(const input_filter_checksum &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_checksum &operator=(const input_filter_checksum &) = delete;
 };
diff --git a/srecord/input/filter/checksum/bitnot.h b/srecord/input/filter/checksum/bitnot.h
index 63353367..b39bd51b 100644
--- a/srecord/input/filter/checksum/bitnot.h
+++ b/srecord/input/filter/checksum/bitnot.h
@@ -87,19 +87,20 @@ class input_filter_checksum_bitnot:
 private:
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_checksum_bitnot() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_checksum_bitnot(const input_filter_checksum_bitnot &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_checksum_bitnot &operator=(const input_filter_checksum_bitnot &) = delete;
+    input_filter_checksum_bitnot &operator=(
+        const input_filter_checksum_bitnot &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/checksum/negative.h b/srecord/input/filter/checksum/negative.h
index 9522cd0c..5768f4cd 100644
--- a/srecord/input/filter/checksum/negative.h
+++ b/srecord/input/filter/checksum/negative.h
@@ -86,19 +86,21 @@ class input_filter_checksum_negative:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_checksum_negative() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_checksum_negative(const input_filter_checksum_negative &) = delete;
+    input_filter_checksum_negative(\
+        const input_filter_checksum_negative &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_checksum_negative &operator=(const input_filter_checksum_negative &) = delete;
+    input_filter_checksum_negative &operator=(
+        const input_filter_checksum_negative &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/checksum/positive.h b/srecord/input/filter/checksum/positive.h
index 14ed8547..3e38ab53 100644
--- a/srecord/input/filter/checksum/positive.h
+++ b/srecord/input/filter/checksum/positive.h
@@ -86,19 +86,21 @@ class input_filter_checksum_positive:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_checksum_positive() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_checksum_positive(const input_filter_checksum_positive &) = delete;
+    input_filter_checksum_positive(
+        const input_filter_checksum_positive &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_checksum_positive &operator=(const input_filter_checksum_positive &) = delete;
+    input_filter_checksum_positive &operator=(
+        const input_filter_checksum_positive &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/crop.cc b/srecord/input/filter/crop.cc
index 1b520c57..53002d47 100644
--- a/srecord/input/filter/crop.cc
+++ b/srecord/input/filter/crop.cc
@@ -26,7 +26,7 @@ srecord::input_filter_crop::input_filter_crop(
         const srecord::input::pointer &a_deeper, const interval &a_range) :
     srecord::input_filter(a_deeper),
     range(a_range)
-    
+
 {
 }
 
diff --git a/srecord/input/filter/crop.h b/srecord/input/filter/crop.h
index 3f59c46e..53b915da 100644
--- a/srecord/input/filter/crop.h
+++ b/srecord/input/filter/crop.h
@@ -88,17 +88,17 @@ class input_filter_crop:
     interval data_range;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_crop() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_crop(const input_filter_crop &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_crop &operator=(const input_filter_crop &) = delete;
 };
diff --git a/srecord/input/filter/fill.h b/srecord/input/filter/fill.h
index 16cf2416..ea7edfa8 100644
--- a/srecord/input/filter/fill.h
+++ b/srecord/input/filter/fill.h
@@ -99,17 +99,17 @@ class input_filter_fill:
     bool generate(record &record);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_fill() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_fill(const input_filter_fill &) = delete;
 
     /**
-      * The assignment.  Do not use.
+      * The assignment.
       */
     input_filter_fill &operator=(const input_filter_fill &) = delete;
 };
diff --git a/srecord/input/filter/interval.h b/srecord/input/filter/interval.h
index 204d1be8..6d46cb8c 100644
--- a/srecord/input/filter/interval.h
+++ b/srecord/input/filter/interval.h
@@ -111,17 +111,17 @@ class input_filter_interval:
     bool generate(record &record);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_interval() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_interval(const input_filter_interval &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_interval &operator=(const input_filter_interval &) = delete;
 };
diff --git a/srecord/input/filter/interval/maximum.h b/srecord/input/filter/interval/maximum.h
index 553aa949..6cd0885a 100644
--- a/srecord/input/filter/interval/maximum.h
+++ b/srecord/input/filter/interval/maximum.h
@@ -83,17 +83,18 @@ class input_filter_interval_maximum:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_interval_maximum() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_interval_maximum(const input_filter_interval_maximum &) = delete;
+    input_filter_interval_maximum(
+        const input_filter_interval_maximum &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_interval_maximum &operator=(
         const input_filter_interval_maximum &) = delete;
diff --git a/srecord/input/filter/interval/minimum.h b/srecord/input/filter/interval/minimum.h
index 7ad51652..9a61827d 100644
--- a/srecord/input/filter/interval/minimum.h
+++ b/srecord/input/filter/interval/minimum.h
@@ -82,19 +82,21 @@ class input_filter_interval_minimum:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_interval_minimum() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_interval_minimum(const input_filter_interval_minimum &) = delete;
+    input_filter_interval_minimum(
+        const input_filter_interval_minimum &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_interval_minimum &operator=(const input_filter_interval_minimum &) = delete;
+    input_filter_interval_minimum &operator=(
+        const input_filter_interval_minimum &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message.h b/srecord/input/filter/message.h
index 70f3b648..856843bd 100644
--- a/srecord/input/filter/message.h
+++ b/srecord/input/filter/message.h
@@ -122,17 +122,17 @@ class input_filter_message:
     bool have_forwarded_start_address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_message(const input_filter_message &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_message &operator=(const input_filter_message &) = delete;
 };
diff --git a/srecord/input/filter/message/adler16.h b/srecord/input/filter/message/adler16.h
index b4c5b1bc..76cdd3a6 100644
--- a/srecord/input/filter/message/adler16.h
+++ b/srecord/input/filter/message/adler16.h
@@ -90,19 +90,20 @@ class input_filter_message_adler16:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_adler16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_message_adler16(const input_filter_message_adler16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_adler16 &operator=(const input_filter_message_adler16 &) = delete;
+    input_filter_message_adler16 &operator=(
+        const input_filter_message_adler16 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/adler32.h b/srecord/input/filter/message/adler32.h
index 6703e8fe..5c8649a5 100644
--- a/srecord/input/filter/message/adler32.h
+++ b/srecord/input/filter/message/adler32.h
@@ -90,19 +90,21 @@ class input_filter_message_adler32:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_adler32() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_message_adler32(const input_filter_message_adler32 &) = delete;
+    input_filter_message_adler32(
+        const input_filter_message_adler32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_adler32 &operator=(const input_filter_message_adler32 &) = delete;
+    input_filter_message_adler32 &operator=(
+        const input_filter_message_adler32 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/crc16.h b/srecord/input/filter/message/crc16.h
index cf57dfc0..4e7146cf 100644
--- a/srecord/input/filter/message/crc16.h
+++ b/srecord/input/filter/message/crc16.h
@@ -114,19 +114,21 @@ class input_filter_message_crc16:
     crc16::bit_direction_t bitdir;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_crc16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_message_crc16(const input_filter_message_crc16 &) = delete;
+    input_filter_message_crc16(
+        const input_filter_message_crc16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_crc16 &operator=(const input_filter_message_crc16 &) = delete;
+    input_filter_message_crc16 &operator=(
+        const input_filter_message_crc16 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/crc32.h b/srecord/input/filter/message/crc32.h
index 9923451f..0f9f7fca 100644
--- a/srecord/input/filter/message/crc32.h
+++ b/srecord/input/filter/message/crc32.h
@@ -100,19 +100,21 @@ class input_filter_message_crc32:
     crc32::seed_mode_t seed_mode;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_crc32() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_message_crc32(const input_filter_message_crc32 &) = delete;
+    input_filter_message_crc32(
+        const input_filter_message_crc32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_crc32 &operator=(const input_filter_message_crc32 &) = delete;
+    input_filter_message_crc32 &operator=(
+        const input_filter_message_crc32 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/fletcher16.h b/srecord/input/filter/message/fletcher16.h
index 63729588..c219fd58 100644
--- a/srecord/input/filter/message/fletcher16.h
+++ b/srecord/input/filter/message/fletcher16.h
@@ -99,19 +99,21 @@ class input_filter_message_fletcher16:
     int answer;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_fletcher16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_message_fletcher16(const input_filter_message_fletcher16 &) = delete;
+    input_filter_message_fletcher16(
+        const input_filter_message_fletcher16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_fletcher16 &operator=(const input_filter_message_fletcher16 &) = delete;
+    input_filter_message_fletcher16 &operator=(
+        const input_filter_message_fletcher16 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/fletcher32.h b/srecord/input/filter/message/fletcher32.h
index b86fd4bd..6610284b 100644
--- a/srecord/input/filter/message/fletcher32.h
+++ b/srecord/input/filter/message/fletcher32.h
@@ -90,19 +90,21 @@ class input_filter_message_fletcher32:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_fletcher32() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    input_filter_message_fletcher32(const input_filter_message_fletcher32 &) = delete;
+    input_filter_message_fletcher32(
+        const input_filter_message_fletcher32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_fletcher32 &operator=(const input_filter_message_fletcher32 &) = delete;
+    input_filter_message_fletcher32 &operator=(
+        const input_filter_message_fletcher32 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/gcrypt.h b/srecord/input/filter/message/gcrypt.h
index ef970cff..f26163e7 100644
--- a/srecord/input/filter/message/gcrypt.h
+++ b/srecord/input/filter/message/gcrypt.h
@@ -319,19 +319,20 @@ class input_filter_message_gcrypt:
     unsigned long address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_gcrypt() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_message_gcrypt(const input_filter_message_gcrypt &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_gcrypt &operator=(const input_filter_message_gcrypt &) = delete;
+    input_filter_message_gcrypt &operator=(
+        const input_filter_message_gcrypt &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/message/stm32.h b/srecord/input/filter/message/stm32.h
index d9672269..3e6dd6f2 100644
--- a/srecord/input/filter/message/stm32.h
+++ b/srecord/input/filter/message/stm32.h
@@ -105,19 +105,20 @@ class input_filter_message_stm32:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_message_stm32() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_message_stm32(const input_filter_message_stm32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_message_stm32 &operator=(const input_filter_message_stm32 &) = delete;
+    input_filter_message_stm32 &operator=(
+        const input_filter_message_stm32 &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/not.h b/srecord/input/filter/not.h
index cad03f17..d7e45613 100644
--- a/srecord/input/filter/not.h
+++ b/srecord/input/filter/not.h
@@ -63,17 +63,17 @@ class input_filter_not:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_not() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_not(const input_filter_not &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_not &operator=(const input_filter_not &) = delete;
 };
diff --git a/srecord/input/filter/offset.h b/srecord/input/filter/offset.h
index 44b3a806..b751db56 100644
--- a/srecord/input/filter/offset.h
+++ b/srecord/input/filter/offset.h
@@ -76,17 +76,17 @@ class input_filter_offset:
     long nbytes;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_offset() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_offset(const input_filter_offset &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_offset &operator=(const input_filter_offset &) = delete;
 };
diff --git a/srecord/input/filter/or.h b/srecord/input/filter/or.h
index a830761e..8b7ad9cd 100644
--- a/srecord/input/filter/or.h
+++ b/srecord/input/filter/or.h
@@ -74,17 +74,17 @@ class input_filter_or:
     int value;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_or() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_or(const input_filter_or &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_or &operator=(const input_filter_or &) = delete;
 };
diff --git a/srecord/input/filter/random_fill.h b/srecord/input/filter/random_fill.h
index ee2a41ad..61c586c7 100644
--- a/srecord/input/filter/random_fill.h
+++ b/srecord/input/filter/random_fill.h
@@ -82,19 +82,20 @@ class input_filter_random_fill:
     bool generate(record &record);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_random_fill() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_random_fill(const input_filter_random_fill &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_filter_random_fill &operator=(const input_filter_random_fill &) = delete;
+    input_filter_random_fill &operator=(
+        const input_filter_random_fill &) = delete;
 };
 
 };
diff --git a/srecord/input/filter/sequence.h b/srecord/input/filter/sequence.h
index fb8dfc4a..46ab5775 100644
--- a/srecord/input/filter/sequence.h
+++ b/srecord/input/filter/sequence.h
@@ -77,17 +77,17 @@ class input_filter_sequence:
     bool warned;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_sequence() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_sequence(const input_filter_sequence &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_sequence &operator=(const input_filter_sequence &) = delete;
 };
diff --git a/srecord/input/filter/split.cc b/srecord/input/filter/split.cc
index bec08857..c6354c51 100644
--- a/srecord/input/filter/split.cc
+++ b/srecord/input/filter/split.cc
@@ -27,7 +27,7 @@ srecord::input_filter_split::input_filter_split(const input::pointer &a1,
     modulus(a2),
     offset(a2 - a3),
     width(a4),
-    
+
     buffer_pos(0)
 {
     //
diff --git a/srecord/input/filter/split.h b/srecord/input/filter/split.h
index 58e5ec97..e554c1b9 100644
--- a/srecord/input/filter/split.h
+++ b/srecord/input/filter/split.h
@@ -135,17 +135,17 @@ class input_filter_split:
     size_t buffer_pos;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_split() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_split(const input_filter_split &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_split &operator=(const input_filter_split &) = delete;
 };
diff --git a/srecord/input/filter/unfill.cc b/srecord/input/filter/unfill.cc
index 5a3609dd..6686bdbc 100644
--- a/srecord/input/filter/unfill.cc
+++ b/srecord/input/filter/unfill.cc
@@ -25,7 +25,7 @@ srecord::input_filter_unfill::input_filter_unfill(
     srecord::input_filter(a1),
     fill_value(a2),
     fill_minimum(a3),
-    
+
     buffer_pos(0)
 {
 }
diff --git a/srecord/input/filter/unfill.h b/srecord/input/filter/unfill.h
index 433b7685..96622fc6 100644
--- a/srecord/input/filter/unfill.h
+++ b/srecord/input/filter/unfill.h
@@ -105,17 +105,17 @@ class input_filter_unfill:
     size_t buffer_pos;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_unfill() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_unfill(const input_filter_unfill &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_unfill &operator=(const input_filter_unfill &) = delete;
 };
diff --git a/srecord/input/filter/unsplit.cc b/srecord/input/filter/unsplit.cc
index 242520ad..6f7f5929 100644
--- a/srecord/input/filter/unsplit.cc
+++ b/srecord/input/filter/unsplit.cc
@@ -26,7 +26,7 @@ srecord::input_filter_unsplit::input_filter_unsplit(
     modulus(a2),
     offset(a3),
     width(a4),
-    
+
     buffer_pos(0)
 {
 }
diff --git a/srecord/input/filter/unsplit.h b/srecord/input/filter/unsplit.h
index e30f0da4..a2338150 100644
--- a/srecord/input/filter/unsplit.h
+++ b/srecord/input/filter/unsplit.h
@@ -115,17 +115,17 @@ class input_filter_unsplit:
     size_t buffer_pos;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_unsplit() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_unsplit(const input_filter_unsplit &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_unsplit &operator=(const input_filter_unsplit &) = delete;
 };
diff --git a/srecord/input/filter/xor.h b/srecord/input/filter/xor.h
index dcb63c37..0558d5d3 100644
--- a/srecord/input/filter/xor.h
+++ b/srecord/input/filter/xor.h
@@ -74,17 +74,17 @@ class input_filter_xor:
     int value;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_filter_xor() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_filter_xor(const input_filter_xor &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_filter_xor &operator=(const input_filter_xor &) = delete;
 };
diff --git a/srecord/input/generator/constant.h b/srecord/input/generator/constant.h
index f7bd9697..83b69671 100644
--- a/srecord/input/generator/constant.h
+++ b/srecord/input/generator/constant.h
@@ -69,19 +69,20 @@ class input_generator_constant:
     unsigned char datum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_generator_constant() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_generator_constant(const input_generator_constant &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_generator_constant &operator=(const input_generator_constant &) = delete;
+    input_generator_constant &operator=(
+        const input_generator_constant &) = delete;
 };
 
 };
diff --git a/srecord/input/generator/random.h b/srecord/input/generator/random.h
index 9501f83f..478445d8 100644
--- a/srecord/input/generator/random.h
+++ b/srecord/input/generator/random.h
@@ -63,17 +63,17 @@ class input_generator_random:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_generator_random() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_generator_random(const input_generator_random &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_generator_random &operator=(const input_generator_random &) = delete;
 };
diff --git a/srecord/input/generator/repeat.h b/srecord/input/generator/repeat.h
index 0e346711..b1e8d32c 100644
--- a/srecord/input/generator/repeat.h
+++ b/srecord/input/generator/repeat.h
@@ -98,17 +98,17 @@ class input_generator_repeat:
     size_t length;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_generator_repeat() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_generator_repeat(const input_generator_repeat &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_generator_repeat &operator=(const input_generator_repeat &) = delete;
 };
diff --git a/srecord/memory.cc b/srecord/memory.cc
index c8dbf25f..2ddf107b 100644
--- a/srecord/memory.cc
+++ b/srecord/memory.cc
@@ -27,8 +27,8 @@
 #include <srecord/record.h>
 #include <srecord/string.h>
 
-srecord::memory::memory(const srecord::memory &rhs) 
-    
+srecord::memory::memory(const srecord::memory &rhs)
+
 {
     copy(rhs);
 }
diff --git a/srecord/memory/chunk.h b/srecord/memory/chunk.h
index 372022f8..86aa4aab 100644
--- a/srecord/memory/chunk.h
+++ b/srecord/memory/chunk.h
@@ -148,7 +148,7 @@ class memory_chunk
     unsigned char mask[(size + 7) / 8]{};
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     memory_chunk() = delete;
 };
diff --git a/srecord/memory/walker.h b/srecord/memory/walker.h
index eca05b56..9e41dc13 100644
--- a/srecord/memory/walker.h
+++ b/srecord/memory/walker.h
@@ -98,12 +98,12 @@ class memory_walker
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker(const memory_walker &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker &operator=(const memory_walker &) = delete;
 };
diff --git a/srecord/memory/walker/adler16.h b/srecord/memory/walker/adler16.h
index 137f1453..d75084aa 100644
--- a/srecord/memory/walker/adler16.h
+++ b/srecord/memory/walker/adler16.h
@@ -73,12 +73,12 @@ class memory_walker_adler16:
     adler16 checksum;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_adler16(const memory_walker_adler16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_adler16 &operator=(const memory_walker_adler16 &) = delete;
 };
diff --git a/srecord/memory/walker/adler32.h b/srecord/memory/walker/adler32.h
index 2ca4087b..8499a223 100644
--- a/srecord/memory/walker/adler32.h
+++ b/srecord/memory/walker/adler32.h
@@ -73,12 +73,12 @@ class memory_walker_adler32:
     adler32 checksum;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_adler32(const memory_walker_adler32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_adler32 &operator=(const memory_walker_adler32 &) = delete;
 };
diff --git a/srecord/memory/walker/alignment.h b/srecord/memory/walker/alignment.h
index dfc2c50a..3b85c686 100644
--- a/srecord/memory/walker/alignment.h
+++ b/srecord/memory/walker/alignment.h
@@ -94,7 +94,8 @@ class memory_walker_alignment:
     /**
       * The assignment operator.  No not use.
       */
-    memory_walker_alignment &operator=(const memory_walker_alignment &) = delete;
+    memory_walker_alignment &operator=(
+        const memory_walker_alignment &) = delete;
 };
 
 };
diff --git a/srecord/memory/walker/compare.h b/srecord/memory/walker/compare.h
index 96214b53..6d71212a 100644
--- a/srecord/memory/walker/compare.h
+++ b/srecord/memory/walker/compare.h
@@ -122,17 +122,17 @@ class memory_walker_compare:
     interval wrong;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     memory_walker_compare() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_compare(const memory_walker_compare &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_compare &operator=(const memory_walker_compare &) = delete;
 };
diff --git a/srecord/memory/walker/continuity.h b/srecord/memory/walker/continuity.h
index 291bb9cf..0f465c4b 100644
--- a/srecord/memory/walker/continuity.h
+++ b/srecord/memory/walker/continuity.h
@@ -81,7 +81,8 @@ class memory_walker_continuity:
     /**
       * The assignment operator.  No not use.
       */
-    memory_walker_continuity &operator=(const memory_walker_continuity &) = delete;
+    memory_walker_continuity &operator=(
+        const memory_walker_continuity &) = delete;
 };
 
 };
diff --git a/srecord/memory/walker/crc32.h b/srecord/memory/walker/crc32.h
index 425c56c5..89ca5b2f 100644
--- a/srecord/memory/walker/crc32.h
+++ b/srecord/memory/walker/crc32.h
@@ -79,12 +79,12 @@ class memory_walker_crc32:
     crc32 checksum;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_crc32(const memory_walker_crc32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_crc32 &operator=(const memory_walker_crc32 &) = delete;
 };
diff --git a/srecord/memory/walker/fletcher16.h b/srecord/memory/walker/fletcher16.h
index 93cd29bf..5087c253 100644
--- a/srecord/memory/walker/fletcher16.h
+++ b/srecord/memory/walker/fletcher16.h
@@ -90,7 +90,9 @@ class memory_walker_fletcher16:
 
 protected:
     // See base class for documentation.
-    void observe(unsigned long address, const void *data, int data_size) override;
+    void observe(unsigned long address,
+                 const void *data,
+                 int data_size) override;
 
 private:
     /**
@@ -100,19 +102,20 @@ class memory_walker_fletcher16:
     fletcher16 checksum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     memory_walker_fletcher16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_fletcher16(const memory_walker_fletcher16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    memory_walker_fletcher16 &operator=(const memory_walker_fletcher16 &) = delete;
+    memory_walker_fletcher16 &operator=(
+        const memory_walker_fletcher16 &) = delete;
 };
 
 };
diff --git a/srecord/memory/walker/fletcher32.h b/srecord/memory/walker/fletcher32.h
index b3b9d5ed..f4b1016f 100644
--- a/srecord/memory/walker/fletcher32.h
+++ b/srecord/memory/walker/fletcher32.h
@@ -72,14 +72,15 @@ class memory_walker_fletcher32:
     fletcher32 checksum;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_fletcher32(const memory_walker_fletcher32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    memory_walker_fletcher32 &operator=(const memory_walker_fletcher32 &) = delete;
+    memory_walker_fletcher32 &operator=(
+        const memory_walker_fletcher32 &) = delete;
 };
 
 };
diff --git a/srecord/memory/walker/gcrypt.h b/srecord/memory/walker/gcrypt.h
index fd0a8274..f4ae6f77 100644
--- a/srecord/memory/walker/gcrypt.h
+++ b/srecord/memory/walker/gcrypt.h
@@ -43,7 +43,7 @@ class memory_walker_gcrypt:
     /**
       * The destructor.
       */
-    ~memory_walker_gcrypt() override;
+    ~memory_walker_gcrypt() override = default;
 
 private:
     /**
@@ -79,17 +79,17 @@ class memory_walker_gcrypt:
     gcry_md_hd_t handle;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     memory_walker_gcrypt() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_gcrypt(const memory_walker_gcrypt &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_gcrypt &operator=(const memory_walker_gcrypt &) = delete;
 };
diff --git a/srecord/memory/walker/stm32.h b/srecord/memory/walker/stm32.h
index a5ba897d..e4039af0 100644
--- a/srecord/memory/walker/stm32.h
+++ b/srecord/memory/walker/stm32.h
@@ -84,12 +84,12 @@ class memory_walker_stm32:
     stm32 checksum;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_stm32(const memory_walker_stm32 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_stm32 &operator=(const memory_walker_stm32 &) = delete;
 };
diff --git a/srecord/memory/walker/writer.h b/srecord/memory/walker/writer.h
index c9d60047..959d2fd7 100644
--- a/srecord/memory/walker/writer.h
+++ b/srecord/memory/walker/writer.h
@@ -79,17 +79,17 @@ class memory_walker_writer:
     output::pointer op;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     memory_walker_writer() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     memory_walker_writer(const memory_walker_writer &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     memory_walker_writer &operator=(const memory_walker_writer &) = delete;
 };
diff --git a/srecord/output.h b/srecord/output.h
index 5c710dca..5f59375d 100644
--- a/srecord/output.h
+++ b/srecord/output.h
@@ -211,12 +211,12 @@ class output
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output(const output &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output &operator=(const output &) = delete;
 };
diff --git a/srecord/output/file.h b/srecord/output/file.h
index a14dbc67..b2fcc608 100644
--- a/srecord/output/file.h
+++ b/srecord/output/file.h
@@ -438,12 +438,12 @@ class output_file:
     virtual bool is_binary() const;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file(const output_file &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file &operator=(const output_file &) = delete;
 };
diff --git a/srecord/output/file/aomf.h b/srecord/output/file/aomf.h
index 367b9a41..e7693776 100644
--- a/srecord/output/file/aomf.h
+++ b/srecord/output/file/aomf.h
@@ -126,12 +126,12 @@ class output_file_aomf:
     std::string module_name;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_aomf(const output_file_aomf &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_aomf &operator=(const output_file_aomf &) = delete;
 };
diff --git a/srecord/output/file/ascii_hex.h b/srecord/output/file/ascii_hex.h
index f76234f7..2ae4741f 100644
--- a/srecord/output/file/ascii_hex.h
+++ b/srecord/output/file/ascii_hex.h
@@ -129,17 +129,17 @@ class output_file_ascii_hex:
     void emit_end_of_file();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ascii_hex() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ascii_hex(const output_file_ascii_hex &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_ascii_hex &operator=(const output_file_ascii_hex &) = delete;
 };
diff --git a/srecord/output/file/asm.h b/srecord/output/file/asm.h
index 3dbf2602..49981a71 100644
--- a/srecord/output/file/asm.h
+++ b/srecord/output/file/asm.h
@@ -183,17 +183,17 @@ class output_file_asm:
     bool hex_style;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_asm() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_asm(const output_file_asm &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_asm &operator=(const output_file_asm &) = delete;
 };
diff --git a/srecord/output/file/atmel_generic.h b/srecord/output/file/atmel_generic.h
index 71d75a16..d4570c57 100644
--- a/srecord/output/file/atmel_generic.h
+++ b/srecord/output/file/atmel_generic.h
@@ -91,19 +91,20 @@ class output_file_atmel_generic:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_atmel_generic() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_atmel_generic(const output_file_atmel_generic &) = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    output_file_atmel_generic &operator=(const output_file_atmel_generic &) = delete;
+    output_file_atmel_generic &operator=(
+        const output_file_atmel_generic &) = delete;
 };
 
 };
diff --git a/srecord/output/file/basic.h b/srecord/output/file/basic.h
index bbbfe258..d6216fd5 100644
--- a/srecord/output/file/basic.h
+++ b/srecord/output/file/basic.h
@@ -117,17 +117,17 @@ class output_file_basic:
     void emit_byte(int);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_basic() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_basic(const output_file_basic &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_basic &operator=(const output_file_basic &) = delete;
 };
diff --git a/srecord/output/file/binary.h b/srecord/output/file/binary.h
index cfd01516..003353f5 100644
--- a/srecord/output/file/binary.h
+++ b/srecord/output/file/binary.h
@@ -82,17 +82,17 @@ class output_file_binary:
 
 private:
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_binary() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_binary(const output_file_binary &) = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_binary &operator=(const output_file_binary &) = delete;
 };
diff --git a/srecord/output/file/brecord.h b/srecord/output/file/brecord.h
index 9314c5bf..1dc1b4f7 100644
--- a/srecord/output/file/brecord.h
+++ b/srecord/output/file/brecord.h
@@ -83,17 +83,17 @@ class output_file_brecord:
     unsigned block_size;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_brecord() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_brecord(const output_file_brecord &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_brecord &operator=(const output_file_brecord &) = delete;
 };
diff --git a/srecord/output/file/c.cc b/srecord/output/file/c.cc
index 673ab2f5..ee79ad1c 100644
--- a/srecord/output/file/c.cc
+++ b/srecord/output/file/c.cc
@@ -441,7 +441,7 @@ build_include_file_name(const std::string &filename)
 srecord::output_file_c::output_file_c(const std::string &a_file_name) :
     srecord::output_file(a_file_name),
     prefix("eprom"),
-    
+
     taddr(0),
     header_done(false),
     column(0),
diff --git a/srecord/output/file/c.h b/srecord/output/file/c.h
index 5bdb80e3..289eba48 100644
--- a/srecord/output/file/c.h
+++ b/srecord/output/file/c.h
@@ -216,17 +216,17 @@ class output_file_c:
     std::string format_address(unsigned long addr) const;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_c() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_c(const output_file_c &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_c &operator=(const output_file_c &) = delete;
 };
diff --git a/srecord/output/file/coe.cc b/srecord/output/file/coe.cc
index 743269ac..54fe169b 100644
--- a/srecord/output/file/coe.cc
+++ b/srecord/output/file/coe.cc
@@ -45,7 +45,6 @@ srecord::output_file_coe::~output_file_coe()
 srecord::output_file_coe::output_file_coe(const std::string &a_file_name) :
     srecord::output_file(a_file_name),
     address(0),
-    column(0),
     depth(0),
     width(8),
     width_in_bytes(1),
diff --git a/srecord/output/file/coe.h b/srecord/output/file/coe.h
index 41baead4..36708ed1 100644
--- a/srecord/output/file/coe.h
+++ b/srecord/output/file/coe.h
@@ -91,12 +91,6 @@ class output_file_coe:
       */
     unsigned long address;
 
-    /**
-      * The column instance variable is used to remember the output text
-      * column.  This is used to know when ti wrap lines.
-      */
-    int column;
-
     /**
       * The depth instance variable is used to remember how many bytes
       * of data there is.  Kind of broken, because we don't know this
@@ -149,17 +143,17 @@ class output_file_coe:
     bool got_data;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_coe() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_coe(const output_file_coe &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_coe &operator=(const output_file_coe &) = delete;
 };
diff --git a/srecord/output/file/cosmac.h b/srecord/output/file/cosmac.h
index 5baa06e4..a5bbb0db 100644
--- a/srecord/output/file/cosmac.h
+++ b/srecord/output/file/cosmac.h
@@ -110,17 +110,17 @@ class output_file_cosmac:
     bool header_required;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_cosmac() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_cosmac(const output_file_cosmac &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_cosmac &operator=(const output_file_cosmac &) = delete;
 };
diff --git a/srecord/output/file/dec_binary.h b/srecord/output/file/dec_binary.h
index 3babd8f9..aad03234 100644
--- a/srecord/output/file/dec_binary.h
+++ b/srecord/output/file/dec_binary.h
@@ -111,17 +111,17 @@ class output_file_dec_binary:
     static int preferred_block_size_calculate();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_dec_binary() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_dec_binary(const output_file_dec_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_dec_binary &operator=(const output_file_dec_binary &) = delete;
 };
diff --git a/srecord/output/file/emon52.h b/srecord/output/file/emon52.h
index df077b85..3fd091f6 100644
--- a/srecord/output/file/emon52.h
+++ b/srecord/output/file/emon52.h
@@ -95,17 +95,17 @@ class output_file_emon52:
         const void *data, int data_len);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_emon52() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_emon52(const output_file_emon52 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_emon52 &operator=(const output_file_emon52 &) = delete;
 };
diff --git a/srecord/output/file/fairchild.h b/srecord/output/file/fairchild.h
index 37a7486e..145c6810 100644
--- a/srecord/output/file/fairchild.h
+++ b/srecord/output/file/fairchild.h
@@ -99,17 +99,17 @@ class output_file_fairchild:
     unsigned long address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_fairchild() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_fairchild(const output_file_fairchild &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_fairchild &operator=(const output_file_fairchild &) = delete;
 };
diff --git a/srecord/output/file/fastload.h b/srecord/output/file/fastload.h
index 2b58a55e..97b66d29 100644
--- a/srecord/output/file/fastload.h
+++ b/srecord/output/file/fastload.h
@@ -141,17 +141,17 @@ class output_file_fastload:
     void put_command(int c, unsigned long n, int ndigits);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_fastload() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_fastload(const output_file_fastload &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_fastload &operator=(const output_file_fastload &) = delete;
 };
diff --git a/srecord/output/file/formatted_binary.h b/srecord/output/file/formatted_binary.h
index 50dd7128..a2eba044 100644
--- a/srecord/output/file/formatted_binary.h
+++ b/srecord/output/file/formatted_binary.h
@@ -103,19 +103,20 @@ class output_file_formatted_binary:
     unsigned short check_sum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_formatted_binary() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_formatted_binary(const output_file_formatted_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    output_file_formatted_binary &operator=(const output_file_formatted_binary &) = delete;
+    output_file_formatted_binary &operator=(
+        const output_file_formatted_binary &) = delete;
 };
 
 };
diff --git a/srecord/output/file/forth.h b/srecord/output/file/forth.h
index df9ddd20..3ed87f14 100644
--- a/srecord/output/file/forth.h
+++ b/srecord/output/file/forth.h
@@ -94,17 +94,17 @@ class output_file_forth:
     void emit_end_of_file();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_forth() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_forth(const output_file_forth &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_forth &operator=(const output_file_forth &) = delete;
 };
diff --git a/srecord/output/file/four_packed_code.h b/srecord/output/file/four_packed_code.h
index 99952d8a..312b9212 100644
--- a/srecord/output/file/four_packed_code.h
+++ b/srecord/output/file/four_packed_code.h
@@ -116,19 +116,20 @@ class output_file_four_packed_code:
     void put_byte(unsigned char) override;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_four_packed_code() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_four_packed_code(const output_file_four_packed_code &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    output_file_four_packed_code &operator=(const output_file_four_packed_code &) = delete;
+    output_file_four_packed_code &operator=(
+        const output_file_four_packed_code &) = delete;
 };
 
 };
diff --git a/srecord/output/file/hexdump.h b/srecord/output/file/hexdump.h
index 76ae314a..54b06c26 100644
--- a/srecord/output/file/hexdump.h
+++ b/srecord/output/file/hexdump.h
@@ -141,17 +141,17 @@ class output_file_hexdump:
     int columns_to_line_length(int cols) const;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_hexdump() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_hexdump(const output_file_hexdump &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_hexdump &operator=(const output_file_hexdump &) = delete;
 };
diff --git a/srecord/output/file/intel.h b/srecord/output/file/intel.h
index 869d7b32..04506576 100644
--- a/srecord/output/file/intel.h
+++ b/srecord/output/file/intel.h
@@ -115,17 +115,17 @@ class output_file_intel:
     mode_t mode;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_intel() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_intel(const output_file_intel &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_intel &operator=(const output_file_intel &) = delete;
 };
diff --git a/srecord/output/file/intel16.h b/srecord/output/file/intel16.h
index b25c6b19..9a8b1645 100644
--- a/srecord/output/file/intel16.h
+++ b/srecord/output/file/intel16.h
@@ -98,17 +98,17 @@ class output_file_intel16:
     int pref_block_size;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_intel16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_intel16(const output_file_intel16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_intel16 &operator=(const output_file_intel16 &) = delete;
 };
diff --git a/srecord/output/file/mem.h b/srecord/output/file/mem.h
index 6931318d..d98be308 100644
--- a/srecord/output/file/mem.h
+++ b/srecord/output/file/mem.h
@@ -141,17 +141,17 @@ class output_file_mem:
     void emit_header();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_mem() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_mem(const output_file_mem &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_mem &operator=(const output_file_mem &) = delete;
 };
diff --git a/srecord/output/file/mif.h b/srecord/output/file/mif.h
index a55695ba..25765a49 100644
--- a/srecord/output/file/mif.h
+++ b/srecord/output/file/mif.h
@@ -128,17 +128,17 @@ class output_file_mif:
     void emit_header();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_mif() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_mif(const output_file_mif &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_mif &operator=(const output_file_mif &) = delete;
 };
diff --git a/srecord/output/file/mips_flash.h b/srecord/output/file/mips_flash.h
index 4147fea1..48e2c492 100644
--- a/srecord/output/file/mips_flash.h
+++ b/srecord/output/file/mips_flash.h
@@ -162,17 +162,17 @@ class output_file_mips_flash:
     int column;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_mips_flash() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_mips_flash(const output_file_mips_flash &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_mips_flash &operator=(const output_file_mips_flash &) = delete;
 };
diff --git a/srecord/output/file/mos_tech.h b/srecord/output/file/mos_tech.h
index ba84618c..e4e55369 100644
--- a/srecord/output/file/mos_tech.h
+++ b/srecord/output/file/mos_tech.h
@@ -101,17 +101,17 @@ class output_file_mos_tech:
         const void *data, int data_len);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_mos_tech() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_mos_tech(const output_file_mos_tech &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_mos_tech &operator=(const output_file_mos_tech &) = delete;
 };
diff --git a/srecord/output/file/motorola.cc b/srecord/output/file/motorola.cc
index 03b7d68f..234bfc35 100644
--- a/srecord/output/file/motorola.cc
+++ b/srecord/output/file/motorola.cc
@@ -35,7 +35,7 @@ srecord::output_file_motorola::output_file_motorola(
     const std::string &a_file_name
 ) :
     srecord::output_file(a_file_name)
-    
+
 {
 }
 
diff --git a/srecord/output/file/motorola.h b/srecord/output/file/motorola.h
index 3d433f2c..5c94ce80 100644
--- a/srecord/output/file/motorola.h
+++ b/srecord/output/file/motorola.h
@@ -152,12 +152,12 @@ class output_file_motorola:
         const void *data, int data_nbytes);
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_motorola(const output_file_motorola &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_motorola &operator=(const output_file_motorola &) = delete;
 };
diff --git a/srecord/output/file/msbin.h b/srecord/output/file/msbin.h
index 8e20dad2..873cf078 100644
--- a/srecord/output/file/msbin.h
+++ b/srecord/output/file/msbin.h
@@ -223,17 +223,17 @@ class output_file_msbin:
     record_vector pending_records;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_msbin() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_msbin(const output_file_msbin &) = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_msbin &operator=(const output_file_msbin &) = delete;
 };
diff --git a/srecord/output/file/needham.h b/srecord/output/file/needham.h
index 8503b4ae..4fb5ded2 100644
--- a/srecord/output/file/needham.h
+++ b/srecord/output/file/needham.h
@@ -104,17 +104,17 @@ class output_file_needham:
     int address_length;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_needham() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_needham(const output_file_needham &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_needham &operator=(const output_file_needham &) = delete;
 };
diff --git a/srecord/output/file/os65v.h b/srecord/output/file/os65v.h
index 3117ac48..ae1b9f5b 100644
--- a/srecord/output/file/os65v.h
+++ b/srecord/output/file/os65v.h
@@ -104,17 +104,17 @@ class output_file_os65v:
     bool seen_start_address;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_os65v() = delete;
 
     /**
-      * Copy constructor.  Do not use.
+      * Copy constructor.
       */
     output_file_os65v(const output_file_os65v &) = delete;
 
     /**
-      * Assignment operator.  Do not use.
+      * Assignment operator.
       */
     output_file_os65v &operator=(const output_file_os65v &) = delete;
 };
diff --git a/srecord/output/file/ppb.h b/srecord/output/file/ppb.h
index 9d3edb60..500715ed 100644
--- a/srecord/output/file/ppb.h
+++ b/srecord/output/file/ppb.h
@@ -127,17 +127,17 @@ class output_file_ppb:
     unsigned char sum_ulong(unsigned long value, unsigned char sum);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ppb() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ppb(const output_file_ppb &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_ppb &operator=(const output_file_ppb &) = delete;
 };
diff --git a/srecord/output/file/ppx.h b/srecord/output/file/ppx.h
index 839c7a0f..e5fca470 100644
--- a/srecord/output/file/ppx.h
+++ b/srecord/output/file/ppx.h
@@ -106,17 +106,17 @@ class output_file_ppx:
     unsigned short dsum;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ppx() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ppx(const output_file_ppx &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_ppx &operator=(const output_file_ppx &) = delete;
 };
diff --git a/srecord/output/file/signetics.h b/srecord/output/file/signetics.h
index 682f48ac..06320b71 100644
--- a/srecord/output/file/signetics.h
+++ b/srecord/output/file/signetics.h
@@ -108,17 +108,17 @@ class output_file_signetics:
     void write_inner(int, unsigned long, int, const void *, int);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_signetics() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_signetics(const output_file_signetics &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_signetics &operator=(const output_file_signetics &) = delete;
 };
diff --git a/srecord/output/file/spasm.h b/srecord/output/file/spasm.h
index 199518ad..b4ca5989 100644
--- a/srecord/output/file/spasm.h
+++ b/srecord/output/file/spasm.h
@@ -92,17 +92,17 @@ class output_file_spasm:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_spasm() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_spasm(const output_file_spasm &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_spasm &operator=(const output_file_spasm &) = delete;
 };
diff --git a/srecord/output/file/spectrum.h b/srecord/output/file/spectrum.h
index 4f241720..db02dc5b 100644
--- a/srecord/output/file/spectrum.h
+++ b/srecord/output/file/spectrum.h
@@ -94,17 +94,17 @@ class output_file_spectrum:
     void put_binary(unsigned char);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_spectrum() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_spectrum(const output_file_spectrum &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_spectrum &operator=(const output_file_spectrum &) = delete;
 };
diff --git a/srecord/output/file/stewie.h b/srecord/output/file/stewie.h
index e142367d..301b2187 100644
--- a/srecord/output/file/stewie.h
+++ b/srecord/output/file/stewie.h
@@ -107,17 +107,17 @@ class output_file_stewie:
     void write_inner(int, unsigned long, int, const void *, int);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_stewie() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_stewie(const output_file_stewie &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_stewie &operator=(const output_file_stewie &) = delete;
 };
diff --git a/srecord/output/file/tektronix.h b/srecord/output/file/tektronix.h
index 8fe52943..1fd40da9 100644
--- a/srecord/output/file/tektronix.h
+++ b/srecord/output/file/tektronix.h
@@ -105,17 +105,17 @@ class output_file_tektronix:
     void write_inner(unsigned long address, const void *data, int data_nbytes);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_tektronix() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_tektronix(const output_file_tektronix &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_tektronix &operator=(const output_file_tektronix &) = delete;
 };
diff --git a/srecord/output/file/tektronix_extended.h b/srecord/output/file/tektronix_extended.h
index 745be03e..c816951d 100644
--- a/srecord/output/file/tektronix_extended.h
+++ b/srecord/output/file/tektronix_extended.h
@@ -110,17 +110,18 @@ class output_file_tektronix_extended:
         const void *data, int data_nbytes);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_tektronix_extended() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
-    output_file_tektronix_extended(const output_file_tektronix_extended &) = delete;
+    output_file_tektronix_extended(
+        const output_file_tektronix_extended &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_tektronix_extended &operator=(
         const output_file_tektronix_extended &) = delete;
diff --git a/srecord/output/file/ti_tagged.h b/srecord/output/file/ti_tagged.h
index 4badf951..aa81e3b3 100644
--- a/srecord/output/file/ti_tagged.h
+++ b/srecord/output/file/ti_tagged.h
@@ -117,17 +117,17 @@ class output_file_ti_tagged:
     void put_eoln();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ti_tagged() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ti_tagged(const output_file_ti_tagged &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_ti_tagged &operator=(const output_file_ti_tagged &) = delete;
 };
diff --git a/srecord/output/file/ti_tagged_16.h b/srecord/output/file/ti_tagged_16.h
index 458d3e7b..3353b30c 100644
--- a/srecord/output/file/ti_tagged_16.h
+++ b/srecord/output/file/ti_tagged_16.h
@@ -117,19 +117,20 @@ class output_file_ti_tagged_16:
     void put_eoln();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ti_tagged_16() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ti_tagged_16(const output_file_ti_tagged_16 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    output_file_ti_tagged_16 &operator=(const output_file_ti_tagged_16 &) = delete;
+    output_file_ti_tagged_16 &operator=(
+        const output_file_ti_tagged_16 &) = delete;
 };
 
 };
diff --git a/srecord/output/file/ti_txt.h b/srecord/output/file/ti_txt.h
index faf446fc..485020cf 100644
--- a/srecord/output/file/ti_txt.h
+++ b/srecord/output/file/ti_txt.h
@@ -134,17 +134,17 @@ class output_file_ti_txt:
     void put_byte_wrap(unsigned char c);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_ti_txt() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_ti_txt(const output_file_ti_txt &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_ti_txt &operator=(const output_file_ti_txt &) = delete;
 };
diff --git a/srecord/output/file/trs80.h b/srecord/output/file/trs80.h
index 1040928a..9c507117 100644
--- a/srecord/output/file/trs80.h
+++ b/srecord/output/file/trs80.h
@@ -119,17 +119,17 @@ class output_file_trs80:
     static int preferred_block_size_calculate();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_trs80() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_trs80(const output_file_trs80 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_trs80 &operator=(const output_file_trs80 &) = delete;
 };
diff --git a/srecord/output/file/vhdl.h b/srecord/output/file/vhdl.h
index 1fd93c31..754652bf 100644
--- a/srecord/output/file/vhdl.h
+++ b/srecord/output/file/vhdl.h
@@ -108,17 +108,17 @@ class output_file_vhdl:
     void emit_header();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_vhdl() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_vhdl(const output_file_vhdl &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_vhdl &operator=(const output_file_vhdl &) = delete;
 };
diff --git a/srecord/output/file/vmem.h b/srecord/output/file/vmem.h
index f4b33cf4..7d9502c1 100644
--- a/srecord/output/file/vmem.h
+++ b/srecord/output/file/vmem.h
@@ -123,17 +123,17 @@ class output_file_vmem:
     unsigned width_mask;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_vmem() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_vmem(const output_file_vmem &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_vmem &operator=(const output_file_vmem &) = delete;
 };
diff --git a/srecord/output/file/wilson.h b/srecord/output/file/wilson.h
index b331caed..3863afea 100644
--- a/srecord/output/file/wilson.h
+++ b/srecord/output/file/wilson.h
@@ -114,17 +114,17 @@ class output_file_wilson:
         int data_nbytes);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_file_wilson() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_file_wilson(const output_file_wilson &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_file_wilson &operator=(const output_file_wilson &) = delete;
 };
diff --git a/srecord/output/filter.h b/srecord/output/filter.h
index 07354b4d..dd2ecf61 100644
--- a/srecord/output/filter.h
+++ b/srecord/output/filter.h
@@ -82,17 +82,17 @@ class output_filter:
     output::pointer deeper;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_filter() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_filter(const output_filter &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_filter &operator=(const output_filter &) = delete;
 };
diff --git a/srecord/output/filter/reblock.h b/srecord/output/filter/reblock.h
index b29aef81..6797b1c0 100644
--- a/srecord/output/filter/reblock.h
+++ b/srecord/output/filter/reblock.h
@@ -151,17 +151,17 @@ class output_filter_reblock:
     void flush_buffer(bool partial);
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     output_filter_reblock() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     output_filter_reblock(const output_filter_reblock &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     output_filter_reblock &operator=(const output_filter_reblock &) = delete;
 };
diff --git a/srecord/quit/exception.h b/srecord/quit/exception.h
index 69f47710..860bf42e 100644
--- a/srecord/quit/exception.h
+++ b/srecord/quit/exception.h
@@ -56,12 +56,12 @@ class quit_exception:
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     quit_exception(const quit_exception &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     quit_exception &operator=(const quit_exception &) = delete;
 };
diff --git a/srecord/quit/normal.h b/srecord/quit/normal.h
index 0c306603..ad0daa38 100644
--- a/srecord/quit/normal.h
+++ b/srecord/quit/normal.h
@@ -52,12 +52,12 @@ class quit_normal:
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     quit_normal(const quit_normal &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     quit_normal &operator=(const quit_normal &) = delete;
 };
diff --git a/srecord/quit/prefix.h b/srecord/quit/prefix.h
index e6a4724f..7635d224 100644
--- a/srecord/quit/prefix.h
+++ b/srecord/quit/prefix.h
@@ -73,17 +73,17 @@ class quit_prefix:
     quit &deeper;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     quit_prefix() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     quit_prefix(const quit_prefix &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     quit_prefix &operator=(const quit_prefix &) = delete;
 };
diff --git a/srecord/stm32.cc b/srecord/stm32.cc
index a4b406d2..f66b772c 100644
--- a/srecord/stm32.cc
+++ b/srecord/stm32.cc
@@ -36,9 +36,7 @@
 #define POLYNOMIAL 0x04C11DB7
 
 
-srecord::stm32::stm32(const stm32 &arg) :
-    state(arg.state)
-    
+srecord::stm32::stm32(const stm32 &arg) : state(arg.state)
 {
     while (cnt < arg.cnt)
     {