diff --git a/srecord/adler16.cc b/srecord/adler16.cc
index f6624d4a..b46d7a9d 100644
--- a/srecord/adler16.cc
+++ b/srecord/adler16.cc
@@ -18,13 +18,16 @@
 
 #include <srecord/adler16.h>
 
-uint16_t srecord::adler16::get() const
+uint16_t
+srecord::adler16::get()
+    const
 {
     return ((((uint16_t)sum_b) << 8) | sum_a);
 }
 
 
-void srecord::adler16::next(uint8_t c)
+void
+srecord::adler16::next(uint8_t c)
 {
     // This is not portable to int=16-bit machines
     sum_a = (sum_a + c) % 251;
@@ -32,7 +35,8 @@ void srecord::adler16::next(uint8_t c)
 }
 
 
-void srecord::adler16::nextbuf(const void *data, size_t nbytes)
+void
+srecord::adler16::nextbuf(const void *data, size_t nbytes)
 {
     const auto *dp = (const uint8_t *)data;
     while (nbytes > 0)
diff --git a/srecord/adler32.cc b/srecord/adler32.cc
index 9e5c9716..bfcdd6a3 100644
--- a/srecord/adler32.cc
+++ b/srecord/adler32.cc
@@ -18,7 +18,9 @@
 
 #include <srecord/adler32.h>
 
-uint32_t srecord::adler32::get() const
+uint32_t
+srecord::adler32::get()
+    const
 {
     return ((((uint32_t)sum_b) << 16) | sum_a);
 }
diff --git a/srecord/arglex/tool.cc b/srecord/arglex/tool.cc
index 9ce069e9..0e150127 100644
--- a/srecord/arglex/tool.cc
+++ b/srecord/arglex/tool.cc
@@ -296,7 +296,7 @@ srecord::arglex_tool::get_address_and_nbytes(const char *name,
     {
         nbytes = get_number("byte count", 1, 8);
     }
-    if ((long long)address + nbytes > (1LL << 32))
+    if ((uint64_t)address + nbytes > (1LL << 32))
     {
         fatal_error
         (
@@ -326,7 +326,7 @@ srecord::arglex_tool::get_address_nbytes_width(const char *name,
             width = get_number("width", 1, nbytes);
         }
     }
-    if ((long long)address + nbytes > (1LL << 32))
+    if ((uint64_t)address + nbytes > (1LL << 32))
     {
         fatal_error
         (
diff --git a/srecord/arglex/tool/get_interval_small.cc b/srecord/arglex/tool/get_interval_small.cc
index 6b582eb1..efeb846f 100644
--- a/srecord/arglex/tool/get_interval_small.cc
+++ b/srecord/arglex/tool/get_interval_small.cc
@@ -34,7 +34,7 @@ srecord::arglex_tool::get_interval_small(const char *caption)
     }
     if (!big_range_ok)
     {
-        long long c = result.coverage();
+        uint64_t c = result.coverage();
         if (c > (1LL << 30))
         {
             fatal_error
diff --git a/srecord/input/file/intel.cc b/srecord/input/file/intel.cc
index 221c5773..110115f9 100644
--- a/srecord/input/file/intel.cc
+++ b/srecord/input/file/intel.cc
@@ -134,20 +134,20 @@ srecord::input_file_intel::read_inner(srecord::record &record)
                 if
                 (
                     (
-                        (long long)address_base + address_field
+                        (uint64_t)address_base + address_field
                     <
-                        ((long long)1 << 32)
+                        ((uint64_t)1 << 32)
                     )
                 &&
                     (
-                        (long long)address_base + address_field + buffer[0]
+                        (uint64_t)address_base + address_field + buffer[0]
                     >
-                        ((long long)1 << 32)
+                        ((uint64_t)1 << 32)
                     )
                 )
                 {
                     int split =
-                        ((long long)1 << 32) - address_base - address_field;
+                        ((uint64_t)1 << 32) - address_base - address_field;
                     pushback =
                         new srecord::record
                         (
diff --git a/srecord/input/file/intel16.cc b/srecord/input/file/intel16.cc
index 6d4c74db..43b7e602 100644
--- a/srecord/input/file/intel16.cc
+++ b/srecord/input/file/intel16.cc
@@ -139,20 +139,20 @@ srecord::input_file_intel16::read_inner(record &result)
                 if
                 (
                     (
-                        (long long)address_base + address_field
+                        (uint64_t)address_base + address_field
                     <
-                        ((long long)1 << 32)
+                        ((uint64_t)1 << 32)
                     )
                 &&
                     (
-                        (long long)address_base + address_field + nbytes
+                        (uint64_t)address_base + address_field + nbytes
                     >
-                        ((long long)1 << 32)
+                        ((uint64_t)1 << 32)
                     )
                 )
                 {
                     int split =
-                        ((long long)1 << 32) - address_base - address_field;
+                        ((uint64_t)1 << 32) - address_base - address_field;
                     pushback =
                         new record
                         (
diff --git a/srecord/pretty_size.cc b/srecord/pretty_size.cc
index 40337eb1..c9f3b4cc 100644
--- a/srecord/pretty_size.cc
+++ b/srecord/pretty_size.cc
@@ -23,7 +23,7 @@
 
 
 std::string
-srecord::pretty_size(long long x, int width)
+srecord::pretty_size(int64_t x, int32_t width)
 {
     double tmp = x;
     bool negative = false;
diff --git a/srecord/pretty_size.h b/srecord/pretty_size.h
index ccd9759c..6f1865e7 100644
--- a/srecord/pretty_size.h
+++ b/srecord/pretty_size.h
@@ -37,7 +37,7 @@ namespace srecord
   * @returns
   *     a string, including the suffix.
   */
-std::string pretty_size(long long x, int width = 0);
+std::string pretty_size(int64_t x, int32_t width=0);
 
 };
 
diff --git a/srecord/record.cc b/srecord/record.cc
index e3fbd65d..9e4067b2 100644
--- a/srecord/record.cc
+++ b/srecord/record.cc
@@ -28,10 +28,9 @@ srecord::record::record(const srecord::record &arg) :
     address(arg.address),
     length(arg.length)
 {
-    if (arg.length > 0) {
+    if (arg.length > 0)
         memcpy(data, arg.data, arg.length);
 }
-}
 
 
 srecord::record::record(type_t arg) :