diff --git a/env_universal.cpp b/env_universal.cpp
index eb699e48e..fd04c478c 100644
--- a/env_universal.cpp
+++ b/env_universal.cpp
@@ -248,11 +248,8 @@ static void check_connection(void)
 static void env_universal_remove_all()
 {
     size_t i;
-
     wcstring_list_t lst;
-    env_universal_common_get_names(lst,
-                                   1,
-                                   1);
+    env_universal_common_get_names(lst, true, true);
     for (i=0; i<lst.size(); i++)
     {
         const wcstring &key = lst.at(i);
diff --git a/env_universal_common.cpp b/env_universal_common.cpp
index 28963b1d0..63874666e 100644
--- a/env_universal_common.cpp
+++ b/env_universal_common.cpp
@@ -518,7 +518,7 @@ message_t *create_message(fish_message_type_t type,
 */
 void env_universal_common_get_names(wcstring_list_t &lst, bool show_exported, bool show_unexported)
 {
-    wcstring_list_t names = default_universal_vars().get_names(show_exported, show_unexported);
+    const wcstring_list_t names = default_universal_vars().get_names(show_exported, show_unexported);
     lst.insert(lst.end(), names.begin(), names.end());
 }