diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 5365270e0b..0db148690f 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6761,8 +6761,9 @@ void ex_splitview(exarg_T *eap)
     if (*eap->arg != NUL
         ) {
       RESET_BINDING(curwin);
-    } else
-      do_check_scrollbind(FALSE);
+    } else {
+      do_check_scrollbind(false);
+    }
     do_exedit(eap, old_curwin);
   }
 
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index c758e000a9..f0c0bc2bc3 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -127,7 +127,11 @@
 # define MB_CHAR2LEN(c)     mb_char2len(c)
 # define PTR2CHAR(p)        utf_ptr2char(p)
 
-# define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
+# define RESET_BINDING(wp) \
+  do { \
+    (wp)->w_p_scb = false; \
+    (wp)->w_p_crb = false; \
+  } while (0)
 
 /// Calculate the length of a C array
 ///
diff --git a/src/nvim/move.c b/src/nvim/move.c
index b9c4196251..4a87f82eb7 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -1245,12 +1245,12 @@ static void botline_forw(lineoff_T *lp)
   } else {
     ++lp->lnum;
     lp->fill = 0;
-    if (lp->lnum > curbuf->b_ml.ml_line_count)
+    if (lp->lnum > curbuf->b_ml.ml_line_count) {
       lp->height = MAXCOL;
-    else if (hasFolding(lp->lnum, NULL, &lp->lnum))
-      /* Add a closed fold */
+    } else if (hasFolding(lp->lnum, NULL, &lp->lnum)) {
+      // Add a closed fold
       lp->height = 1;
-    else {
+    } else {
       lp->height = plines_nofill(lp->lnum);
     }
   }
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 6709e52679..35ab9c4d84 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -2519,9 +2519,9 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
         endcol = (colnr_T)STRLEN(p);
       if (startcol > endcol
           || is_oneChar
-          )
+          ) {
         bd.textlen = 0;
-      else {
+      } else {
         bd.textlen = endcol - startcol + oap->inclusive;
       }
       bd.textstart = p + startcol;