diff --git a/src/app/config/config.c b/src/app/config/config.c
index 337ae93575917aca7ba007ec0300b9436199b6f4..68305aa65a88841a3e2fd19bc52d0be2b97f62bb 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -4494,7 +4494,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
       or_options_free(dflt_options);                                    \
       REJECT(#arg " may only be changed in testing Tor "                \
              "networks!");                                              \
-  } STMT_END
+    }                                                                   \
+  STMT_END
 
   /* Check for options that can only be changed from the defaults in testing
      networks.  */
diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c
index 719b4b1b27c38c2114ecc9e7179bcc030f7e1fc6..8ac0b664c3875aa2555c43a26645884ed7535cc8 100644
--- a/src/feature/nodelist/node_select.c
+++ b/src/feature/nodelist/node_select.c
@@ -147,7 +147,7 @@ router_pick_dirserver_generic(smartlist_t *sourcelist,
       try_ip_pref = 0;                                                        \
       goto retry_label;                                                       \
     }                                                                         \
-  STMT_END                                                                    \
+  STMT_END
 
 /* Common retry code for router_pick_directory_server_impl and
  * router_pick_trusteddirserver_impl. Retry without excluding nodes, but with
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 6329ff7750475856e92120596552840b5985ceaf..73a25dfed92da46c39e6691bc66a97c3a9034bc7 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -635,7 +635,6 @@ setup_dir_formats_options(const char *arg, or_options_t *options)
 STMT_BEGIN \
   tt_assert(r1); \
   tt_assert(rp1); \
-\
   tt_int_op(rp1->addr,OP_EQ, r1->addr); \
   tt_int_op(rp1->or_port,OP_EQ, r1->or_port); \
   tt_int_op(rp1->dir_port,OP_EQ, r1->dir_port); \
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 5d97696c1882c7b0749fd7ed0477a61ecc858744..25bda265495de2ef94eed297f873e98fb95de200 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -45,8 +45,10 @@
 
 #define RESPONSE_LEN_4 8
 #define log_sock_error(act, _s)                                         \
-  STMT_BEGIN log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act,         \
-              tor_socket_strerror(tor_socket_errno(_s))); STMT_END
+  STMT_BEGIN                                                            \
+    log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act,                  \
+    tor_socket_strerror(tor_socket_errno(_s)));                         \
+  STMT_END
 
 static void usage(void) ATTR_NORETURN;