diff --git a/reader.cpp b/reader.cpp
index c7e247900..8bf359d9c 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -3576,10 +3576,10 @@ const wchar_t *reader_readline(void)
                 /* Make sure we have two tokens */
                 if (prev_begin < prev_end && tok_begin < tok_end && tok_begin > prev_begin)
                 {
-                    wcstring prev(prev_begin, prev_end - prev_begin);
-                    wcstring sep(prev_end, tok_begin - prev_end);
-                    wcstring tok(tok_begin, tok_end - tok_begin);
-                    wcstring trail(tok_end, &buff[len] - tok_end);
+                    const wcstring prev(prev_begin, prev_end - prev_begin);
+                    const wcstring sep(prev_end, tok_begin - prev_end);
+                    const wcstring tok(tok_begin, tok_end - tok_begin);
+                    const wcstring trail(tok_end, &buff[len] - tok_end);
 
                     /* Compose new command line with swapped tokens */
                     wcstring new_buff(buff, prev_begin - buff);
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index fe3dc5d37..3a9b4785b 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -68,7 +68,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
 	bind \cf forward-char
 	bind \cb backward-char
 	bind \ct transpose-chars
-        bind \et transpose-words
+	bind \et transpose-words
 	bind \e\x7f backward-kill-word
 	bind \eb backward-word
 	bind \ef forward-word