diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 3a607d153..70ec1651c 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -495,6 +495,8 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
 
         const wcstring &val = argument_sequence.at(i);
         int retval = env_set_one(for_var_name, ENV_DEFAULT | ENV_USER, val);
+        assert(retval == ENV_OK && "for loop variable should have been successfully set");
+        (void)retval;
 
         fb->loop_status = LOOP_NORMAL;
         this->run_job_list(block_contents, fb);
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 0dc7973d2..a51c8762f 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -91,7 +91,8 @@ bool wildcard_has(const wcstring &str, bool internal) {
 ///
 /// \param str String to be matched.
 /// \param wc The wildcard.
-/// \param is_first Whether files beginning with dots should not be matched against wildcards.
+/// \param leading_dots_fail_to_match Whether files beginning with dots should not be matched
+/// against wildcards.
 static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const wchar_t *wc,
                                                        bool leading_dots_fail_to_match) {
     // Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow