diff --git a/src/files.c b/src/files.c
index b085e9dc1a5efd130e35071aaeff8f0b86f0ec0c..fd2475e4850f489b4e0f69c052a33485d5da276f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -422,12 +422,8 @@ void stat_with_alloc(const char *filename, struct stat **pstat)
  * or into a new buffer when MULTIBUFFER is set or there is no buffer yet. */
 bool open_buffer(const char *filename, bool undoable)
 {
-    bool new_buffer = (openfile == NULL
-#ifndef DISABLE_MULTIBUFFER
-			|| ISSET(MULTIBUFFER)
-#endif
-	);
-	/* Whether we load into this buffer or a new one. */
+    bool new_buffer = (openfile == NULL || ISSET(MULTIBUFFER));
+	/* Whether we load into the current buffer or a new one. */
     char *realname;
 	/* The filename after tilde expansion. */
     FILE *f;
diff --git a/src/nano.c b/src/nano.c
index 93ea9c0ee370de5f143f3c5e9d649dbc8ab65696..1d771908c3d3bc0642e9ad775270ca7ef47fa226 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1415,14 +1415,7 @@ void do_toggle(int flag)
 
     enabled = ISSET(flag);
 
-    if (flag == NO_HELP
-#ifndef DISABLE_WRAPPING
-	|| flag == NO_WRAP
-#endif
-#ifndef DISABLE_COLOR
-	|| flag == NO_COLOR_SYNTAX
-#endif
-	)
+    if (flag == NO_HELP || flag == NO_WRAP || flag == NO_COLOR_SYNTAX)
 	enabled = !enabled;
 
     statusline(HUSH, "%s %s", _(flagtostr(flag)),