diff --git a/src/config/keybind.c b/src/config/keybind.c
index 1b060cc5..894ddf94 100644
--- a/src/config/keybind.c
+++ b/src/config/keybind.c
@@ -131,7 +131,9 @@ keybind_create(const char *keybind)
 			k->modifiers |= modifier;
 		} else {
 			sym = xkb_keysym_from_name(symname, XKB_KEYSYM_CASE_INSENSITIVE);
-			if (!keyboard_is_modifier_key (sym)) k->mod_only = FALSE;
+			if (!keyboard_is_modifier_key(sym)) {
+				k->mod_only = FALSE;
+			}
 			if (sym == XKB_KEY_NoSymbol && g_utf8_strlen(symname, -1) == 1) {
 				/*
 				 * xkb_keysym_from_name() only handles a legacy set of single
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 46152590..f7b70e74 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -38,7 +38,7 @@ struct keyinfo {
 
 static bool should_cancel_cycling_on_next_key_release;
 
-struct keybind *cur_keybind = NULL;
+struct keybind *cur_keybind;
 
 static void
 change_vt(struct server *server, unsigned int vt)