diff --git a/src/option.c b/src/option.c
index ec058e9..3be4447 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8885,7 +8885,7 @@
 		static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
 
 		msg_source(HL_ATTR(HLF_W));
-		MSG_ATTR(_(w_arabic), HL_ATTR(HLF_W));
+		msg_attr(_(w_arabic), HL_ATTR(HLF_W));
 #ifdef FEAT_EVAL
 		set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1);
 #endif
@@ -10152,13 +10152,13 @@
 
     /* Highlight title */
     if (all == 2)
-	MSG_PUTS_TITLE(_("\n--- Terminal codes ---"));
+	msg_puts_title(_("\n--- Terminal codes ---"));
     else if (opt_flags & OPT_GLOBAL)
-	MSG_PUTS_TITLE(_("\n--- Global option values ---"));
+	msg_puts_title(_("\n--- Global option values ---"));
     else if (opt_flags & OPT_LOCAL)
-	MSG_PUTS_TITLE(_("\n--- Local option values ---"));
+	msg_puts_title(_("\n--- Local option values ---"));
     else
-	MSG_PUTS_TITLE(_("\n--- Options ---"));
+	msg_puts_title(_("\n--- Options ---"));
 
     /*
      * do the loop two times:
@@ -10276,12 +10276,12 @@
     /* for 'modified' we also need to check if 'ff' or 'fenc' changed. */
     if ((p->flags & P_BOOL) && ((int *)varp == &curbuf->b_changed
 					? !curbufIsChanged() : !*(int *)varp))
-	MSG_PUTS("no");
+	msg_puts("no");
     else if ((p->flags & P_BOOL) && *(int *)varp < 0)
-	MSG_PUTS("--");
+	msg_puts("--");
     else
-	MSG_PUTS("  ");
-    MSG_PUTS(p->fullname);
+	msg_puts("  ");
+    msg_puts(p->fullname);
     if (!(p->flags & P_BOOL))
     {
 	msg_putchar('=');