diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 9cddcaded7..046414f55c 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -2258,7 +2258,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 	GDScriptParser::DataType list_type;
 
 	if (p_for->list) {
-		resolve_node(p_for->list, false);
+		reduce_expression(p_for->list);
 
 		bool is_range = false;
 		if (p_for->list->type == GDScriptParser::Node::CALL) {
@@ -2375,8 +2375,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 }
 
 void GDScriptAnalyzer::resolve_while(GDScriptParser::WhileNode *p_while) {
-	resolve_node(p_while->condition, false);
-
+	reduce_expression(p_while->condition);
 	resolve_suite(p_while->loop);
 	p_while->set_datatype(p_while->loop->get_datatype());
 }