diff --git a/src/libasr/ASR.asdl b/src/libasr/ASR.asdl
index e355d1c565..3aeefa0028 100644
--- a/src/libasr/ASR.asdl
+++ b/src/libasr/ASR.asdl
@@ -408,7 +408,7 @@ ttype
     | Array(ttype type, dimension* dims, array_physical_type physical_type)
     | FunctionType(ttype* arg_types, ttype? return_var_type,
         abi abi, deftype deftype, string? bindc_name, bool elemental,
-        bool pure, bool module, bool inline, bool static, ttype* type_params,
+        bool pure, bool module, bool inline, bool static,
         symbol* restrictions, bool is_restriction)
 
 -- TODO: prefix the enumerators here, improve the names
diff --git a/src/libasr/asr_utils.h b/src/libasr/asr_utils.h
index 8500acefaa..ff18465b04 100644
--- a/src/libasr/asr_utils.h
+++ b/src/libasr/asr_utils.h
@@ -1688,42 +1688,17 @@ static inline bool is_logical(ASR::ttype_t &x) {
                 type_get_past_pointer(&x))));
 }
 
-static inline bool is_generic(ASR::ttype_t &x) {
-    switch (x.type) {
-        case ASR::ttypeType::List: {
-            ASR::List_t *list_type = ASR::down_cast<ASR::List_t>(type_get_past_pointer(&x));
-            return is_generic(*list_type->m_type);
-        }
-        case ASR::ttypeType::Array: {
-            ASR::Array_t* array_t = ASR::down_cast<ASR::Array_t>(type_get_past_pointer(&x));
-            return is_generic(*array_t->m_type);
-        }
-        default : return ASR::is_a<ASR::TypeParameter_t>(*type_get_past_pointer(&x));
-    }
-}
-
 static inline bool is_type_parameter(ASR::ttype_t &x) {
     switch (x.type) {
         case ASR::ttypeType::List: {
             ASR::List_t *list_type = ASR::down_cast<ASR::List_t>(type_get_past_pointer(&x));
             return is_type_parameter(*list_type->m_type);
         }
-        default : return ASR::is_a<ASR::TypeParameter_t>(*type_get_past_pointer(&x));
-    }
-}
-
-static inline bool is_template_function(ASR::symbol_t *x) {
-    ASR::symbol_t* x2 = symbol_get_past_external(x);
-    switch (x2->type) {
-        case ASR::symbolType::Function: {
-            const SymbolTable* parent_symtab = symbol_parent_symtab(x2);
-            if (ASR::is_a<ASR::symbol_t>(*parent_symtab->asr_owner)) {
-                ASR::symbol_t* parent_sym = ASR::down_cast<ASR::symbol_t>(parent_symtab->asr_owner);
-                return ASR::is_a<ASR::Template_t>(*parent_sym);
-            }
-            return false;
+        case ASR::ttypeType::Array: {
+            ASR::Array_t *arr_type = ASR::down_cast<ASR::Array_t>(type_get_past_pointer(&x));
+            return is_type_parameter(*arr_type->m_type);
         }
-        default: return false;
+        default : return ASR::is_a<ASR::TypeParameter_t>(*type_get_past_pointer(&x));
     }
 }
 
@@ -1742,20 +1717,19 @@ static inline bool is_generic_function(ASR::symbol_t *x) {
     ASR::symbol_t* x2 = symbol_get_past_external(x);
     switch (x2->type) {
         case ASR::symbolType::Function: {
-            ASR::Function_t *func_sym = ASR::down_cast<ASR::Function_t>(x2);
-            return (ASRUtils::get_FunctionType(func_sym)->n_type_params > 0 &&
-                   !ASRUtils::get_FunctionType(func_sym)->m_is_restriction);
-        }
-        default: return false;
-    }
-}
-
-static inline bool is_restriction_function(ASR::symbol_t *x) {
-    ASR::symbol_t* x2 = symbol_get_past_external(x);
-    switch (x2->type) {
-        case ASR::symbolType::Function: {
-            ASR::Function_t *func_sym = ASR::down_cast<ASR::Function_t>(x2);
-            return ASRUtils::get_FunctionType(func_sym)->m_is_restriction;
+            if (is_requirement_function(x2)) {
+                return false;
+            }
+            ASR::Function_t *func = ASR::down_cast<ASR::Function_t>(x2);
+            ASR::FunctionType_t *func_type
+                = ASR::down_cast<ASR::FunctionType_t>(func->m_function_signature);
+            for (size_t i=0; i<func_type->n_arg_types; i++) {
+                if (is_type_parameter(*func_type->m_arg_types[i])) {
+                    return true;
+                }
+            }
+            return func_type->m_return_var_type 
+                   && is_type_parameter(*func_type->m_return_var_type);
         }
         default: return false;
     }
@@ -2110,7 +2084,7 @@ static inline ASR::ttype_t* duplicate_type(Allocator& al, const ASR::ttype_t* t,
             return ASRUtils::TYPE(ASR::make_FunctionType_t(al, ft->base.base.loc,
                 arg_types.p, arg_types.size(), ft->m_return_var_type, ft->m_abi,
                 ft->m_deftype, ft->m_bindc_name, ft->m_elemental, ft->m_pure, ft->m_module, ft->m_inline,
-                ft->m_static, ft->m_type_params, ft->n_type_params, ft->m_restrictions, ft->n_restrictions,
+                ft->m_static, ft->m_restrictions, ft->n_restrictions,
                 ft->m_is_restriction));
         }
         default : throw LCompilersException("Not implemented " + std::to_string(t->type));
@@ -3119,7 +3093,7 @@ inline ASR::asr_t* make_FunctionType_t_util(Allocator &al,
     const Location &a_loc, ASR::expr_t** a_args, size_t n_args,
     ASR::expr_t* a_return_var, ASR::abiType a_abi, ASR::deftypeType a_deftype,
     char* a_bindc_name, bool a_elemental, bool a_pure, bool a_module, bool a_inline,
-    bool a_static, ASR::ttype_t** a_type_params, size_t n_type_params,
+    bool a_static,
     ASR::symbol_t** a_restrictions, size_t n_restrictions, bool a_is_restriction) {
     Vec<ASR::ttype_t*> arg_types;
     arg_types.reserve(al, n_args);
@@ -3141,7 +3115,7 @@ inline ASR::asr_t* make_FunctionType_t_util(Allocator &al,
     return ASR::make_FunctionType_t(
         al, a_loc, arg_types.p, arg_types.size(), return_var_type, a_abi, a_deftype,
         a_bindc_name, a_elemental, a_pure, a_module, a_inline,
-        a_static, a_type_params, n_type_params, a_restrictions, n_restrictions,
+        a_static, a_restrictions, n_restrictions,
         a_is_restriction);
 }
 
@@ -3150,7 +3124,7 @@ inline ASR::asr_t* make_FunctionType_t_util(Allocator &al, const Location &a_loc
     return ASRUtils::make_FunctionType_t_util(al, a_loc, a_args, n_args, a_return_var,
         ft->m_abi, ft->m_deftype, ft->m_bindc_name, ft->m_elemental,
         ft->m_pure, ft->m_module, ft->m_inline, ft->m_static,
-        ft->m_type_params, ft->n_type_params, ft->m_restrictions,
+        ft->m_restrictions,
         ft->n_restrictions, ft->m_is_restriction);
 }
 
@@ -3159,12 +3133,12 @@ inline ASR::asr_t* make_Function_t_util(Allocator& al, const Location& loc,
     ASR::expr_t** a_args, size_t n_args, ASR::stmt_t** m_body, size_t n_body,
     ASR::expr_t* m_return_var, ASR::abiType m_abi, ASR::accessType m_access,
     ASR::deftypeType m_deftype, char* m_bindc_name, bool m_elemental, bool m_pure,
-    bool m_module, bool m_inline, bool m_static, ASR::ttype_t** m_type_params, size_t n_type_params,
+    bool m_module, bool m_inline, bool m_static,
     ASR::symbol_t** m_restrictions, size_t n_restrictions, bool m_is_restriction,
     bool m_deterministic, bool m_side_effect_free, char *m_c_header=nullptr) {
     ASR::ttype_t* func_type = ASRUtils::TYPE(ASRUtils::make_FunctionType_t_util(
         al, loc, a_args, n_args, m_return_var, m_abi, m_deftype, m_bindc_name,
-        m_elemental, m_pure, m_module, m_inline, m_static, m_type_params, n_type_params,
+        m_elemental, m_pure, m_module, m_inline, m_static,
         m_restrictions, n_restrictions, m_is_restriction));
     return ASR::make_Function_t(
         al, loc, m_symtab, m_name, func_type, m_dependencies, n_dependencies,
@@ -3353,7 +3327,6 @@ class SymbolDuplicator {
             function_type->m_abi, function->m_access, function_type->m_deftype,
             function_type->m_bindc_name, function_type->m_elemental, function_type->m_pure,
             function_type->m_module, function_type->m_inline, function_type->m_static,
-            function_type->m_type_params, function_type->n_type_params,
             function_type->m_restrictions, function_type->n_restrictions,
             function_type->m_is_restriction, function->m_deterministic,
             function->m_side_effect_free));
diff --git a/src/libasr/codegen/asr_to_wasm.cpp b/src/libasr/codegen/asr_to_wasm.cpp
index c516e03f84..084131366e 100644
--- a/src/libasr/codegen/asr_to_wasm.cpp
+++ b/src/libasr/codegen/asr_to_wasm.cpp
@@ -754,7 +754,7 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
                 nullptr, 0, nullptr, 0, x.m_body, x.n_body, nullptr,
                 ASR::abiType::Source, ASR::accessType::Public,
                 ASR::deftypeType::Implementation, nullptr, false, false, false, false, false,
-                nullptr, 0, nullptr, 0, false, false, false);
+                nullptr, 0, false, false, false);
         }
         this->visit_Function(*main_func);
     }
diff --git a/src/libasr/pass/global_stmts.cpp b/src/libasr/pass/global_stmts.cpp
index 4324350c25..263f636d3b 100644
--- a/src/libasr/pass/global_stmts.cpp
+++ b/src/libasr/pass/global_stmts.cpp
@@ -123,7 +123,7 @@ void pass_wrap_global_stmts(Allocator &al,
         ASR::Public, ASR::Implementation,
         nullptr,
         false, false, false, false, false,
-        nullptr, 0, nullptr, 0,
+        nullptr, 0,
         false, false, false);
     std::string sym_name = fn_name;
     if (unit.m_global_scope->get_symbol(sym_name) != nullptr) {
diff --git a/src/libasr/pass/instantiate_template.cpp b/src/libasr/pass/instantiate_template.cpp
index 063175a5d5..c534c903c4 100644
--- a/src/libasr/pass/instantiate_template.cpp
+++ b/src/libasr/pass/instantiate_template.cpp
@@ -189,9 +189,7 @@ class SymbolInstantiator : public ASR::BaseExprStmtDuplicator<SymbolInstantiator
             new_return_var_ref,
             func_abi, func_access, func_deftype, bindc_name,
             func_elemental, func_pure, func_module, ASRUtils::get_FunctionType(x)->m_inline,
-            ASRUtils::get_FunctionType(x)->m_static, ASRUtils::get_FunctionType(x)->m_type_params,
-            ASRUtils::get_FunctionType(x)->n_type_params, ASRUtils::get_FunctionType(x)->m_restrictions,
-            ASRUtils::get_FunctionType(x)->n_restrictions, false, false, false);
+            ASRUtils::get_FunctionType(x)->m_static, nullptr, 0 , false, false, false);
 
         ASR::symbol_t *t = ASR::down_cast<ASR::symbol_t>(result);
         func_scope->add_symbol(new_sym_name, t);
@@ -337,7 +335,7 @@ class SymbolInstantiator : public ASR::BaseExprStmtDuplicator<SymbolInstantiator
         ASR::expr_t* dt = duplicate_expr(x->m_dt);
         if (ASRUtils::is_requirement_function(name)) {
             name = symbol_subs[call_name];
-        } else if (ASRUtils::is_template_function(name)) {
+        } else if (ASRUtils::is_generic_function(name)) {
             std::string nested_func_name = current_scope->get_unique_name("__asr_generic_" + call_name, false);
             ASR::symbol_t* name2 = ASRUtils::symbol_get_past_external(name);
             SymbolInstantiator nested_t(al, context_map, type_subs, symbol_subs, func_scope, template_scope, nested_func_name);
@@ -598,437 +596,4 @@ ASR::symbol_t* pass_instantiate_function_body(Allocator &al,
     return t.instantiate_body(new_f, f);
 }
 
-class FunctionInstantiator : public ASR::BaseExprStmtDuplicator<FunctionInstantiator>
-{
-public:
-    SymbolTable *func_scope;
-    SymbolTable *current_scope;
-    std::map<std::string, ASR::ttype_t*> subs;
-    std::map<std::string, ASR::symbol_t*> rt_subs;
-    std::string new_func_name;
-    std::vector<ASR::Function_t*> rts;
-    SetChar dependencies;
-
-    FunctionInstantiator(Allocator &al, std::map<std::string, ASR::ttype_t*> subs,
-            std::map<std::string, ASR::symbol_t*> rt_subs, SymbolTable *func_scope,
-            std::string new_func_name):
-        BaseExprStmtDuplicator(al),
-        func_scope{func_scope},
-        subs{subs},
-        rt_subs{rt_subs},
-        new_func_name{new_func_name}
-        {}
-
-    ASR::asr_t* instantiate_Function(ASR::Function_t *x) {
-        dependencies.clear(al);
-        current_scope = al.make_new<SymbolTable>(func_scope);
-
-        Vec<ASR::expr_t*> args;
-        args.reserve(al, x->n_args);
-        for (size_t i=0; i<x->n_args; i++) {
-            ASR::Variable_t *param_var = ASR::down_cast<ASR::Variable_t>(
-                (ASR::down_cast<ASR::Var_t>(x->m_args[i]))->m_v);
-            ASR::ttype_t *param_type = ASRUtils::expr_type(x->m_args[i]);
-            ASR::ttype_t *arg_type = substitute_type(param_type);
-
-            Location loc = param_var->base.base.loc;
-            std::string var_name = param_var->m_name;
-            ASR::intentType s_intent = param_var->m_intent;
-            ASR::expr_t *init_expr = nullptr;
-            ASR::expr_t *value = nullptr;
-            ASR::storage_typeType storage_type = param_var->m_storage;
-            ASR::abiType abi_type = param_var->m_abi;
-            ASR::accessType s_access = param_var->m_access;
-            ASR::presenceType s_presence = param_var->m_presence;
-            bool value_attr = param_var->m_value_attr;
-
-            // TODO: Copying variable can be abstracted into a function
-            SetChar variable_dependencies_vec;
-            variable_dependencies_vec.reserve(al, 1);
-            ASRUtils::collect_variable_dependencies(al, variable_dependencies_vec, arg_type);
-            ASR::asr_t *v = ASR::make_Variable_t(al, loc, current_scope,
-                s2c(al, var_name), variable_dependencies_vec.p, variable_dependencies_vec.size(),
-                s_intent, init_expr, value, storage_type, arg_type, nullptr,
-                abi_type, s_access, s_presence, value_attr);
-
-            current_scope->add_symbol(var_name, ASR::down_cast<ASR::symbol_t>(v));
-
-            ASR::symbol_t *var = current_scope->get_symbol(var_name);
-            args.push_back(al, ASRUtils::EXPR(ASR::make_Var_t(al, x->base.base.loc, var)));
-        }
-
-        ASR::expr_t *new_return_var_ref = nullptr;
-        if (x->m_return_var != nullptr) {
-            ASR::Variable_t *return_var = ASR::down_cast<ASR::Variable_t>(
-                (ASR::down_cast<ASR::Var_t>(x->m_return_var))->m_v);
-            std::string return_var_name = return_var->m_name;
-            ASR::ttype_t *return_param_type = ASRUtils::expr_type(x->m_return_var);
-            ASR::ttype_t *return_type = substitute_type(return_param_type);
-            SetChar variable_dependencies_vec;
-            variable_dependencies_vec.reserve(al, 1);
-            ASRUtils::collect_variable_dependencies(al, variable_dependencies_vec, return_type);
-            ASR::asr_t *new_return_var = ASR::make_Variable_t(al, return_var->base.base.loc,
-                current_scope, s2c(al, return_var_name),
-                variable_dependencies_vec.p,
-                variable_dependencies_vec.size(),
-                return_var->m_intent, nullptr, nullptr,
-                return_var->m_storage, return_type, return_var->m_type_declaration,
-                return_var->m_abi, return_var->m_access,
-                return_var->m_presence, return_var->m_value_attr);
-            current_scope->add_symbol(return_var_name, ASR::down_cast<ASR::symbol_t>(new_return_var));
-            new_return_var_ref = ASRUtils::EXPR(ASR::make_Var_t(al, x->base.base.loc,
-                current_scope->get_symbol(return_var_name)));
-        }
-
-        // Rebuild the symbol table
-        for (auto const &sym_pair: x->m_symtab->get_scope()) {
-            if (current_scope->resolve_symbol(sym_pair.first) == nullptr) {
-                ASR::symbol_t *sym = sym_pair.second;
-                if (ASR::is_a<ASR::Variable_t>(*sym)) {
-                    ASR::ttype_t *new_sym_type = substitute_type(ASRUtils::symbol_type(sym));
-                    ASR::Variable_t *var_sym = ASR::down_cast<ASR::Variable_t>(sym);
-                    std::string var_sym_name = var_sym->m_name;
-                    SetChar variable_dependencies_vec;
-                    variable_dependencies_vec.reserve(al, 1);
-                    ASRUtils::collect_variable_dependencies(al, variable_dependencies_vec, new_sym_type);
-                    ASR::asr_t *new_var = ASR::make_Variable_t(al, var_sym->base.base.loc,
-                        current_scope, s2c(al, var_sym_name), variable_dependencies_vec.p,
-                        variable_dependencies_vec.size(), var_sym->m_intent, nullptr, nullptr,
-                        var_sym->m_storage, new_sym_type, var_sym->m_type_declaration, var_sym->m_abi, var_sym->m_access,
-                        var_sym->m_presence, var_sym->m_value_attr);
-                    current_scope->add_symbol(var_sym_name, ASR::down_cast<ASR::symbol_t>(new_var));
-                }
-            }
-        }
-
-        for (size_t i=0; i < ASRUtils::get_FunctionType(x)->n_restrictions; i++) {
-            rts.push_back(ASR::down_cast<ASR::Function_t>(
-                ASRUtils::get_FunctionType(x)->m_restrictions[i]));
-        }
-
-        Vec<ASR::stmt_t*> body;
-        body.reserve(al, x->n_body);
-        for (size_t i=0; i<x->n_body; i++) {
-            ASR::stmt_t *new_body = this->duplicate_stmt(x->m_body[i]);
-            if (new_body != nullptr) {
-                body.push_back(al, new_body);
-            }
-        }
-
-        ASR::abiType func_abi = ASRUtils::get_FunctionType(x)->m_abi;
-        ASR::accessType func_access = x->m_access;
-        ASR::deftypeType func_deftype = ASRUtils::get_FunctionType(x)->m_deftype;
-        char *bindc_name = ASRUtils::get_FunctionType(x)->m_bindc_name;
-
-        bool func_elemental =  ASRUtils::get_FunctionType(x)->m_elemental;
-        bool func_pure = ASRUtils::get_FunctionType(x)->m_pure;
-        bool func_module = ASRUtils::get_FunctionType(x)->m_module;
-
-        SetChar deps_vec;
-        deps_vec.reserve(al, dependencies.size());
-        for( size_t i = 0; i < dependencies.size(); i++ ) {
-            char* dep = dependencies[i];
-            deps_vec.push_back(al, dep);
-        }
-
-        ASR::asr_t *result = ASRUtils::make_Function_t_util(
-            al, x->base.base.loc,
-            current_scope, s2c(al, new_func_name),
-            deps_vec.p, deps_vec.size(),
-            args.p, args.size(),
-            body.p, body.size(),
-            new_return_var_ref,
-            func_abi, func_access, func_deftype, bindc_name,
-            func_elemental, func_pure, func_module, ASRUtils::get_FunctionType(x)->m_inline,
-            ASRUtils::get_FunctionType(x)->m_static, nullptr, 0, nullptr, 0, false, false, false);
-
-        ASR::symbol_t *t = ASR::down_cast<ASR::symbol_t>(result);
-        func_scope->add_symbol(new_func_name, t);
-
-        return result;
-    }
-
-    ASR::asr_t* duplicate_Var(ASR::Var_t *x) {
-        std::string sym_name = ASRUtils::symbol_name(x->m_v);
-        ASR::symbol_t *sym = current_scope->get_symbol(sym_name);
-        return ASR::make_Var_t(al, x->base.base.loc, sym);
-    }
-
-    ASR::asr_t* duplicate_ArrayItem(ASR::ArrayItem_t *x) {
-        ASR::expr_t *m_v = duplicate_expr(x->m_v);
-        ASR::expr_t *m_value = duplicate_expr(x->m_value);
-
-        Vec<ASR::array_index_t> args;
-        args.reserve(al, x->n_args);
-        for (size_t i=0; i<x->n_args; i++) {
-            args.push_back(al, duplicate_array_index(x->m_args[i]));
-        }
-
-        ASR::ttype_t *type = substitute_type(x->m_type);
-
-        return ASRUtils::make_ArrayItem_t_util(al, x->base.base.loc, m_v, args.p, x->n_args,
-            ASRUtils::type_get_past_allocatable(type), x->m_storage_format, m_value);
-    }
-
-    ASR::asr_t* duplicate_ListItem(ASR::ListItem_t *x) {
-        ASR::expr_t *m_a = duplicate_expr(x->m_a);
-        ASR::expr_t *m_pos = duplicate_expr(x->m_pos);
-        ASR::ttype_t *type = substitute_type(x->m_type);
-        ASR::expr_t *m_value = duplicate_expr(x->m_value);
-
-        return ASR::make_ListItem_t(al, x->base.base.loc,
-            m_a, m_pos, type, m_value);
-    }
-
-    ASR::array_index_t duplicate_array_index(ASR::array_index_t x) {
-        ASR::expr_t *left = duplicate_expr(x.m_left);
-        ASR::expr_t *right = duplicate_expr(x.m_right);
-        ASR::expr_t *step = duplicate_expr(x.m_step);
-        ASR::array_index_t result;
-        result.m_left = left;
-        result.m_right = right;
-        result.m_step = step;
-        return result;
-    }
-
-    ASR::asr_t* duplicate_Assignment(ASR::Assignment_t *x) {
-        ASR::expr_t *target = duplicate_expr(x->m_target);
-        ASR::expr_t *value = duplicate_expr(x->m_value);
-        ASR::stmt_t *overloaded = duplicate_stmt(x->m_overloaded);
-        return ASR::make_Assignment_t(al, x->base.base.loc, target, value, overloaded);
-    }
-
-    ASR::asr_t* duplicate_DoLoop(ASR::DoLoop_t *x) {
-        Vec<ASR::stmt_t*> m_body;
-        m_body.reserve(al, x->n_body);
-        for (size_t i=0; i<x->n_body; i++) {
-            m_body.push_back(al, duplicate_stmt(x->m_body[i]));
-        }
-        ASR::do_loop_head_t head;
-        head.m_v = duplicate_expr(x->m_head.m_v);
-        head.m_start = duplicate_expr(x->m_head.m_start);
-        head.m_end = duplicate_expr(x->m_head.m_end);
-        head.m_increment = duplicate_expr(x->m_head.m_increment);
-        head.loc = x->m_head.m_v->base.loc;
-        return ASR::make_DoLoop_t(al, x->base.base.loc, x->m_name, head, m_body.p, x->n_body);
-    }
-
-    ASR::asr_t* duplicate_Cast(ASR::Cast_t *x) {
-        ASR::expr_t *arg = duplicate_expr(x->m_arg);
-        ASR::ttype_t *type = substitute_type(ASRUtils::expr_type(x->m_arg));
-        if (ASRUtils::is_real(*type)) {
-            return (ASR::asr_t*) arg;
-        }
-        return ASRUtils::make_Cast_t_value(al, x->base.base.loc, arg, ASR::cast_kindType::IntegerToReal, x->m_type);
-    }
-
-    ASR::asr_t* duplicate_FunctionCall(ASR::FunctionCall_t *x) {
-        std::string call_name = ASRUtils::symbol_name(x->m_name);
-        ASR::symbol_t *name = func_scope->get_symbol(call_name);
-        Vec<ASR::call_arg_t> args;
-        args.reserve(al, x->n_args);
-        for (size_t i=0; i<x->n_args; i++) {
-            ASR::call_arg_t new_arg;
-            new_arg.loc = x->m_args[i].loc;
-            new_arg.m_value = duplicate_expr(x->m_args[i].m_value);
-            args.push_back(al, new_arg);
-        }
-        ASR::ttype_t* type = substitute_type(x->m_type);
-        ASR::expr_t* value = duplicate_expr(x->m_value);
-        ASR::expr_t* dt = duplicate_expr(x->m_dt);
-        if (ASRUtils::is_restriction_function(name)) {
-            name = rt_subs[call_name];
-        } else if (ASRUtils::is_generic_function(name)) {
-            std::string nested_func_name = current_scope->get_unique_name("__asr_generic_" + call_name, false);
-            ASR::symbol_t* name2 = ASRUtils::symbol_get_past_external(name);
-            ASR::Function_t* func = ASR::down_cast<ASR::Function_t>(name2);
-            FunctionInstantiator nested_tf(al, subs, rt_subs, func_scope, nested_func_name);
-            ASR::asr_t* nested_generic_func = nested_tf.instantiate_Function(func);
-            name = ASR::down_cast<ASR::symbol_t>(nested_generic_func);
-        }
-        dependencies.push_back(al, ASRUtils::symbol_name(name));
-        return ASRUtils::make_FunctionCall_t_util(al, x->base.base.loc, name, x->m_original_name,
-            args.p, args.size(), type, value, dt);
-    }
-
-    ASR::asr_t* duplicate_SubroutineCall(ASR::SubroutineCall_t *x) {
-        std::string call_name = ASRUtils::symbol_name(x->m_name);
-        ASR::symbol_t *name = func_scope->get_symbol(call_name);
-        Vec<ASR::call_arg_t> args;
-        args.reserve(al, x->n_args);
-        for (size_t i=0; i<x->n_args; i++) {
-            ASR::call_arg_t new_arg;
-            new_arg.loc = x->m_args[i].loc;
-            new_arg.m_value = duplicate_expr(x->m_args[i].m_value);
-            args.push_back(al, new_arg);
-        }
-        ASR::expr_t* dt = duplicate_expr(x->m_dt);
-        if (ASRUtils::is_restriction_function(name)) {
-            name = rt_subs[call_name];
-        } else {
-            std::string nested_func_name = current_scope->get_unique_name("__asr_generic_" + call_name, false);
-            ASR::symbol_t* name2 = ASRUtils::symbol_get_past_external(name);
-            ASR::Function_t* func = ASR::down_cast<ASR::Function_t>(name2);
-            FunctionInstantiator nested_tf(al, subs, rt_subs, func_scope, nested_func_name);
-            ASR::asr_t* nested_generic_func = nested_tf.instantiate_Function(func);
-            name = ASR::down_cast<ASR::symbol_t>(nested_generic_func);
-        }
-        dependencies.push_back(al, ASRUtils::symbol_name(name));
-        return ASRUtils::make_SubroutineCall_t_util(al, x->base.base.loc, name /* change this */,
-            x->m_original_name, args.p, args.size(), dt, nullptr, false);
-    }
-
-
-    ASR::ttype_t* substitute_type(ASR::ttype_t *param_type) {
-        if (ASR::is_a<ASR::List_t>(*param_type)) {
-            ASR::List_t *tlist = ASR::down_cast<ASR::List_t>(param_type);
-            return ASRUtils::TYPE(ASR::make_List_t(al, param_type->base.loc,
-                substitute_type(tlist->m_type)));
-        }
-        ASR::ttype_t* param_type_ = ASRUtils::type_get_past_array(param_type);
-        ASR::dimension_t* m_dims = nullptr;
-        size_t n_dims = ASRUtils::extract_dimensions_from_ttype(param_type, m_dims);
-        if (ASR::is_a<ASR::TypeParameter_t>(*param_type_)) {
-            ASR::TypeParameter_t *param = ASR::down_cast<ASR::TypeParameter_t>(param_type_);
-            Vec<ASR::dimension_t> new_dims;
-            new_dims.reserve(al, n_dims);
-            for (size_t i = 0; i < n_dims; i++) {
-                ASR::dimension_t old_dim = m_dims[i];
-                ASR::dimension_t new_dim;
-                new_dim.loc = old_dim.loc;
-                new_dim.m_start = duplicate_expr(old_dim.m_start);
-                new_dim.m_length = duplicate_expr(old_dim.m_length);
-                new_dims.push_back(al, new_dim);
-            }
-            ASR::ttype_t *t = ASRUtils::type_get_past_array(subs[param->m_param]);
-            ASR::ttype_t *t_ = nullptr;
-            switch (t->type) {
-                case ASR::ttypeType::Integer: {
-                    ASR::Integer_t* tnew = ASR::down_cast<ASR::Integer_t>(t);
-                    t_ = ASRUtils::TYPE(ASR::make_Integer_t(al, t->base.loc, tnew->m_kind));
-                    break;
-                }
-                case ASR::ttypeType::Real: {
-                    ASR::Real_t* tnew = ASR::down_cast<ASR::Real_t>(t);
-                    t_ = ASRUtils::TYPE(ASR::make_Real_t(al, t->base.loc, tnew->m_kind));
-                    break;
-                }
-                case ASR::ttypeType::Character: {
-                    ASR::Character_t* tnew = ASR::down_cast<ASR::Character_t>(t);
-                    t_ = ASRUtils::TYPE(ASR::make_Character_t(al, t->base.loc,
-                                tnew->m_kind, tnew->m_len, tnew->m_len_expr));
-                    break;
-                }
-                default: {
-                    return subs[param->m_param];
-                }
-            }
-            if( new_dims.size() > 0 ) {
-                t_ = ASRUtils::make_Array_t_util(al, t->base.loc,
-                    t_, new_dims.p, new_dims.size());
-            }
-            return t_;
-        }
-        return param_type;
-    }
-
-    ASR::asr_t* make_BinOp_helper(ASR::expr_t *left, ASR::expr_t *right,
-            ASR::binopType op, const Location &loc) {
-        ASR::ttype_t *left_type = ASRUtils::expr_type(left);
-        ASR::ttype_t *right_type = ASRUtils::expr_type(right);
-        ASR::ttype_t *dest_type = nullptr;
-        ASR::expr_t *value = nullptr;
-
-        if (op == ASR::binopType::Div) {
-            dest_type = ASRUtils::TYPE(ASR::make_Real_t(al, loc, 8));
-            if (ASRUtils::is_integer(*left_type)) {
-                left = ASR::down_cast<ASR::expr_t>(ASRUtils::make_Cast_t_value(
-                    al, left->base.loc, left, ASR::cast_kindType::IntegerToReal, dest_type));
-            }
-            if (ASRUtils::is_integer(*right_type)) {
-                if (ASRUtils::expr_value(right) != nullptr) {
-                    int64_t val = ASR::down_cast<ASR::IntegerConstant_t>(ASRUtils::expr_value(right))->m_n;
-                    if (val == 0) {
-                        throw SemanticError("division by zero is not allowed", right->base.loc);
-                    }
-                }
-                right = ASR::down_cast<ASR::expr_t>(ASRUtils::make_Cast_t_value(
-                    al, right->base.loc, right, ASR::cast_kindType::IntegerToReal, dest_type));
-            } else if (ASRUtils::is_real(*right_type)) {
-                if (ASRUtils::expr_value(right) != nullptr) {
-                    double val = ASR::down_cast<ASR::RealConstant_t>(ASRUtils::expr_value(right))->m_r;
-                    if (val == 0.0) {
-                        throw SemanticError("float division by zero is not allowed", right->base.loc);
-                    }
-                }
-            }
-        }
-
-        if ((ASRUtils::is_integer(*left_type) || ASRUtils::is_real(*left_type)) &&
-                (ASRUtils::is_integer(*right_type) || ASRUtils::is_real(*right_type))) {
-            left = cast_helper(ASRUtils::expr_type(right), left);
-            right = cast_helper(ASRUtils::expr_type(left), right);
-            dest_type = substitute_type(ASRUtils::expr_type(left));
-        }
-
-        if (ASRUtils::is_integer(*dest_type)) {
-            if (ASRUtils::expr_value(left) != nullptr && ASRUtils::expr_value(right) != nullptr) {
-                int64_t left_value = ASR::down_cast<ASR::IntegerConstant_t>(ASRUtils::expr_value(left))->m_n;
-                int64_t right_value = ASR::down_cast<ASR::IntegerConstant_t>(ASRUtils::expr_value(right))->m_n;
-                int64_t result;
-                switch (op) {
-                    case (ASR::binopType::Add): { result = left_value + right_value; break; }
-                    case (ASR::binopType::Div): { result = left_value / right_value; break; }
-                    default: { LCOMPILERS_ASSERT(false); result=0; } // should never happen
-                }
-                value = ASR::down_cast<ASR::expr_t>(ASR::make_IntegerConstant_t(al, loc, result, dest_type));
-            }
-            return ASR::make_IntegerBinOp_t(al, loc, left, op, right, dest_type, value);
-        } else if (ASRUtils::is_real(*dest_type)) {
-            right = cast_helper(left_type, right);
-            dest_type = ASRUtils::expr_type(right);
-            if (ASRUtils::expr_value(left) != nullptr && ASRUtils::expr_value(right) != nullptr) {
-                double left_value = ASR::down_cast<ASR::RealConstant_t>(ASRUtils::expr_value(left))->m_r;
-                double right_value = ASR::down_cast<ASR::RealConstant_t>(ASRUtils::expr_value(right))->m_r;
-                double result;
-                switch (op) {
-                    case (ASR::binopType::Add): { result = left_value + right_value; break; }
-                    case (ASR::binopType::Div): { result = left_value / right_value; break; }
-                    default: { LCOMPILERS_ASSERT(false); result = 0; }
-                }
-                value = ASR::down_cast<ASR::expr_t>(ASR::make_RealConstant_t(al, loc, result, dest_type));
-            }
-            return ASR::make_RealBinOp_t(al, loc, left, op, right, dest_type, value);
-        }
-
-        return nullptr;
-    }
-
-    ASR::expr_t *cast_helper(ASR::ttype_t *left_type, ASR::expr_t *right,
-            bool is_assign=false) {
-        ASR::ttype_t *right_type = ASRUtils::type_get_past_pointer(ASRUtils::expr_type(right));
-        if (ASRUtils::is_integer(*left_type) && ASRUtils::is_integer(*right_type)) {
-            int lkind = ASR::down_cast<ASR::Integer_t>(left_type)->m_kind;
-            int rkind = ASR::down_cast<ASR::Integer_t>(right_type)->m_kind;
-            if ((is_assign && (lkind != rkind)) || (lkind > rkind)) {
-                return ASR::down_cast<ASR::expr_t>(ASRUtils::make_Cast_t_value(
-                    al, right->base.loc, right, ASR::cast_kindType::IntegerToInteger,
-                    left_type));
-            }
-        }
-        return right;
-    }
-
-};
-
-ASR::symbol_t* pass_instantiate_template(Allocator &al, std::map<std::string, ASR::ttype_t*> subs,
-        std::map<std::string, ASR::symbol_t*> rt_subs, SymbolTable *current_scope,
-        std::string new_func_name, ASR::symbol_t *sym) {
-    ASR::symbol_t* sym2 = ASRUtils::symbol_get_past_external(sym);
-    ASR::Function_t* func = ASR::down_cast<ASR::Function_t>(sym2);
-    FunctionInstantiator tf(al, subs, rt_subs, current_scope, new_func_name);
-    ASR::asr_t *new_function = tf.instantiate_Function(func);
-    return ASR::down_cast<ASR::symbol_t>(new_function);
-}
-
 } // namespace LCompilers
diff --git a/src/libasr/pass/instantiate_template.h b/src/libasr/pass/instantiate_template.h
index 5a77df3593..38d70cd053 100644
--- a/src/libasr/pass/instantiate_template.h
+++ b/src/libasr/pass/instantiate_template.h
@@ -25,10 +25,6 @@ namespace LCompilers {
         SymbolTable *current_scope, SymbolTable *template_scope,
         ASR::Function_t *new_f, ASR::Function_t *f);
 
-    ASR::symbol_t* pass_instantiate_template(Allocator &al,
-        std::map<std::string, ASR::ttype_t*> subs, std::map<std::string, ASR::symbol_t*> rt_subs,
-        SymbolTable *current_scope, std::string new_func_name, ASR::symbol_t *sym);
-
 } // namespace LCompilers
 
 #endif // LIBASR_PASS_INSTANTIATE_TEMPLATE_H
diff --git a/src/libasr/pass/intrinsic_function_registry.h b/src/libasr/pass/intrinsic_function_registry.h
index 4804c6213d..d5203164be 100644
--- a/src/libasr/pass/intrinsic_function_registry.h
+++ b/src/libasr/pass/intrinsic_function_registry.h
@@ -206,7 +206,7 @@ class ASRBuilder {
         symtab, s2c(al, name), dep.p, dep.n, args.p, args.n, body.p, body.n,    \
         return_var, ASR::abiType::abi, ASR::accessType::Public,                 \
         ASR::deftypeType::deftype, bindc_name, false, false, false, false,      \
-        false, nullptr, 0, nullptr, 0, false, false, false));
+        false, nullptr, 0, false, false, false));
 
     #define make_Function_Without_ReturnVar_t(name, symtab, dep, args, body,    \
             abi, deftype, bindc_name)                                           \
@@ -214,7 +214,7 @@ class ASRBuilder {
         symtab, s2c(al, name), dep.p, dep.n, args.p, args.n, body.p, body.n,    \
         nullptr, ASR::abiType::abi, ASR::accessType::Public,                    \
         ASR::deftypeType::deftype, bindc_name, false, false, false, false,      \
-        false, nullptr, 0, nullptr, 0, false, false, false));
+        false, nullptr, 0, false, false, false));
 
     // Types -------------------------------------------------------------------
     #define int32        TYPE(ASR::make_Integer_t(al, loc, 4))
diff --git a/src/libasr/pass/pass_array_by_data.cpp b/src/libasr/pass/pass_array_by_data.cpp
index 1e538bb400..e8c4188dec 100644
--- a/src/libasr/pass/pass_array_by_data.cpp
+++ b/src/libasr/pass/pass_array_by_data.cpp
@@ -155,7 +155,7 @@ class PassArrayByDataProcedureVisitor : public PassUtils::PassVisitor<PassArrayB
                     return_var, x_func_type->m_abi, x->m_access, x_func_type->m_deftype,
                     s2c(al, new_bindc_name), x_func_type->m_elemental,
                     x_func_type->m_pure, x_func_type->m_module, x_func_type->m_inline,
-                    x_func_type->m_static, x_func_type->m_type_params, x_func_type->n_type_params,
+                    x_func_type->m_static,
                     x_func_type->m_restrictions, x_func_type->n_restrictions, false, false, false);
                 new_symbol = ASR::down_cast<ASR::symbol_t>(new_subrout);
             }
diff --git a/src/libasr/pass/pass_compare.cpp b/src/libasr/pass/pass_compare.cpp
index 82c07bf9d2..98852f7d79 100644
--- a/src/libasr/pass/pass_compare.cpp
+++ b/src/libasr/pass/pass_compare.cpp
@@ -227,7 +227,7 @@ class CompareExprReplacer : public ASR::BaseExprReplacer<CompareExprReplacer>
             /* a_return_var */ result,
             ASR::abiType::Source,
             ASR::accessType::Public, ASR::deftypeType::Implementation,
-            nullptr, false, false, false, false, false, nullptr, 0, nullptr, 0,
+            nullptr, false, false, false, false, false, nullptr, 0,
             false, false, false);
         ASR::symbol_t *fn_sym = ASR::down_cast<ASR::symbol_t>(fn);
         global_scope->add_symbol(fn_name, fn_sym);
@@ -412,7 +412,7 @@ class CompareExprReplacer : public ASR::BaseExprReplacer<CompareExprReplacer>
             ASR::accessType::Public, ASR::deftypeType::Implementation,
             nullptr,
             false, false, false, false, false,
-            nullptr, 0, nullptr, 0,
+            nullptr, 0,
             false, false, false);
         ASR::symbol_t *fn_sym = ASR::down_cast<ASR::symbol_t>(fn);
         global_scope->add_symbol(fn_name, fn_sym);
diff --git a/src/libasr/pass/pass_list_expr.cpp b/src/libasr/pass/pass_list_expr.cpp
index db02341e22..2d9c3bec26 100644
--- a/src/libasr/pass/pass_list_expr.cpp
+++ b/src/libasr/pass/pass_list_expr.cpp
@@ -329,7 +329,7 @@ class ListExprReplacer : public ASR::BaseExprReplacer<ListExprReplacer>
             ASR::accessType::Public, ASR::deftypeType::Implementation,
             nullptr,
             false, false, false, false, false,
-            nullptr, 0, nullptr, 0,
+            nullptr, 0,
             false, false, false);
         ASR::symbol_t *fn_sym = ASR::down_cast<ASR::symbol_t>(fn);
         global_scope->add_symbol(fn_name, fn_sym);
@@ -496,7 +496,7 @@ class ListExprReplacer : public ASR::BaseExprReplacer<ListExprReplacer>
             ASR::accessType::Public, ASR::deftypeType::Implementation,
             nullptr,
             false, false, false, false, false,
-            nullptr, 0, nullptr, 0,
+            nullptr, 0,
             false, false, false);
         ASR::symbol_t *fn_sym = ASR::down_cast<ASR::symbol_t>(fn);
         global_scope->add_symbol(fn_name, fn_sym);
diff --git a/src/libasr/pass/pass_utils.cpp b/src/libasr/pass/pass_utils.cpp
index 212ae3a4b2..9ce7b02798 100644
--- a/src/libasr/pass/pass_utils.cpp
+++ b/src/libasr/pass/pass_utils.cpp
@@ -743,7 +743,7 @@ namespace LCompilers {
                 ASR::abiType::Source, ASR::accessType::Public,
                 ASR::deftypeType::Implementation,
                 nullptr, false, false, false, false, false,
-                nullptr, 0, nullptr, 0, false, false, false);
+                nullptr, 0, false, false, false);
             global_scope->add_symbol(vector_copy_name, ASR::down_cast<ASR::symbol_t>(vector_copy_asr));
             return ASR::down_cast<ASR::symbol_t>(vector_copy_asr);
         }
diff --git a/src/lpython/semantics/python_ast_to_asr.cpp b/src/lpython/semantics/python_ast_to_asr.cpp
index 7836aa7ca2..c4466d2bd7 100644
--- a/src/lpython/semantics/python_ast_to_asr.cpp
+++ b/src/lpython/semantics/python_ast_to_asr.cpp
@@ -499,6 +499,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
     std::map<std::string, int> generic_func_nums;
     std::map<std::string, std::map<std::string, ASR::ttype_t*>> generic_func_subs;
     std::vector<ASR::symbol_t*> rt_vec;
+    std::map<std::string, std::string> context_map;
     SetChar dependencies;
     bool allow_implicit_casting;
     // Stores the name of imported functions and the modules they are imported from
@@ -1213,7 +1214,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
 
             if (ASRUtils::get_FunctionType(func)->m_is_restriction) {
                 rt_vec.push_back(s);
-            } else if (ASRUtils::get_FunctionType(func)->n_type_params > 0) {
+            } else if (ASRUtils::is_generic_function(s)) {
                 if (n_pos_args != func->n_args) {
                     std::string fnd = std::to_string(n_pos_args);
                     std::string org = std::to_string(func->n_args);
@@ -1449,7 +1450,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
             for (size_t j=0; j<rt->n_args; j++) {
                 ASR::ttype_t* rt_type = ASRUtils::expr_type(rt->m_args[j]);
                 ASR::ttype_t* rt_arg_type = ASRUtils::expr_type(rt_arg_func->m_args[j]);
-                if (ASRUtils::is_generic(*rt_type)) {
+                if (ASRUtils::is_type_parameter(*rt_type)) {
                     std::string rt_type_param = ASR::down_cast<ASR::TypeParameter_t>(
                         ASRUtils::get_type_parameter(rt_type))->m_param;
                     /**
@@ -1469,7 +1470,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
                 }
                 ASR::ttype_t* rt_return = ASRUtils::expr_type(rt->m_return_var);
                 ASR::ttype_t* rt_arg_return = ASRUtils::expr_type(rt_arg_func->m_return_var);
-                if (ASRUtils::is_generic(*rt_return)) {
+                if (ASRUtils::is_type_parameter(*rt_return)) {
                     std::string rt_return_param = ASR::down_cast<ASR::TypeParameter_t>(
                         ASRUtils::get_type_parameter(rt_return))->m_param;
                     if (!ASRUtils::check_equal_type(subs[rt_return_param], rt_arg_return)) {
@@ -1527,10 +1528,10 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
      *        arguments. If not, then instantiate a new function.
      */
     ASR::symbol_t* get_generic_function(std::map<std::string, ASR::ttype_t*> subs,
-            std::map<std::string, ASR::symbol_t*>& rt_subs, ASR::symbol_t *func) {
+            std::map<std::string, ASR::symbol_t*>& rt_subs, ASR::symbol_t *sym) {
         int new_function_num;
         ASR::symbol_t *t;
-        std::string func_name = ASRUtils::symbol_name(func);
+        std::string func_name = ASRUtils::symbol_name(sym);
         if (generic_func_nums.find(func_name) != generic_func_nums.end()) {
             new_function_num = generic_func_nums[func_name];
             for (int i=0; i<generic_func_nums[func_name]; i++) {
@@ -1562,8 +1563,15 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
         std::string new_func_name = "__asr_generic_" + func_name + "_"
             + std::to_string(new_function_num);
         generic_func_subs[new_func_name] = subs;
-        t = pass_instantiate_template(al, subs, rt_subs,
-            ASRUtils::symbol_parent_symtab(func), new_func_name, func);
+        SymbolTable *target_scope = ASRUtils::symbol_parent_symtab(sym);
+        t = pass_instantiate_symbol(al, context_map, subs, rt_subs,
+                target_scope, target_scope, new_func_name, sym);
+        if (ASR::is_a<ASR::Function_t>(*sym)) {
+            ASR::Function_t *f = ASR::down_cast<ASR::Function_t>(sym);
+            ASR::Function_t *new_f = ASR::down_cast<ASR::Function_t>(t);
+            t = pass_instantiate_function_body(al, context_map, subs, rt_subs,
+                target_scope, target_scope, new_f, f);
+        }
         dependencies.erase(s2c(al, func_name));
         dependencies.push_back(al, s2c(al, new_func_name));
         return t;
@@ -1753,7 +1761,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
                 ASR::ttype_t *type = ASRUtils::TYPE(ASR::make_FunctionType_t(al, loc, arg_types.p,
                         arg_types.size(), ret_type, ASR::abiType::Source,
                         ASR::deftypeType::Interface, nullptr, false, false,
-                        false, false, false, nullptr, 0, nullptr, 0, false));
+                        false, false, false, nullptr, 0, false));
                 return type;
             } else if (var_annotation == "set") {
                 if (AST::is_a<AST::Name_t>(*s->m_slice) || AST::is_a<AST::Subscript_t>(*s->m_slice)) {
@@ -4066,8 +4074,7 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
             /* n_body */ 0,
             /* a_return_var */ to_return,
             ASR::abiType::BindC, ASR::accessType::Public, ASR::deftypeType::Interface,
-            nullptr, false, false, false, false, false, /* a_type_parameters */ nullptr,
-            /* n_type_parameters */ 0, nullptr, 0, false, false, false);
+            nullptr, false, false, false, false, false, nullptr, 0, false, false, false);
         current_scope = parent_scope;
         return ASR::down_cast<ASR::symbol_t>(tmp);
     }
@@ -4116,8 +4123,6 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
         bool current_procedure_interface = false;
         bool overload = false;
         bool vectorize = false, is_inline = false, is_static = false;
-        Vec<ASR::ttype_t*> tps;
-        tps.reserve(al, x.m_args.n_args);
         bool is_restriction = false;
         bool is_deterministic = false;
         bool is_side_effect_free = false;
@@ -4216,29 +4221,6 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
                     + " cannot be intent InOut/Out", loc);
             }
 
-            // Set the function as generic if an argument is typed with a type parameter
-            if (ASRUtils::is_generic(*arg_type)) {
-                ASR::ttype_t* arg_type_type = ASRUtils::get_type_parameter(arg_type);
-                ASR::ttype_t *new_tt = ASRUtils::duplicate_type_without_dims(al, arg_type_type, arg_type_type->base.loc);
-                size_t current_size = tps.size();
-                if (current_size == 0) {
-                    tps.push_back(al, new_tt);
-                } else {
-                    bool not_found = true;
-                    for (size_t i = 0; i < current_size; i++) {
-                        ASR::TypeParameter_t *added_tp = ASR::down_cast<ASR::TypeParameter_t>(tps.p[i]);
-                        std::string new_param = ASR::down_cast<ASR::TypeParameter_t>(new_tt)->m_param;
-                        std::string added_param = added_tp->m_param;
-                        if (added_param.compare(new_param) == 0) {
-                            not_found = false; break;
-                        }
-                    }
-                    if (not_found) {
-                        tps.push_back(al, new_tt);
-                    }
-                }
-            }
-
             std::string arg_s = arg;
             ASR::expr_t *value = nullptr;
             ASR::expr_t *init_expr = nullptr;
@@ -4341,7 +4323,8 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
                     /* a_return_var */ ASRUtils::EXPR(return_var_ref),
                     current_procedure_abi_type,
                     s_access, deftype, bindc_name, vectorize, false, false, is_inline, is_static,
-                    tps.p, tps.size(), nullptr, 0, is_restriction, is_deterministic, is_side_effect_free,
+                    nullptr, 0,
+                    is_restriction, is_deterministic, is_side_effect_free,
                     module_file);
                     return_variable->m_type = return_type_;
             } else {
@@ -4369,7 +4352,8 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
                 current_procedure_abi_type,
                 s_access, deftype, bindc_name,
                 false, is_pure, is_module, is_inline, is_static,
-                tps.p, tps.size(), nullptr, 0, is_restriction, is_deterministic, is_side_effect_free,
+                nullptr, 0,
+                is_restriction, is_deterministic, is_side_effect_free,
                 module_file);
         }
         ASR::symbol_t * t = ASR::down_cast<ASR::symbol_t>(tmp);
diff --git a/tests/reference/asr-array_01_decl-39cf894.json b/tests/reference/asr-array_01_decl-39cf894.json
index d57f6e08e5..d331407196 100644
--- a/tests/reference/asr-array_01_decl-39cf894.json
+++ b/tests/reference/asr-array_01_decl-39cf894.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-array_01_decl-39cf894.stdout",
-    "stdout_hash": "0ed2d7c2ac7662ba69cecf74c9603d4fe54d316cce75dff50faedd95",
+    "stdout_hash": "150d5c201e389b6a146b7c7779048379519336a4f035fd7c4bc74a3f",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-array_01_decl-39cf894.stdout b/tests/reference/asr-array_01_decl-39cf894.stdout
index 0f8f47cc1a..836e06199e 100644
--- a/tests/reference/asr-array_01_decl-39cf894.stdout
+++ b/tests/reference/asr-array_01_decl-39cf894.stdout
@@ -75,7 +75,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [declare_arrays]
@@ -153,7 +152,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -263,7 +261,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -365,7 +362,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -469,7 +465,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -568,7 +563,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -777,7 +771,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [accept_i16_array
diff --git a/tests/reference/asr-array_02_decl-e8f6874.json b/tests/reference/asr-array_02_decl-e8f6874.json
index 9533ad7c24..7e2efc0511 100644
--- a/tests/reference/asr-array_02_decl-e8f6874.json
+++ b/tests/reference/asr-array_02_decl-e8f6874.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-array_02_decl-e8f6874.stdout",
-    "stdout_hash": "a2c51866c5ab8a93fac1be7ddfcb7b0b1749a8fa32102ef07692ef06",
+    "stdout_hash": "161c1c315c83399ca9f2f303efe354535ecf820e5529dcddc5b9a059",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-array_02_decl-e8f6874.stdout b/tests/reference/asr-array_02_decl-e8f6874.stdout
index 0b3b97cbad..1586d95d74 100644
--- a/tests/reference/asr-array_02_decl-e8f6874.stdout
+++ b/tests/reference/asr-array_02_decl-e8f6874.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [declare_arrays]
@@ -105,7 +104,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -195,7 +193,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -288,7 +285,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -385,7 +381,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -579,7 +574,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [accept_multidim_i32_array
diff --git a/tests/reference/asr-assert1-1ce92ea.json b/tests/reference/asr-assert1-1ce92ea.json
index dd066415f6..5e5858a464 100644
--- a/tests/reference/asr-assert1-1ce92ea.json
+++ b/tests/reference/asr-assert1-1ce92ea.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-assert1-1ce92ea.stdout",
-    "stdout_hash": "00b29b1b04860e7bdaae76da81c1237689ea5445ca16b8d95aa5af0a",
+    "stdout_hash": "ce8797c74c843e69622a590671ed85a981a9261278f1f83878327414",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-assert1-1ce92ea.stdout b/tests/reference/asr-assert1-1ce92ea.stdout
index 5e92bd2f26..6f1053a992 100644
--- a/tests/reference/asr-assert1-1ce92ea.stdout
+++ b/tests/reference/asr-assert1-1ce92ea.stdout
@@ -42,7 +42,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-assign1-886f049.json b/tests/reference/asr-assign1-886f049.json
index eb8e65f00b..6e23997392 100644
--- a/tests/reference/asr-assign1-886f049.json
+++ b/tests/reference/asr-assign1-886f049.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-assign1-886f049.stdout",
-    "stdout_hash": "4cdd1991fabb1b6a59d118593b39bf3eab57c06f0cbf95687cba61c4",
+    "stdout_hash": "c2ffd64d63b0780c568d6f28ec8306cade4e74588adc6f7db056603f",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-assign1-886f049.stdout b/tests/reference/asr-assign1-886f049.stdout
index 342e3b84c4..eff4af54bc 100644
--- a/tests/reference/asr-assign1-886f049.stdout
+++ b/tests/reference/asr-assign1-886f049.stdout
@@ -74,7 +74,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-bindc_01-6d521a9.json b/tests/reference/asr-bindc_01-6d521a9.json
index ce885b8088..7122ce80ea 100644
--- a/tests/reference/asr-bindc_01-6d521a9.json
+++ b/tests/reference/asr-bindc_01-6d521a9.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-bindc_01-6d521a9.stdout",
-    "stdout_hash": "ef615464fb81fc440bc39e3487efbdd7882b205558caea1e352923f1",
+    "stdout_hash": "6d5d14fd8d94205b92c250418a6b8f8db22282bd6d5f9d10677ef660",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-bindc_01-6d521a9.stdout b/tests/reference/asr-bindc_01-6d521a9.stdout
index 3390f05980..e546f1b4b1 100644
--- a/tests/reference/asr-bindc_01-6d521a9.stdout
+++ b/tests/reference/asr-bindc_01-6d521a9.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_issue_1781]
@@ -112,7 +111,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-bindc_02-bc1a7ea.json b/tests/reference/asr-bindc_02-bc1a7ea.json
index af9e3fa35b..d6f6f9b05c 100644
--- a/tests/reference/asr-bindc_02-bc1a7ea.json
+++ b/tests/reference/asr-bindc_02-bc1a7ea.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-bindc_02-bc1a7ea.stdout",
-    "stdout_hash": "402b386a1726249a6bdd026dc6629650b396fc3344e1e195a6fc2f0c",
+    "stdout_hash": "85f0714bd83ac6e159ac5495baa2359741e49e63b8ac049093b27f42",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-bindc_02-bc1a7ea.stdout b/tests/reference/asr-bindc_02-bc1a7ea.stdout
index e813d2a020..800ec31c9f 100644
--- a/tests/reference/asr-bindc_02-bc1a7ea.stdout
+++ b/tests/reference/asr-bindc_02-bc1a7ea.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -154,7 +153,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-c_interop1-cf2e9b4.json b/tests/reference/asr-c_interop1-cf2e9b4.json
index a189dc3d51..9295ebdefe 100644
--- a/tests/reference/asr-c_interop1-cf2e9b4.json
+++ b/tests/reference/asr-c_interop1-cf2e9b4.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-c_interop1-cf2e9b4.stdout",
-    "stdout_hash": "757caecdb05c5b81d055720854115486962711722f2ecc9f875436f8",
+    "stdout_hash": "9801d10f9a077b9618063bdc3ab6905625e0469a40b17a3f805419e7",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-c_interop1-cf2e9b4.stdout b/tests/reference/asr-c_interop1-cf2e9b4.stdout
index 39514a2a87..872e8d8b37 100644
--- a/tests/reference/asr-c_interop1-cf2e9b4.stdout
+++ b/tests/reference/asr-c_interop1-cf2e9b4.stdout
@@ -58,7 +58,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -156,7 +155,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -222,7 +220,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -334,7 +331,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -456,7 +452,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
diff --git a/tests/reference/asr-callback_01-df40fd5.json b/tests/reference/asr-callback_01-df40fd5.json
index 9062749b8e..119bb3268d 100644
--- a/tests/reference/asr-callback_01-df40fd5.json
+++ b/tests/reference/asr-callback_01-df40fd5.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-callback_01-df40fd5.stdout",
-    "stdout_hash": "2bdd798616b4da5d12ebf75f1d27501147fe58cb66b9cee1c5e82b55",
+    "stdout_hash": "6d2cb98041fd7ca591cdd1d108b8e33cf28596ae877e7483040b53f3",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-callback_01-df40fd5.stdout b/tests/reference/asr-callback_01-df40fd5.stdout
index c29f0157f0..ecc68a2dcf 100644
--- a/tests/reference/asr-callback_01-df40fd5.stdout
+++ b/tests/reference/asr-callback_01-df40fd5.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -180,7 +178,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -254,7 +251,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -328,7 +324,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
@@ -454,7 +449,6 @@
                                                         .false.
                                                         .false.
                                                         []
-                                                        []
                                                         .false.
                                                     )
                                                     []
@@ -497,7 +491,6 @@
                                             .false.
                                             .false.
                                             []
-                                            []
                                             .false.
                                         )
                                         (Integer 4)]
@@ -511,7 +504,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [func]
diff --git a/tests/reference/asr-cast-435c233.json b/tests/reference/asr-cast-435c233.json
index e4fd344e2a..7ce16f3c16 100644
--- a/tests/reference/asr-cast-435c233.json
+++ b/tests/reference/asr-cast-435c233.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-cast-435c233.stdout",
-    "stdout_hash": "cc127f301083413994dc8e24a23305ff00d4a8f7ca4be31c40079570",
+    "stdout_hash": "2eb7eb0ad87875a041581987ca9c61e0a10a7c9211300f7415798c18",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-cast-435c233.stdout b/tests/reference/asr-cast-435c233.stdout
index 5f9175f94a..30cb76ce62 100644
--- a/tests/reference/asr-cast-435c233.stdout
+++ b/tests/reference/asr-cast-435c233.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -125,7 +124,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [list]
diff --git a/tests/reference/asr-complex1-f26c460.json b/tests/reference/asr-complex1-f26c460.json
index c1630c3371..d6c3fb93a9 100644
--- a/tests/reference/asr-complex1-f26c460.json
+++ b/tests/reference/asr-complex1-f26c460.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-complex1-f26c460.stdout",
-    "stdout_hash": "de99620dc42ca3ffcf6c6ea17c0fd6cc4b3ef1b8e57955b258132949",
+    "stdout_hash": "f9bf5d60924825871eda0b6077447ff9650625d0d1f15c94f16ec0e6",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-complex1-f26c460.stdout b/tests/reference/asr-complex1-f26c460.stdout
index ce91ad373b..0f2e21219f 100644
--- a/tests/reference/asr-complex1-f26c460.stdout
+++ b/tests/reference/asr-complex1-f26c460.stdout
@@ -74,7 +74,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -367,7 +366,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_0__complex
diff --git a/tests/reference/asr-constants1-5828e8a.json b/tests/reference/asr-constants1-5828e8a.json
index c6ad778a0a..c103ddb444 100644
--- a/tests/reference/asr-constants1-5828e8a.json
+++ b/tests/reference/asr-constants1-5828e8a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-constants1-5828e8a.stdout",
-    "stdout_hash": "a9a0812986579c993168ea7493b6ae645586016f6211b1a222885882",
+    "stdout_hash": "5972929209ec0acc3a01d5d69cda225b3abf1e1f3852433688a91162",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-constants1-5828e8a.stdout b/tests/reference/asr-constants1-5828e8a.stdout
index f6044f087a..08b5b2212b 100644
--- a/tests/reference/asr-constants1-5828e8a.stdout
+++ b/tests/reference/asr-constants1-5828e8a.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_5__complex]
@@ -305,7 +304,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_9__complex]
@@ -510,7 +508,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [bin
@@ -721,7 +718,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -848,7 +844,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [divmod]
@@ -1013,7 +1008,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1137,7 +1131,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1280,7 +1273,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1604,7 +1596,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1674,7 +1665,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-dictionary1-a105a36.json b/tests/reference/asr-dictionary1-a105a36.json
index 0f8f012863..3bc6f3bfd1 100644
--- a/tests/reference/asr-dictionary1-a105a36.json
+++ b/tests/reference/asr-dictionary1-a105a36.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-dictionary1-a105a36.stdout",
-    "stdout_hash": "4a43b26cfe4ad667248c234e6294f3238fb49c3a28e8aed2b8c7e4bf",
+    "stdout_hash": "ac9f74e24e585a3382e6615e4f197e6ebda5ba099def0664967fbcc0",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-dictionary1-a105a36.stdout b/tests/reference/asr-dictionary1-a105a36.stdout
index aba83abce6..b434f5addf 100644
--- a/tests/reference/asr-dictionary1-a105a36.stdout
+++ b/tests/reference/asr-dictionary1-a105a36.stdout
@@ -48,7 +48,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -137,7 +136,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -283,7 +281,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -388,7 +385,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -493,7 +489,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -575,7 +570,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
diff --git a/tests/reference/asr-doconcurrentloop_01-3fdc189.json b/tests/reference/asr-doconcurrentloop_01-3fdc189.json
index 07a56275d2..2c02121d8a 100644
--- a/tests/reference/asr-doconcurrentloop_01-3fdc189.json
+++ b/tests/reference/asr-doconcurrentloop_01-3fdc189.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-doconcurrentloop_01-3fdc189.stdout",
-    "stdout_hash": "5282c9608209c2b1b3ade4cd713a364ff95b28deb9575110a3cf98cb",
+    "stdout_hash": "7442f71652c630ae36046e585b31c0983ecf34c08a4b373524d28d21",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-doconcurrentloop_01-3fdc189.stdout b/tests/reference/asr-doconcurrentloop_01-3fdc189.stdout
index ef34814506..b9dceaa9e2 100644
--- a/tests/reference/asr-doconcurrentloop_01-3fdc189.stdout
+++ b/tests/reference/asr-doconcurrentloop_01-3fdc189.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -174,7 +173,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [triad]
@@ -470,7 +468,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-elemental_01-b58df26.json b/tests/reference/asr-elemental_01-b58df26.json
index 74534a24fa..1cbf4cc635 100644
--- a/tests/reference/asr-elemental_01-b58df26.json
+++ b/tests/reference/asr-elemental_01-b58df26.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-elemental_01-b58df26.stdout",
-    "stdout_hash": "8c462e5e79ac1c25b510dd9e9a9e863259b3ae6e0032c9b0fa3eb01f",
+    "stdout_hash": "2b9dac7b800b8314765e8f12067cb0e64249c591c1c40c0da50d7da2",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-elemental_01-b58df26.stdout b/tests/reference/asr-elemental_01-b58df26.stdout
index 71b3712289..1120a8e08a 100644
--- a/tests/reference/asr-elemental_01-b58df26.stdout
+++ b/tests/reference/asr-elemental_01-b58df26.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [elemental_sin
@@ -189,7 +188,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [cos@__lpython_overloaded_0__cos
@@ -454,7 +452,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [verify1d_mul]
@@ -812,7 +809,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [sin@__lpython_overloaded_1__sin
@@ -1200,7 +1196,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [verify1d_sum]
@@ -1594,7 +1589,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [sin@__lpython_overloaded_1__sin
@@ -2121,7 +2115,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [sin@__lpython_overloaded_1__sin]
@@ -2315,7 +2308,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -2577,7 +2569,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -2956,7 +2947,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [cos@__lpython_overloaded_0__cos]
@@ -3332,7 +3322,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [sin@__lpython_overloaded_0__sin]
diff --git a/tests/reference/asr-expr1-8df2d66.json b/tests/reference/asr-expr1-8df2d66.json
index ab36819f1b..1d822feb22 100644
--- a/tests/reference/asr-expr1-8df2d66.json
+++ b/tests/reference/asr-expr1-8df2d66.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr1-8df2d66.stdout",
-    "stdout_hash": "56b8f8c02711499c1c34ac25cd926310f0c9906da3f89365e45ef641",
+    "stdout_hash": "f6ee3d989186cae0852628aac61f23c4831bdc638435bc489e4bdf7c",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr1-8df2d66.stdout b/tests/reference/asr-expr1-8df2d66.stdout
index 3f97322cd5..8a80d6e5f9 100644
--- a/tests/reference/asr-expr1-8df2d66.stdout
+++ b/tests/reference/asr-expr1-8df2d66.stdout
@@ -74,7 +74,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr10-efcbb1b.json b/tests/reference/asr-expr10-efcbb1b.json
index 34c4da2d23..c77869c746 100644
--- a/tests/reference/asr-expr10-efcbb1b.json
+++ b/tests/reference/asr-expr10-efcbb1b.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr10-efcbb1b.stdout",
-    "stdout_hash": "847703f5c41a26073772cd7f3cf6e48e37c85058665e06898ac30a53",
+    "stdout_hash": "8d59a0da990fca6c3f4717bca20d997e03a1f71c1e8396901d4bb9a3",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr10-efcbb1b.stdout b/tests/reference/asr-expr10-efcbb1b.stdout
index c383c5dd3e..a662166f43 100644
--- a/tests/reference/asr-expr10-efcbb1b.stdout
+++ b/tests/reference/asr-expr10-efcbb1b.stdout
@@ -168,7 +168,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_13__complex]
diff --git a/tests/reference/asr-expr11-9b91d35.json b/tests/reference/asr-expr11-9b91d35.json
index 6e8af27b2c..27fc53c56a 100644
--- a/tests/reference/asr-expr11-9b91d35.json
+++ b/tests/reference/asr-expr11-9b91d35.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr11-9b91d35.stdout",
-    "stdout_hash": "cc70b7b2d9324f7149b01e7312157d3b93de14528badc37d5c47c4ce",
+    "stdout_hash": "119588e11efc6683fe77260a150cf2622aad182814252c73dbc0b2e1",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr11-9b91d35.stdout b/tests/reference/asr-expr11-9b91d35.stdout
index 05b0c3935f..499a59590c 100644
--- a/tests/reference/asr-expr11-9b91d35.stdout
+++ b/tests/reference/asr-expr11-9b91d35.stdout
@@ -42,7 +42,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr12-5c5b71e.json b/tests/reference/asr-expr12-5c5b71e.json
index 038f4d17ef..8fc33371d3 100644
--- a/tests/reference/asr-expr12-5c5b71e.json
+++ b/tests/reference/asr-expr12-5c5b71e.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr12-5c5b71e.stdout",
-    "stdout_hash": "95867e1b5b3ee02bc70c27cf293d1df36ee4a9a99b7c82d4b103725a",
+    "stdout_hash": "097041cc0937b367c46a53c826b551d9e214ad4d3bad67c26704f69e",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr12-5c5b71e.stdout b/tests/reference/asr-expr12-5c5b71e.stdout
index bb464e2500..af0d2462b7 100644
--- a/tests/reference/asr-expr12-5c5b71e.stdout
+++ b/tests/reference/asr-expr12-5c5b71e.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test]
@@ -160,7 +158,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -251,7 +248,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr13-81bdb5a.json b/tests/reference/asr-expr13-81bdb5a.json
index 3dee2ec4c5..ac05d7a0e8 100644
--- a/tests/reference/asr-expr13-81bdb5a.json
+++ b/tests/reference/asr-expr13-81bdb5a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr13-81bdb5a.stdout",
-    "stdout_hash": "cef8b0b78e0b614cac8e0af3077ff4a4144e11cd08b4bfa162cebc51",
+    "stdout_hash": "ba567d1ba586da87a4eb2b60316b7db71bd4d8a027883e15e496456d",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr13-81bdb5a.stdout b/tests/reference/asr-expr13-81bdb5a.stdout
index cd9deef0ce..c852d45ed4 100644
--- a/tests/reference/asr-expr13-81bdb5a.stdout
+++ b/tests/reference/asr-expr13-81bdb5a.stdout
@@ -72,7 +72,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_9__complex
diff --git a/tests/reference/asr-expr2-2e78a12.json b/tests/reference/asr-expr2-2e78a12.json
index d0115816ae..fb9017f692 100644
--- a/tests/reference/asr-expr2-2e78a12.json
+++ b/tests/reference/asr-expr2-2e78a12.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr2-2e78a12.stdout",
-    "stdout_hash": "10046ca8163c858171a36d9bd8b28649e0522f73cdb70901c25cc6fd",
+    "stdout_hash": "2ff834685a67310d1ac788a1882209a5179ab17c41e4be40773a53a6",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr2-2e78a12.stdout b/tests/reference/asr-expr2-2e78a12.stdout
index 0bfa3a94ad..510df79e02 100644
--- a/tests/reference/asr-expr2-2e78a12.stdout
+++ b/tests/reference/asr-expr2-2e78a12.stdout
@@ -58,7 +58,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr4-cef6743.json b/tests/reference/asr-expr4-cef6743.json
index 3d609976bf..76521609ad 100644
--- a/tests/reference/asr-expr4-cef6743.json
+++ b/tests/reference/asr-expr4-cef6743.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr4-cef6743.stdout",
-    "stdout_hash": "f7c6ecc251ef1c58c127b17c546ce8c4e245aed34698705bbef1431f",
+    "stdout_hash": "666ba33cd5ae1e6c79478d456ed9d2ad73bf5497f8a541debadd4738",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr4-cef6743.stdout b/tests/reference/asr-expr4-cef6743.stdout
index 47b3f330ec..30d1e989c5 100644
--- a/tests/reference/asr-expr4-cef6743.stdout
+++ b/tests/reference/asr-expr4-cef6743.stdout
@@ -58,7 +58,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr5-645ffcc.json b/tests/reference/asr-expr5-645ffcc.json
index f72a00852e..890d1b68c6 100644
--- a/tests/reference/asr-expr5-645ffcc.json
+++ b/tests/reference/asr-expr5-645ffcc.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr5-645ffcc.stdout",
-    "stdout_hash": "07b1a7264701e719adaf8f1c790d9d5c29aa3e7d34df8ec2e69a3430",
+    "stdout_hash": "c7893c51dec391aa10b49e7839e0b95eff9b93332273faad253f758f",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr5-645ffcc.stdout b/tests/reference/asr-expr5-645ffcc.stdout
index 998881c445..52dd2fcc4b 100644
--- a/tests/reference/asr-expr5-645ffcc.stdout
+++ b/tests/reference/asr-expr5-645ffcc.stdout
@@ -42,7 +42,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr6-368e5ed.json b/tests/reference/asr-expr6-368e5ed.json
index 3a4c32028f..3255a6bb27 100644
--- a/tests/reference/asr-expr6-368e5ed.json
+++ b/tests/reference/asr-expr6-368e5ed.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr6-368e5ed.stdout",
-    "stdout_hash": "a6b7f9ad199db638b47516bd27d398559c4b792194718227f98fca45",
+    "stdout_hash": "eb681d9c5f81c0d94cd1f175bfb84ec29803a153327f1c7a5a17b7d4",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr6-368e5ed.stdout b/tests/reference/asr-expr6-368e5ed.stdout
index f98fe51fbc..bb68ad16a9 100644
--- a/tests/reference/asr-expr6-368e5ed.stdout
+++ b/tests/reference/asr-expr6-368e5ed.stdout
@@ -74,7 +74,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr7-480ba2f.json b/tests/reference/asr-expr7-480ba2f.json
index 3e72a43b04..92689fb784 100644
--- a/tests/reference/asr-expr7-480ba2f.json
+++ b/tests/reference/asr-expr7-480ba2f.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr7-480ba2f.stdout",
-    "stdout_hash": "c91e88c2ec02c7bd6a91484e9ad8480a3c521f79ff6b355476b7427a",
+    "stdout_hash": "602c62582bd7d87a4e830301c7768108cb3ccaa274d8881ed42fb49d",
     "stderr": "asr-expr7-480ba2f.stderr",
     "stderr_hash": "6e9790ac88db1a9ead8f64a91ba8a6605de67167037908a74b77be0c",
     "returncode": 0
diff --git a/tests/reference/asr-expr7-480ba2f.stdout b/tests/reference/asr-expr7-480ba2f.stdout
index fb376666e2..cf07212754 100644
--- a/tests/reference/asr-expr7-480ba2f.stdout
+++ b/tests/reference/asr-expr7-480ba2f.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -79,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_pow
@@ -165,7 +163,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [pow@__lpython_overloaded_0__pow]
@@ -301,7 +298,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [pow@__lpython_overloaded_0__pow]
diff --git a/tests/reference/asr-expr8-6beda60.json b/tests/reference/asr-expr8-6beda60.json
index 25b3ca8d5d..2f5fd7dded 100644
--- a/tests/reference/asr-expr8-6beda60.json
+++ b/tests/reference/asr-expr8-6beda60.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr8-6beda60.stdout",
-    "stdout_hash": "f6a53ad0fbda0b6a4bb7f169cca4f33c107d3eb074ce00ee08a10ca7",
+    "stdout_hash": "58473e829ded62de31415f3bcf5eb28fc2584c5b738f3e46cc886db9",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr8-6beda60.stdout b/tests/reference/asr-expr8-6beda60.stdout
index fa653cd109..316316c101 100644
--- a/tests/reference/asr-expr8-6beda60.stdout
+++ b/tests/reference/asr-expr8-6beda60.stdout
@@ -110,7 +110,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lpython_floordiv@__lpython_overloaded_10___lpython_floordiv]
diff --git a/tests/reference/asr-expr9-814e4bc.json b/tests/reference/asr-expr9-814e4bc.json
index 6ffcb93dfa..53e6cff449 100644
--- a/tests/reference/asr-expr9-814e4bc.json
+++ b/tests/reference/asr-expr9-814e4bc.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr9-814e4bc.stdout",
-    "stdout_hash": "47d45413d7c8b8d4bb546b506b6889c7977d894eec4f43be5ad69d39",
+    "stdout_hash": "8d85ccfee47553c2118a54edff3ec47d4defde4cdb7894409bb611fe",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr9-814e4bc.stdout b/tests/reference/asr-expr9-814e4bc.stdout
index 9c3008fffc..c5ebe90254 100644
--- a/tests/reference/asr-expr9-814e4bc.stdout
+++ b/tests/reference/asr-expr9-814e4bc.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_return_1
@@ -211,7 +209,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -300,7 +297,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -376,7 +372,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_01-211000e.json b/tests/reference/asr-expr_01-211000e.json
index 54a3a3a9d0..4af8c96908 100644
--- a/tests/reference/asr-expr_01-211000e.json
+++ b/tests/reference/asr-expr_01-211000e.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_01-211000e.stdout",
-    "stdout_hash": "e1a6afc787c2cd72949fb670d079f3f56eeb34d7fe64262efed78c9e",
+    "stdout_hash": "fa6280a9e657d395ed07ee267ab585c292f4802a89a584c23b80e38a",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_01-211000e.stdout b/tests/reference/asr-expr_01-211000e.stdout
index 226f3ce4da..5554c9a997 100644
--- a/tests/reference/asr-expr_01-211000e.stdout
+++ b/tests/reference/asr-expr_01-211000e.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -127,7 +126,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_01-a0d4829.json b/tests/reference/asr-expr_01-a0d4829.json
index e1a8902c8a..40ba474d4b 100644
--- a/tests/reference/asr-expr_01-a0d4829.json
+++ b/tests/reference/asr-expr_01-a0d4829.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_01-a0d4829.stdout",
-    "stdout_hash": "537670def7a547569237e8d89f0141dcdd39d475695b47e10aeb50ef",
+    "stdout_hash": "0837af084448c8d23412f62163b528db23d05a3ff5d6a6b7928de274",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_01-a0d4829.stdout b/tests/reference/asr-expr_01-a0d4829.stdout
index a00900a0c9..9890a39517 100644
--- a/tests/reference/asr-expr_01-a0d4829.stdout
+++ b/tests/reference/asr-expr_01-a0d4829.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -112,7 +111,6 @@
                                         .true.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -204,7 +202,6 @@
                                         .true.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -295,7 +292,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add
diff --git a/tests/reference/asr-expr_05-3a37324.json b/tests/reference/asr-expr_05-3a37324.json
index 28d113b93a..c7eb787304 100644
--- a/tests/reference/asr-expr_05-3a37324.json
+++ b/tests/reference/asr-expr_05-3a37324.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_05-3a37324.stdout",
-    "stdout_hash": "1efa3b239c9ac2c54491409785faebd9472ec91fae790d33dd7d8c49",
+    "stdout_hash": "2b6332dd9b8b5da3a21921e56896e648c5e3dfb68c8a48bf3bee9b46",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_05-3a37324.stdout b/tests/reference/asr-expr_05-3a37324.stdout
index 9934438bba..8b2090800b 100644
--- a/tests/reference/asr-expr_05-3a37324.stdout
+++ b/tests/reference/asr-expr_05-3a37324.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -305,7 +304,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_multiply
@@ -1512,7 +1510,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_mod@__lpython_overloaded_2___mod]
@@ -1606,7 +1603,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_07-7742668.json b/tests/reference/asr-expr_07-7742668.json
index 398f3a51ba..f04ed8bfbc 100644
--- a/tests/reference/asr-expr_07-7742668.json
+++ b/tests/reference/asr-expr_07-7742668.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_07-7742668.stdout",
-    "stdout_hash": "371ae678f6bf498e7e5ad335acfe3120ca069cdb42e8fa903e2b27d9",
+    "stdout_hash": "3c2e1854a6a30add9fdabaf1e03187718d3119071bae936111f747cb",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_07-7742668.stdout b/tests/reference/asr-expr_07-7742668.stdout
index 16525c04d3..d7e3e954bc 100644
--- a/tests/reference/asr-expr_07-7742668.stdout
+++ b/tests/reference/asr-expr_07-7742668.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
@@ -86,7 +85,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -260,7 +258,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -367,7 +364,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_09-f3e89c8.json b/tests/reference/asr-expr_09-f3e89c8.json
index 29f85ebd05..be8a60b346 100644
--- a/tests/reference/asr-expr_09-f3e89c8.json
+++ b/tests/reference/asr-expr_09-f3e89c8.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_09-f3e89c8.stdout",
-    "stdout_hash": "abfd11d7d750cff1ceac84485174e41a8c5f892fb4d54b46bbb10abe",
+    "stdout_hash": "a2e5d05312c740e943f2a2de0641f1311ce3e8718b46145d0ea26601",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_09-f3e89c8.stdout b/tests/reference/asr-expr_09-f3e89c8.stdout
index fea17487f6..dc7ee70ebf 100644
--- a/tests/reference/asr-expr_09-f3e89c8.stdout
+++ b/tests/reference/asr-expr_09-f3e89c8.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_multiple_assign_1
@@ -109,7 +108,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -254,7 +252,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -549,7 +546,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_10-d39708c.json b/tests/reference/asr-expr_10-d39708c.json
index 336dcdad56..9d4421da1f 100644
--- a/tests/reference/asr-expr_10-d39708c.json
+++ b/tests/reference/asr-expr_10-d39708c.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_10-d39708c.stdout",
-    "stdout_hash": "72d11749ec63b35265b5d523f904ceb0fd4a1381acae6111b3443912",
+    "stdout_hash": "b7e632ba002dc30922be9afaf8e6cf6bff195c030b1244cc9f65e6bf",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_10-d39708c.stdout b/tests/reference/asr-expr_10-d39708c.stdout
index e73f9ca7db..763b85738c 100644
--- a/tests/reference/asr-expr_10-d39708c.stdout
+++ b/tests/reference/asr-expr_10-d39708c.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_fn1]
@@ -79,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -131,7 +129,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -215,7 +212,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g
diff --git a/tests/reference/asr-expr_12-6769be0.json b/tests/reference/asr-expr_12-6769be0.json
index cd5b93ae61..f8f84fb01a 100644
--- a/tests/reference/asr-expr_12-6769be0.json
+++ b/tests/reference/asr-expr_12-6769be0.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_12-6769be0.stdout",
-    "stdout_hash": "edb58209d93cb516379a8b13eeb7811624ba310b13a37f10daab3142",
+    "stdout_hash": "15f1a6c802222c6b2369866cabf6df1e1a6a83832ed71477adfe478b",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_12-6769be0.stdout b/tests/reference/asr-expr_12-6769be0.stdout
index 3247877c97..98e5bf06f1 100644
--- a/tests/reference/asr-expr_12-6769be0.stdout
+++ b/tests/reference/asr-expr_12-6769be0.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -93,7 +92,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -213,7 +211,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g
@@ -325,7 +322,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-expr_14-f2bd343.json b/tests/reference/asr-expr_14-f2bd343.json
index 290906955e..063b62961e 100644
--- a/tests/reference/asr-expr_14-f2bd343.json
+++ b/tests/reference/asr-expr_14-f2bd343.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_14-f2bd343.stdout",
-    "stdout_hash": "a83dcd1bbecc4c106cfeb791fc0f843020bc41a99401bd29568afdb9",
+    "stdout_hash": "c4cc37daa39b21bb008134a34a63db13ea16d0c708059750f8e62024",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-expr_14-f2bd343.stdout b/tests/reference/asr-expr_14-f2bd343.stdout
index a430647b47..37071c7db4 100644
--- a/tests/reference/asr-expr_14-f2bd343.stdout
+++ b/tests/reference/asr-expr_14-f2bd343.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_divide]
@@ -351,7 +350,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-func_inline_01-56af272.json b/tests/reference/asr-func_inline_01-56af272.json
index fd160456c5..25053d7409 100644
--- a/tests/reference/asr-func_inline_01-56af272.json
+++ b/tests/reference/asr-func_inline_01-56af272.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-func_inline_01-56af272.stdout",
-    "stdout_hash": "50346ec9a195f3ac0ad6445126d039865fc2e50b8fc6f22f3bf2e0f6",
+    "stdout_hash": "2e7ef7f86099aa9cf8dd6bdfe8696fb6d4b4810ed266b97d7d3da502",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-func_inline_01-56af272.stdout b/tests/reference/asr-func_inline_01-56af272.stdout
index c83d2a6dd0..c960c5cfe1 100644
--- a/tests/reference/asr-func_inline_01-56af272.stdout
+++ b/tests/reference/asr-func_inline_01-56af272.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [fib]
@@ -226,7 +224,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [fib]
diff --git a/tests/reference/asr-generics_01-d616074.json b/tests/reference/asr-generics_01-d616074.json
index 48adc0efa8..a23a192992 100644
--- a/tests/reference/asr-generics_01-d616074.json
+++ b/tests/reference/asr-generics_01-d616074.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_01-d616074.stdout",
-    "stdout_hash": "ce23bddda09369bec0a5ec9c9babab4c9a5e051941e53913b57edf15",
+    "stdout_hash": "70344c6286bad94b92e7194878e41e52a727ec3048aa65262da655ee",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_01-d616074.stdout b/tests/reference/asr-generics_01-d616074.stdout
index 1325dd6bc7..2ebbf63796 100644
--- a/tests/reference/asr-generics_01-d616074.stdout
+++ b/tests/reference/asr-generics_01-d616074.stdout
@@ -93,7 +93,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_integer]
@@ -187,7 +186,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_string]
@@ -233,7 +231,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_f_0
@@ -378,9 +375,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
@@ -462,7 +456,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -554,7 +547,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -656,9 +648,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         [2 add]
                                         .false.
                                     )
diff --git a/tests/reference/asr-generics_02-e2ea5c9.json b/tests/reference/asr-generics_02-e2ea5c9.json
index c3982b6f34..c053e69444 100644
--- a/tests/reference/asr-generics_02-e2ea5c9.json
+++ b/tests/reference/asr-generics_02-e2ea5c9.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_02-e2ea5c9.stdout",
-    "stdout_hash": "a8545ad9428ab658446f2de30b51caa0ee5a5d80f6a067e5e28adf86",
+    "stdout_hash": "c407c95fb97ed73b63c30e1f5dc88dfa72e541ac487489c4a82c9f8e",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_02-e2ea5c9.stdout b/tests/reference/asr-generics_02-e2ea5c9.stdout
index ef3c172bbe..a8afe80db6 100644
--- a/tests/reference/asr-generics_02-e2ea5c9.stdout
+++ b/tests/reference/asr-generics_02-e2ea5c9.stdout
@@ -93,7 +93,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -152,7 +151,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_swap_0]
@@ -247,9 +245,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .false.
                                     )
diff --git a/tests/reference/asr-generics_array_01-682b1b2.json b/tests/reference/asr-generics_array_01-682b1b2.json
index 50d2f79f9d..0ad284da2b 100644
--- a/tests/reference/asr-generics_array_01-682b1b2.json
+++ b/tests/reference/asr-generics_array_01-682b1b2.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_array_01-682b1b2.stdout",
-    "stdout_hash": "76596f839c540756d18e65a811040c0e92993d7b8c09f4045131c86e",
+    "stdout_hash": "42b21ffdf7b39ef4d9ba925d85158d6f58e65b1395be155f2785cb6c",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_array_01-682b1b2.stdout b/tests/reference/asr-generics_array_01-682b1b2.stdout
index 78acb030a2..9d72710ccb 100644
--- a/tests/reference/asr-generics_array_01-682b1b2.stdout
+++ b/tests/reference/asr-generics_array_01-682b1b2.stdout
@@ -103,7 +103,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -162,7 +161,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [use_array]
@@ -268,9 +266,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .false.
                                     )
@@ -370,7 +365,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_f_0]
diff --git a/tests/reference/asr-generics_array_02-22c8dc1.json b/tests/reference/asr-generics_array_02-22c8dc1.json
index f56e98d363..47d89aa367 100644
--- a/tests/reference/asr-generics_array_02-22c8dc1.json
+++ b/tests/reference/asr-generics_array_02-22c8dc1.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_array_02-22c8dc1.stdout",
-    "stdout_hash": "94d280bd4258a8d1ec509ee636fbd75a59f475fdda137f23a3f713d5",
+    "stdout_hash": "3143f1c9f013457cb4318f098e426c314ef33fcb82bba14b9effa58e",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_array_02-22c8dc1.stdout b/tests/reference/asr-generics_array_02-22c8dc1.stdout
index 8b1692889b..73d8abd93d 100644
--- a/tests/reference/asr-generics_array_02-22c8dc1.stdout
+++ b/tests/reference/asr-generics_array_02-22c8dc1.stdout
@@ -159,7 +159,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_integer]
@@ -370,7 +369,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_float]
@@ -467,7 +465,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main]
@@ -563,9 +560,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
@@ -647,7 +641,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -739,7 +732,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -906,9 +898,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         [2 add]
                                         .false.
                                     )
@@ -1099,7 +1088,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_g_0
diff --git a/tests/reference/asr-generics_array_03-fb3706c.json b/tests/reference/asr-generics_array_03-fb3706c.json
index 07b4108938..d2a4c640d9 100644
--- a/tests/reference/asr-generics_array_03-fb3706c.json
+++ b/tests/reference/asr-generics_array_03-fb3706c.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_array_03-fb3706c.stdout",
-    "stdout_hash": "8ce9c6bdb35a4f5afac6d9608e85d478693d4953b7affe504e4cbb48",
+    "stdout_hash": "562b83bcbd20ecf3c1e7483b72264c9a0e1e10335d885eab90464430",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_array_03-fb3706c.stdout b/tests/reference/asr-generics_array_03-fb3706c.stdout
index 2f67f6f704..4f2d95b566 100644
--- a/tests/reference/asr-generics_array_03-fb3706c.stdout
+++ b/tests/reference/asr-generics_array_03-fb3706c.stdout
@@ -252,7 +252,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_integer]
@@ -582,7 +581,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [add_float]
@@ -705,7 +703,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main]
@@ -801,9 +798,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
@@ -885,7 +879,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -977,7 +970,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1241,9 +1233,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         [2 add]
                                         .false.
                                     )
@@ -1532,7 +1521,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_g_0
diff --git a/tests/reference/asr-generics_list_01-39c4044.json b/tests/reference/asr-generics_list_01-39c4044.json
index bf602ac1a1..1e39f1d36d 100644
--- a/tests/reference/asr-generics_list_01-39c4044.json
+++ b/tests/reference/asr-generics_list_01-39c4044.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-generics_list_01-39c4044.stdout",
-    "stdout_hash": "f63989f4e5ea4349e885b1043eb742df71cb0d13aaed6ae28ebc29a3",
+    "stdout_hash": "8fb0ba5bf10eb6a7784edd6e2b2ab8f89784f3ec020edfab2b1c79af",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-generics_list_01-39c4044.stdout b/tests/reference/asr-generics_list_01-39c4044.stdout
index 8c200af2b1..f59e6a686f 100644
--- a/tests/reference/asr-generics_list_01-39c4044.stdout
+++ b/tests/reference/asr-generics_list_01-39c4044.stdout
@@ -128,7 +128,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [empty_integer
@@ -334,7 +333,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [empty_float
@@ -540,7 +538,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [empty_string
@@ -663,7 +660,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [__asr_generic_mean_0
@@ -833,9 +829,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
@@ -917,7 +910,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1009,7 +1001,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1101,7 +1092,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1195,9 +1185,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
@@ -1279,7 +1266,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1376,7 +1362,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1478,7 +1463,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1550,7 +1534,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1621,7 +1604,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1689,7 +1671,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1817,9 +1798,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         [2 zero
                                         2 add
                                         2 div]
@@ -1991,9 +1969,6 @@
                                         .false.
                                         .false.
                                         .false.
-                                        [(TypeParameter
-                                            T
-                                        )]
                                         []
                                         .true.
                                     )
diff --git a/tests/reference/asr-global_scope1-354e217.json b/tests/reference/asr-global_scope1-354e217.json
index a8b886dcd8..3b137264fb 100644
--- a/tests/reference/asr-global_scope1-354e217.json
+++ b/tests/reference/asr-global_scope1-354e217.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-global_scope1-354e217.stdout",
-    "stdout_hash": "09607beca31352c346dad19af56cc5705e1c59b3686b575cf254a29e",
+    "stdout_hash": "2fdd4daf8acf640cf0b372c9e195db98167791a30a3b59bc8910f47d",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-global_scope1-354e217.stdout b/tests/reference/asr-global_scope1-354e217.stdout
index ee1c8082ad..caa5171d67 100644
--- a/tests/reference/asr-global_scope1-354e217.stdout
+++ b/tests/reference/asr-global_scope1-354e217.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-global_syms_01-273906f.json b/tests/reference/asr-global_syms_01-273906f.json
index b67b98c0bf..ac9bf99949 100644
--- a/tests/reference/asr-global_syms_01-273906f.json
+++ b/tests/reference/asr-global_syms_01-273906f.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-global_syms_01-273906f.stdout",
-    "stdout_hash": "fef710e1963c3757c6312101fa9189ccfa57f26c4ad0f8a6beece6a1",
+    "stdout_hash": "8f13a92c5b5e8d5b5a7c14179b98ac162fb65c82403f1489907fe56f",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-global_syms_01-273906f.stdout b/tests/reference/asr-global_syms_01-273906f.stdout
index 7143958b1e..7969a81f6b 100644
--- a/tests/reference/asr-global_syms_01-273906f.stdout
+++ b/tests/reference/asr-global_syms_01-273906f.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_global_symbols]
@@ -101,7 +100,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-intent_01-66824bc.json b/tests/reference/asr-intent_01-66824bc.json
index 4e9d528595..c981754321 100644
--- a/tests/reference/asr-intent_01-66824bc.json
+++ b/tests/reference/asr-intent_01-66824bc.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-intent_01-66824bc.stdout",
-    "stdout_hash": "abf3bda7a4cff1b7b06759d2c7ccd91b46e2ae52f3e65087cd1dce64",
+    "stdout_hash": "415fb57ee7c986fc49e7c0801edae4e37d6ea06143d27a998c50ab5c",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-intent_01-66824bc.stdout b/tests/reference/asr-intent_01-66824bc.stdout
index 9676893a56..d668611200 100644
--- a/tests/reference/asr-intent_01-66824bc.stdout
+++ b/tests/reference/asr-intent_01-66824bc.stdout
@@ -148,7 +148,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-list1-770ba33.json b/tests/reference/asr-list1-770ba33.json
index 0c60856441..dfd4479604 100644
--- a/tests/reference/asr-list1-770ba33.json
+++ b/tests/reference/asr-list1-770ba33.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-list1-770ba33.stdout",
-    "stdout_hash": "03fce82376d32a4269e9eb2f7918c36a3c1b5ac57220de8f1d0d843b",
+    "stdout_hash": "bdbe744ed90d9e0317c8370db8b793bff41ddd23c7ee9c0ccf9b1360",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-list1-770ba33.stdout b/tests/reference/asr-list1-770ba33.stdout
index 71d992ae2d..382d2be8eb 100644
--- a/tests/reference/asr-list1-770ba33.stdout
+++ b/tests/reference/asr-list1-770ba33.stdout
@@ -154,7 +154,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-loop1-10d3109.json b/tests/reference/asr-loop1-10d3109.json
index dc94ccc38f..e3615d3444 100644
--- a/tests/reference/asr-loop1-10d3109.json
+++ b/tests/reference/asr-loop1-10d3109.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-loop1-10d3109.stdout",
-    "stdout_hash": "ffcedd1fc391b17bc9d6de4ee16fb560b4289155a1c77896f4d9ec8f",
+    "stdout_hash": "7d5deebc5f24162766b5c39fbfd88f6385b8d3343f851814f48dbc57",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-loop1-10d3109.stdout b/tests/reference/asr-loop1-10d3109.stdout
index f15de29d5a..88810fab74 100644
--- a/tests/reference/asr-loop1-10d3109.stdout
+++ b/tests/reference/asr-loop1-10d3109.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_factorial_1
@@ -211,7 +209,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -364,7 +361,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -483,7 +479,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-loop3-a579196.json b/tests/reference/asr-loop3-a579196.json
index b557f3c871..fd61395be8 100644
--- a/tests/reference/asr-loop3-a579196.json
+++ b/tests/reference/asr-loop3-a579196.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-loop3-a579196.stdout",
-    "stdout_hash": "9d00f49d65ad3f55d5c551bc92dcb6944390fa7a58298fe7af54f66f",
+    "stdout_hash": "871e9f9402932018e5122327d38ca7822eb61596f04e0bdc4e03ad7a",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-loop3-a579196.stdout b/tests/reference/asr-loop3-a579196.stdout
index 4bd2bca840..d192935551 100644
--- a/tests/reference/asr-loop3-a579196.stdout
+++ b/tests/reference/asr-loop3-a579196.stdout
@@ -42,7 +42,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-loop4-3d3216e.json b/tests/reference/asr-loop4-3d3216e.json
index d1340d7352..98d3a9e224 100644
--- a/tests/reference/asr-loop4-3d3216e.json
+++ b/tests/reference/asr-loop4-3d3216e.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-loop4-3d3216e.stdout",
-    "stdout_hash": "b1da5c3e846019eb29d1d402d4c0d2b292b4e6e1974cc34db64672b3",
+    "stdout_hash": "6e32b58c4dabfc67bb3b1f8c9b091b80281d761246a1a889f1300f2b",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-loop4-3d3216e.stdout b/tests/reference/asr-loop4-3d3216e.stdout
index 1f3738ecfa..f2d9fa45e2 100644
--- a/tests/reference/asr-loop4-3d3216e.stdout
+++ b/tests/reference/asr-loop4-3d3216e.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_for]
@@ -79,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-modules_02-ec92e6f.json b/tests/reference/asr-modules_02-ec92e6f.json
index 34c8c81fb5..971935664a 100644
--- a/tests/reference/asr-modules_02-ec92e6f.json
+++ b/tests/reference/asr-modules_02-ec92e6f.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-modules_02-ec92e6f.stdout",
-    "stdout_hash": "2173161c2e78b6e32a0990949f27b95aee337583d5c1875d6a02ff09",
+    "stdout_hash": "51c58e43d231fdb96250975fb6064062d7855cb9da9fad762681ad8d",
     "stderr": "asr-modules_02-ec92e6f.stderr",
     "stderr_hash": "132af04271d3bfd523848990e734bfa3c0aed6e4b85ec4eb87e66720",
     "returncode": 0
diff --git a/tests/reference/asr-modules_02-ec92e6f.stdout b/tests/reference/asr-modules_02-ec92e6f.stdout
index 033eb26b69..c17296e4a0 100644
--- a/tests/reference/asr-modules_02-ec92e6f.stdout
+++ b/tests/reference/asr-modules_02-ec92e6f.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -89,7 +88,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -189,7 +187,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -256,7 +253,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-print_02-afbe092.json b/tests/reference/asr-print_02-afbe092.json
index 2de461f7ad..5e145cbc74 100644
--- a/tests/reference/asr-print_02-afbe092.json
+++ b/tests/reference/asr-print_02-afbe092.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-print_02-afbe092.stdout",
-    "stdout_hash": "b00afab47f30305df35379c5890ae5f5e8f0bb186f10319a58d9670c",
+    "stdout_hash": "2167cccb2e69fcd2e647a005c22513d7f3fdc0f209926e7b8f14829d",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-print_02-afbe092.stdout b/tests/reference/asr-print_02-afbe092.stdout
index 426ca08080..0ece65cd03 100644
--- a/tests/reference/asr-print_02-afbe092.stdout
+++ b/tests/reference/asr-print_02-afbe092.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
@@ -193,7 +191,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -501,7 +498,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -906,7 +902,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -2715,7 +2710,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-print_list_tuple_03-9de3736.json b/tests/reference/asr-print_list_tuple_03-9de3736.json
index a7d94015a9..5af8347ef6 100644
--- a/tests/reference/asr-print_list_tuple_03-9de3736.json
+++ b/tests/reference/asr-print_list_tuple_03-9de3736.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-print_list_tuple_03-9de3736.stdout",
-    "stdout_hash": "92d08b8c3ab140bef5bf2d1dcaf246380ce858be833cdd5e669131bd",
+    "stdout_hash": "aea957929d0d4b4d8a2a6fd6053f13fe2bab7a0c1f28ef02cdfea5c5",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-print_list_tuple_03-9de3736.stdout b/tests/reference/asr-print_list_tuple_03-9de3736.stdout
index 0369373457..89f0450f61 100644
--- a/tests/reference/asr-print_list_tuple_03-9de3736.stdout
+++ b/tests/reference/asr-print_list_tuple_03-9de3736.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -106,7 +105,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-set1-b7b913a.json b/tests/reference/asr-set1-b7b913a.json
index 5ebed27b58..244a944ea3 100644
--- a/tests/reference/asr-set1-b7b913a.json
+++ b/tests/reference/asr-set1-b7b913a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-set1-b7b913a.stdout",
-    "stdout_hash": "1afecabdf3a9250ea4e3cb09e6c7c2f1aefb8b300f55454643c3fad1",
+    "stdout_hash": "64366c80a466b43ffcd25c03d279a6c1b8a17e7e3fa53b6cd7733271",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-set1-b7b913a.stdout b/tests/reference/asr-set1-b7b913a.stdout
index ddc8685294..22196244c7 100644
--- a/tests/reference/asr-set1-b7b913a.stdout
+++ b/tests/reference/asr-set1-b7b913a.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-structs_01-66dc2c9.json b/tests/reference/asr-structs_01-66dc2c9.json
index d78b4213f3..de70ebf67f 100644
--- a/tests/reference/asr-structs_01-66dc2c9.json
+++ b/tests/reference/asr-structs_01-66dc2c9.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_01-66dc2c9.stdout",
-    "stdout_hash": "2e7d78c0797931c0a1f4b7e46f36a9a884f6d6c5945e38bab4a82bc3",
+    "stdout_hash": "8350bfcc6eb01320f7073cb23ff5c248064a14cc3041a9a5283ad7cd",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_01-66dc2c9.stdout b/tests/reference/asr-structs_01-66dc2c9.stdout
index bdde43bc5a..eb4cc011d8 100644
--- a/tests/reference/asr-structs_01-66dc2c9.stdout
+++ b/tests/reference/asr-structs_01-66dc2c9.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main0]
@@ -132,7 +131,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-structs_01-be14d49.json b/tests/reference/asr-structs_01-be14d49.json
index ea1befc7fe..4242615438 100644
--- a/tests/reference/asr-structs_01-be14d49.json
+++ b/tests/reference/asr-structs_01-be14d49.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_01-be14d49.stdout",
-    "stdout_hash": "d11b89744fbef93d956fc7dd696b80b85f4fa7bb7c39f6b162830fbb",
+    "stdout_hash": "adebe7528e93ac10486a55c301a3d3f7a391946ce5c633a4a3811872",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_01-be14d49.stdout b/tests/reference/asr-structs_01-be14d49.stdout
index 2f69200645..65a625a419 100644
--- a/tests/reference/asr-structs_01-be14d49.stdout
+++ b/tests/reference/asr-structs_01-be14d49.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -134,7 +133,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -234,7 +232,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -304,7 +301,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
diff --git a/tests/reference/asr-structs_02-2ab459a.json b/tests/reference/asr-structs_02-2ab459a.json
index d9ab1195fd..d5155498e8 100644
--- a/tests/reference/asr-structs_02-2ab459a.json
+++ b/tests/reference/asr-structs_02-2ab459a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_02-2ab459a.stdout",
-    "stdout_hash": "aa265d11a81eb12446802b13a33b5ac14a6000ed9c6a369e4040263c",
+    "stdout_hash": "1d4b53a95e74aa0e77fd05e9a1935431975ac4c53bedfc0812d630c5",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_02-2ab459a.stdout b/tests/reference/asr-structs_02-2ab459a.stdout
index efb9654a2d..00e0ea93cc 100644
--- a/tests/reference/asr-structs_02-2ab459a.stdout
+++ b/tests/reference/asr-structs_02-2ab459a.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -200,7 +199,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -346,7 +344,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
diff --git a/tests/reference/asr-structs_03-0cef911.json b/tests/reference/asr-structs_03-0cef911.json
index 4071349d3b..d45a2d896d 100644
--- a/tests/reference/asr-structs_03-0cef911.json
+++ b/tests/reference/asr-structs_03-0cef911.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_03-0cef911.stdout",
-    "stdout_hash": "6fe7074b2b1ad8e7782748f60c5c2ac3c799a1de4c6122b8c4e05736",
+    "stdout_hash": "43977b9e3eda91739650dc655739e11667e846ad694b12ed115768da",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_03-0cef911.stdout b/tests/reference/asr-structs_03-0cef911.stdout
index 56a6992995..93bb3992b8 100644
--- a/tests/reference/asr-structs_03-0cef911.stdout
+++ b/tests/reference/asr-structs_03-0cef911.stdout
@@ -78,7 +78,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -138,7 +137,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -228,7 +226,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
diff --git a/tests/reference/asr-structs_04-387747b.json b/tests/reference/asr-structs_04-387747b.json
index 0656138ca5..b9d8212488 100644
--- a/tests/reference/asr-structs_04-387747b.json
+++ b/tests/reference/asr-structs_04-387747b.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_04-387747b.stdout",
-    "stdout_hash": "8efb9ae157ab6d11f468dd98317b71d69ad9c7e016c1f63b204f39a2",
+    "stdout_hash": "f8877e9ca9bbbc7205f14bffe5fe27e294cfdf48be08a29d23f703de",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_04-387747b.stdout b/tests/reference/asr-structs_04-387747b.stdout
index b94abe4c53..5e727353f0 100644
--- a/tests/reference/asr-structs_04-387747b.stdout
+++ b/tests/reference/asr-structs_04-387747b.stdout
@@ -150,7 +150,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -206,7 +205,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -394,7 +392,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
diff --git a/tests/reference/asr-structs_05-fa98307.json b/tests/reference/asr-structs_05-fa98307.json
index 84ccf595c9..b7fb78a2d8 100644
--- a/tests/reference/asr-structs_05-fa98307.json
+++ b/tests/reference/asr-structs_05-fa98307.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_05-fa98307.stdout",
-    "stdout_hash": "8ac98e387158fa5890e8793b137736eab7525764f7fa897f05ecdb53",
+    "stdout_hash": "4b806b198de30dfa11c6e311ab3d3d96dad325f3c43adb900832c0fa",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_05-fa98307.stdout b/tests/reference/asr-structs_05-fa98307.stdout
index ce5e692d27..76e323fddb 100644
--- a/tests/reference/asr-structs_05-fa98307.stdout
+++ b/tests/reference/asr-structs_05-fa98307.stdout
@@ -168,7 +168,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [g]
@@ -227,7 +226,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [verify
@@ -492,7 +490,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -641,7 +638,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -970,7 +966,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-structs_16-44de89a.json b/tests/reference/asr-structs_16-44de89a.json
index 280229934b..dc67ec519d 100644
--- a/tests/reference/asr-structs_16-44de89a.json
+++ b/tests/reference/asr-structs_16-44de89a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-structs_16-44de89a.stdout",
-    "stdout_hash": "7fc8afb58faabcc512a90dffbb23681623c8af901f42a62f9148de42",
+    "stdout_hash": "62d4d544128cae35648865fc1145c9837268ece68629ffc4784c45a8",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-structs_16-44de89a.stdout b/tests/reference/asr-structs_16-44de89a.stdout
index f502d0f5e9..b2b8ed8bd1 100644
--- a/tests/reference/asr-structs_16-44de89a.stdout
+++ b/tests/reference/asr-structs_16-44de89a.stdout
@@ -128,7 +128,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_ordering]
@@ -210,7 +209,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-subscript1-1acfc19.json b/tests/reference/asr-subscript1-1acfc19.json
index b9ab230e01..acbacd1973 100644
--- a/tests/reference/asr-subscript1-1acfc19.json
+++ b/tests/reference/asr-subscript1-1acfc19.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-subscript1-1acfc19.stdout",
-    "stdout_hash": "3ce613aafb11a97dd654d27c5e6e6708c0a9c93349cdf9c16791ab5b",
+    "stdout_hash": "cf02a18790b0e93084fa3adbaebdf78297064cc0575c946d00584151",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-subscript1-1acfc19.stdout b/tests/reference/asr-subscript1-1acfc19.stdout
index 3d82070886..9b615dffe7 100644
--- a/tests/reference/asr-subscript1-1acfc19.stdout
+++ b/tests/reference/asr-subscript1-1acfc19.stdout
@@ -100,7 +100,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_bool_binop-f856ef0.json b/tests/reference/asr-test_bool_binop-f856ef0.json
index 447e70aed7..e54b0bd0d9 100644
--- a/tests/reference/asr-test_bool_binop-f856ef0.json
+++ b/tests/reference/asr-test_bool_binop-f856ef0.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_bool_binop-f856ef0.stdout",
-    "stdout_hash": "71926941858374564550d3cda48aaa07a2198ed59743e0638c13b534",
+    "stdout_hash": "658e68adaa9b8c606aa2c81d878b2d3569dbe164f3a432c3d1205667",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_bool_binop-f856ef0.stdout b/tests/reference/asr-test_bool_binop-f856ef0.stdout
index 4cf7f5d74c..134d6e403d 100644
--- a/tests/reference/asr-test_bool_binop-f856ef0.stdout
+++ b/tests/reference/asr-test_bool_binop-f856ef0.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -147,7 +146,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lpython_floordiv@__lpython_overloaded_10___lpython_floordiv]
diff --git a/tests/reference/asr-test_builtin-aa64615.json b/tests/reference/asr-test_builtin-aa64615.json
index a21d166a7b..a23c258412 100644
--- a/tests/reference/asr-test_builtin-aa64615.json
+++ b/tests/reference/asr-test_builtin-aa64615.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin-aa64615.stdout",
-    "stdout_hash": "24662667c43f6a97d90a9402fc200c2b88339c9f55af206bd4ed9995",
+    "stdout_hash": "6ed85c2c8a8d46a5f877ea5c1a8e4a6c50d0ec04fa6eb967ad76aea3",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin-aa64615.stdout b/tests/reference/asr-test_builtin-aa64615.stdout
index 25b29c2a2c..59cc3e1500 100644
--- a/tests/reference/asr-test_builtin-aa64615.stdout
+++ b/tests/reference/asr-test_builtin-aa64615.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_ord
@@ -205,7 +204,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -591,7 +589,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1495,7 +1492,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_builtin_abs-c74d2c9.json b/tests/reference/asr-test_builtin_abs-c74d2c9.json
index 0476299e09..4baa13ecbe 100644
--- a/tests/reference/asr-test_builtin_abs-c74d2c9.json
+++ b/tests/reference/asr-test_builtin_abs-c74d2c9.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_abs-c74d2c9.stdout",
-    "stdout_hash": "20caea59596b5d4437e478eab7fe142b7a9aa4ed41b1a52ad8ce6818",
+    "stdout_hash": "f8f7596f530965f2bda001faf89ef55113b6e05114803ed4816c4fcf",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_abs-c74d2c9.stdout b/tests/reference/asr-test_builtin_abs-c74d2c9.stdout
index bd57c82717..b86885212e 100644
--- a/tests/reference/asr-test_builtin_abs-c74d2c9.stdout
+++ b/tests/reference/asr-test_builtin_abs-c74d2c9.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_abs]
@@ -175,7 +174,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_builtin_bin-52ba9fa.json b/tests/reference/asr-test_builtin_bin-52ba9fa.json
index c3ee775516..e98465e1fe 100644
--- a/tests/reference/asr-test_builtin_bin-52ba9fa.json
+++ b/tests/reference/asr-test_builtin_bin-52ba9fa.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_bin-52ba9fa.stdout",
-    "stdout_hash": "25869e3fe772c2e4715c526631644920228497bd8c8309267b96a277",
+    "stdout_hash": "cbe1e42fbf30e713730390429c73a6e0c52b5fa476951baa600ca178",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_bin-52ba9fa.stdout b/tests/reference/asr-test_builtin_bin-52ba9fa.stdout
index 5742c5c97c..4355c9ba11 100644
--- a/tests/reference/asr-test_builtin_bin-52ba9fa.stdout
+++ b/tests/reference/asr-test_builtin_bin-52ba9fa.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_bin]
@@ -89,7 +88,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [bin]
diff --git a/tests/reference/asr-test_builtin_bool-330223a.json b/tests/reference/asr-test_builtin_bool-330223a.json
index 4b4013fe37..34320e5da9 100644
--- a/tests/reference/asr-test_builtin_bool-330223a.json
+++ b/tests/reference/asr-test_builtin_bool-330223a.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_bool-330223a.stdout",
-    "stdout_hash": "dda5eb6cdabe9fbdb939fae6939cb9eb32477d536cb1320d7584d9f8",
+    "stdout_hash": "d82f6b4d55b4058b3cb601f6241821deb3b4bdd5837e4dc42e7f6641",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_bool-330223a.stdout b/tests/reference/asr-test_builtin_bool-330223a.stdout
index 91f3653869..0abb4f8147 100644
--- a/tests/reference/asr-test_builtin_bool-330223a.stdout
+++ b/tests/reference/asr-test_builtin_bool-330223a.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_bool]
@@ -253,7 +252,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_9__complex
diff --git a/tests/reference/asr-test_builtin_float-20601dd.json b/tests/reference/asr-test_builtin_float-20601dd.json
index c991147b7d..47c6311a1e 100644
--- a/tests/reference/asr-test_builtin_float-20601dd.json
+++ b/tests/reference/asr-test_builtin_float-20601dd.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_float-20601dd.stdout",
-    "stdout_hash": "263820f4e51a71d43f644c6a77891126301c994baabb9c4bab94e45d",
+    "stdout_hash": "70047df956296d7e9b8b4a3333cb2a14afb4f778dffe5791f7f14763",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_float-20601dd.stdout b/tests/reference/asr-test_builtin_float-20601dd.stdout
index 3301b23b4c..9343871e12 100644
--- a/tests/reference/asr-test_builtin_float-20601dd.stdout
+++ b/tests/reference/asr-test_builtin_float-20601dd.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_float]
@@ -127,7 +126,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_builtin_hex-64bd268.json b/tests/reference/asr-test_builtin_hex-64bd268.json
index 512ab58911..980c046fc4 100644
--- a/tests/reference/asr-test_builtin_hex-64bd268.json
+++ b/tests/reference/asr-test_builtin_hex-64bd268.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_hex-64bd268.stdout",
-    "stdout_hash": "cd3f94dcb410a0c5c8b79f81970761e44faeab208c8704307ab30ad6",
+    "stdout_hash": "f5c8c98ea9cc9a07bcbab7c7be21a64144c23a0c5d2f4d8afb98e742",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_hex-64bd268.stdout b/tests/reference/asr-test_builtin_hex-64bd268.stdout
index 7bab66663a..82f159ba9e 100644
--- a/tests/reference/asr-test_builtin_hex-64bd268.stdout
+++ b/tests/reference/asr-test_builtin_hex-64bd268.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_hex]
@@ -89,7 +88,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [hex]
diff --git a/tests/reference/asr-test_builtin_int-8f88fdc.json b/tests/reference/asr-test_builtin_int-8f88fdc.json
index 01943bfac1..203487b829 100644
--- a/tests/reference/asr-test_builtin_int-8f88fdc.json
+++ b/tests/reference/asr-test_builtin_int-8f88fdc.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_int-8f88fdc.stdout",
-    "stdout_hash": "d7b75050c4e0feda76d56788a1147b45df97409a5e656f552d7d2576",
+    "stdout_hash": "2279ed2c015d645174f1cfe26b712509719ddc8360b45d79cc0a5272",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_int-8f88fdc.stdout b/tests/reference/asr-test_builtin_int-8f88fdc.stdout
index a43d70e253..1c6fc8ff77 100644
--- a/tests/reference/asr-test_builtin_int-8f88fdc.stdout
+++ b/tests/reference/asr-test_builtin_int-8f88fdc.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check_all]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_int
@@ -123,7 +121,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -651,7 +648,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_builtin_len-55b0dec.json b/tests/reference/asr-test_builtin_len-55b0dec.json
index 06c0428408..4b537a59b8 100644
--- a/tests/reference/asr-test_builtin_len-55b0dec.json
+++ b/tests/reference/asr-test_builtin_len-55b0dec.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_len-55b0dec.stdout",
-    "stdout_hash": "8d0bfaeb76f4324c18d8e8bcaeb8d8c567b094a59b158ebeb3fb7e51",
+    "stdout_hash": "b840c0122afd41f04637060df6e4d8c0187e2e67f31ad644144b553f",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_len-55b0dec.stdout b/tests/reference/asr-test_builtin_len-55b0dec.stdout
index 673b445fce..f1d558f6c6 100644
--- a/tests/reference/asr-test_builtin_len-55b0dec.stdout
+++ b/tests/reference/asr-test_builtin_len-55b0dec.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_len]
@@ -239,7 +238,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_builtin_oct-20b9066.json b/tests/reference/asr-test_builtin_oct-20b9066.json
index c979ab1b37..3a7ec4ddbf 100644
--- a/tests/reference/asr-test_builtin_oct-20b9066.json
+++ b/tests/reference/asr-test_builtin_oct-20b9066.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_oct-20b9066.stdout",
-    "stdout_hash": "f470b13760ae7951e2fab2261add67a0fdb084ed29cdfe6253997f53",
+    "stdout_hash": "81fe3a03da5970367f2a6e2a6a4c3e421c14aa74e23d1b2ec0a91810",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_oct-20b9066.stdout b/tests/reference/asr-test_builtin_oct-20b9066.stdout
index ec1038d075..6d99c70e9a 100644
--- a/tests/reference/asr-test_builtin_oct-20b9066.stdout
+++ b/tests/reference/asr-test_builtin_oct-20b9066.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_oct]
@@ -89,7 +88,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [oct]
diff --git a/tests/reference/asr-test_builtin_pow-f02fcda.json b/tests/reference/asr-test_builtin_pow-f02fcda.json
index 83d7b51474..92fdfc6e2c 100644
--- a/tests/reference/asr-test_builtin_pow-f02fcda.json
+++ b/tests/reference/asr-test_builtin_pow-f02fcda.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_pow-f02fcda.stdout",
-    "stdout_hash": "39728d05f6f9c0d06b6ad7a2eb99ea833260a04c393abcc2e4c6c5bd",
+    "stdout_hash": "2e8de674a09eb381e95604df7acd7b0bfd8fdfae8c1ba2457c79412d",
     "stderr": "asr-test_builtin_pow-f02fcda.stderr",
     "stderr_hash": "859ce76c74748f2d32c7eab92cfbba789a78d4cbf5818646b99806ea",
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_pow-f02fcda.stdout b/tests/reference/asr-test_builtin_pow-f02fcda.stdout
index de330f9109..6b8f9b9205 100644
--- a/tests/reference/asr-test_builtin_pow-f02fcda.stdout
+++ b/tests/reference/asr-test_builtin_pow-f02fcda.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_pow]
@@ -501,7 +500,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [pow@__lpython_overloaded_0__pow
diff --git a/tests/reference/asr-test_builtin_round-7417a21.json b/tests/reference/asr-test_builtin_round-7417a21.json
index 8707e2388f..13264c99ed 100644
--- a/tests/reference/asr-test_builtin_round-7417a21.json
+++ b/tests/reference/asr-test_builtin_round-7417a21.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_round-7417a21.stdout",
-    "stdout_hash": "787bbdeb78e4fc9ddf52f9cfa1edc853fb61e3b6360cea6ccd8c81c2",
+    "stdout_hash": "140ed1b578997c4bfac1c492e568447e6096a3673da94045b34309b4",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_round-7417a21.stdout b/tests/reference/asr-test_builtin_round-7417a21.stdout
index bbe343b8b3..9e4b38ad77 100644
--- a/tests/reference/asr-test_builtin_round-7417a21.stdout
+++ b/tests/reference/asr-test_builtin_round-7417a21.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_round]
@@ -255,7 +254,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [round@__lpython_overloaded_0__round
diff --git a/tests/reference/asr-test_builtin_str-580e920.json b/tests/reference/asr-test_builtin_str-580e920.json
index 789fa35ed7..c26bf1f7ee 100644
--- a/tests/reference/asr-test_builtin_str-580e920.json
+++ b/tests/reference/asr-test_builtin_str-580e920.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_builtin_str-580e920.stdout",
-    "stdout_hash": "787cab15f8f6965eb5e2a1d8979c707d68428d63111ec17fabb4710e",
+    "stdout_hash": "5e1687a9cce6c997ff5c0ff9c15dc4435f1abbd581fb77d647d9afe4",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_builtin_str-580e920.stdout b/tests/reference/asr-test_builtin_str-580e920.stdout
index cd2db110e0..2bb65223c4 100644
--- a/tests/reference/asr-test_builtin_str-580e920.stdout
+++ b/tests/reference/asr-test_builtin_str-580e920.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_str_int_float
@@ -164,7 +163,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -520,7 +518,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -674,7 +671,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -1018,7 +1014,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_c_interop_01-e374f43.json b/tests/reference/asr-test_c_interop_01-e374f43.json
index 4df7d36917..b18797827e 100644
--- a/tests/reference/asr-test_c_interop_01-e374f43.json
+++ b/tests/reference/asr-test_c_interop_01-e374f43.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_c_interop_01-e374f43.stdout",
-    "stdout_hash": "963d5aec79bda8815973e289c4d9dc7972d1f20be38d20cbdf6cd23e",
+    "stdout_hash": "44025c97e50dc31d8f819a14d2c68dc0d5d3bfceb3a035a3574f6f13",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_c_interop_01-e374f43.stdout b/tests/reference/asr-test_c_interop_01-e374f43.stdout
index d5cf370843..284c420671 100644
--- a/tests/reference/asr-test_c_interop_01-e374f43.stdout
+++ b/tests/reference/asr-test_c_interop_01-e374f43.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_c_callbacks]
@@ -112,7 +111,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -193,7 +191,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -257,7 +254,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -320,7 +316,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -367,7 +362,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lfortran_dsin
diff --git a/tests/reference/asr-test_complex_01-a6def58.json b/tests/reference/asr-test_complex_01-a6def58.json
index 2b1292cfef..b99282fea5 100644
--- a/tests/reference/asr-test_complex_01-a6def58.json
+++ b/tests/reference/asr-test_complex_01-a6def58.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_complex_01-a6def58.stdout",
-    "stdout_hash": "114f2d29db3debcf5f05ed1b0cf7eb134b36de96ac25452f3657b41c",
+    "stdout_hash": "441c69486af4dc17fbcc4f53c78b1370581c1a163d8d2f2d3d1ca01d",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_complex_01-a6def58.stdout b/tests/reference/asr-test_complex_01-a6def58.stdout
index 6764d2cbce..64c17d73c0 100644
--- a/tests/reference/asr-test_complex_01-a6def58.stdout
+++ b/tests/reference/asr-test_complex_01-a6def58.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_real_imag
@@ -359,7 +357,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_5__complex
@@ -1098,7 +1095,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_9__complex]
@@ -1299,7 +1295,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_13__complex
@@ -1866,7 +1861,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_complex_02-782ba2d.json b/tests/reference/asr-test_complex_02-782ba2d.json
index fca6994cc5..7c790c269d 100644
--- a/tests/reference/asr-test_complex_02-782ba2d.json
+++ b/tests/reference/asr-test_complex_02-782ba2d.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_complex_02-782ba2d.stdout",
-    "stdout_hash": "640cf6d628d0b0538739d39a727f9e3abd14e2b76ded7d67a35361dd",
+    "stdout_hash": "1e7549a2aa22da9868cfa04bac02cfc0dd518f027c079ef6c3050a73",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_complex_02-782ba2d.stdout b/tests/reference/asr-test_complex_02-782ba2d.stdout
index a94e9c9014..f45a4ef722 100644
--- a/tests/reference/asr-test_complex_02-782ba2d.stdout
+++ b/tests/reference/asr-test_complex_02-782ba2d.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_complex_abs
@@ -182,7 +180,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [complex@__lpython_overloaded_9__complex]
@@ -378,7 +375,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -574,7 +570,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_end_sep_keywords-2226a67.json b/tests/reference/asr-test_end_sep_keywords-2226a67.json
index 8ed24de912..7e29da6d46 100644
--- a/tests/reference/asr-test_end_sep_keywords-2226a67.json
+++ b/tests/reference/asr-test_end_sep_keywords-2226a67.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_end_sep_keywords-2226a67.stdout",
-    "stdout_hash": "c1f6493e6b377a221479931e1b81d0061c9d3efe5c6ce029ec9392e1",
+    "stdout_hash": "3a586fde04b4d918381f4de704d1505e74617f283c1f33ba6aa8a538",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_end_sep_keywords-2226a67.stdout b/tests/reference/asr-test_end_sep_keywords-2226a67.stdout
index 0816a2df6d..c0afa8303b 100644
--- a/tests/reference/asr-test_end_sep_keywords-2226a67.stdout
+++ b/tests/reference/asr-test_end_sep_keywords-2226a67.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [testEndSepKeywords]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_max_min-3c2fc51.json b/tests/reference/asr-test_max_min-3c2fc51.json
index c9c9203265..de20090915 100644
--- a/tests/reference/asr-test_max_min-3c2fc51.json
+++ b/tests/reference/asr-test_max_min-3c2fc51.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_max_min-3c2fc51.stdout",
-    "stdout_hash": "be2fd104698f747432f2d09afc1fab9e48bd512c169ebcd5d166fac6",
+    "stdout_hash": "242c1a412e974ad9ef7365e670304564f67b14f0c258df5c858c0206",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_max_min-3c2fc51.stdout b/tests/reference/asr-test_max_min-3c2fc51.stdout
index 7c21f7eb8d..3de459bb1a 100644
--- a/tests/reference/asr-test_max_min-3c2fc51.stdout
+++ b/tests/reference/asr-test_max_min-3c2fc51.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_max_int
@@ -199,7 +197,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [max@__lpython_overloaded_2__max
@@ -369,7 +366,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [max@__lpython_overloaded_0__max
@@ -543,7 +539,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -680,7 +675,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_numpy_03-e600a49.json b/tests/reference/asr-test_numpy_03-e600a49.json
index d665b1b11b..87658b1875 100644
--- a/tests/reference/asr-test_numpy_03-e600a49.json
+++ b/tests/reference/asr-test_numpy_03-e600a49.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_numpy_03-e600a49.stdout",
-    "stdout_hash": "47926f70c032d80a4e8dd66d86ff2bf2dbb97e1c50b3a239b0b0aff7",
+    "stdout_hash": "3acd291a004d49bc3ba0ce95e14db9aae73d98c3cba9decd07df2eaf",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_numpy_03-e600a49.stdout b/tests/reference/asr-test_numpy_03-e600a49.stdout
index 1a349935b5..0044ba762a 100644
--- a/tests/reference/asr-test_numpy_03-e600a49.stdout
+++ b/tests/reference/asr-test_numpy_03-e600a49.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_reshape_with_argument]
@@ -371,7 +370,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lpython_floordiv@__lpython_overloaded_6___lpython_floordiv]
@@ -1217,7 +1215,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lpython_floordiv@__lpython_overloaded_6___lpython_floordiv]
@@ -1709,7 +1706,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [_lpython_floordiv@__lpython_overloaded_6___lpython_floordiv
diff --git a/tests/reference/asr-test_numpy_04-ecbb614.json b/tests/reference/asr-test_numpy_04-ecbb614.json
index dbe7acdc77..172c5c1df5 100644
--- a/tests/reference/asr-test_numpy_04-ecbb614.json
+++ b/tests/reference/asr-test_numpy_04-ecbb614.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_numpy_04-ecbb614.stdout",
-    "stdout_hash": "55e1f14b4147140bf6cc5ca00f92d14bde0c744b32a50631cca4ec90",
+    "stdout_hash": "cc0a0d7278ed1e730bda49e8d46376117b0c93205a3d01ddc760093c",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_numpy_04-ecbb614.stdout b/tests/reference/asr-test_numpy_04-ecbb614.stdout
index b61615ef66..4295acf06b 100644
--- a/tests/reference/asr-test_numpy_04-ecbb614.stdout
+++ b/tests/reference/asr-test_numpy_04-ecbb614.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_array_01
@@ -144,7 +142,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -343,7 +340,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-test_pow-3f5d550.json b/tests/reference/asr-test_pow-3f5d550.json
index 534df173ff..41c0593f34 100644
--- a/tests/reference/asr-test_pow-3f5d550.json
+++ b/tests/reference/asr-test_pow-3f5d550.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_pow-3f5d550.stdout",
-    "stdout_hash": "1dda21c5cf604e907d9db80803e15ceec6b28ba8f6db33fa52b8cc9b",
+    "stdout_hash": "06113ac0abcd53bcf0b9b5e44644db0087c15ca1f349e1e284358263",
     "stderr": "asr-test_pow-3f5d550.stderr",
     "stderr_hash": "3d950301563cce75654f28bf41f6f53428ed1f5ae997774345f374a3",
     "returncode": 0
diff --git a/tests/reference/asr-test_pow-3f5d550.stdout b/tests/reference/asr-test_pow-3f5d550.stdout
index ddd3c47aa1..a2ddda8772 100644
--- a/tests/reference/asr-test_pow-3f5d550.stdout
+++ b/tests/reference/asr-test_pow-3f5d550.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main]
@@ -83,7 +82,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [pow@__lpython_overloaded_0__pow]
diff --git a/tests/reference/asr-test_unary_op_03-e799eae.json b/tests/reference/asr-test_unary_op_03-e799eae.json
index ffddd87fbe..d0ed1b2602 100644
--- a/tests/reference/asr-test_unary_op_03-e799eae.json
+++ b/tests/reference/asr-test_unary_op_03-e799eae.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-test_unary_op_03-e799eae.stdout",
-    "stdout_hash": "0ab332a2decde4ba8878f8f8169a1091a1e2351d40a6c5f27427f5aa",
+    "stdout_hash": "aa082e4726f8dd1870b7d525055bbcf9ea6533aab13248599708b84a",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-test_unary_op_03-e799eae.stdout b/tests/reference/asr-test_unary_op_03-e799eae.stdout
index 772c63ac02..29e46b251b 100644
--- a/tests/reference/asr-test_unary_op_03-e799eae.stdout
+++ b/tests/reference/asr-test_unary_op_03-e799eae.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-tuple1-09972ab.json b/tests/reference/asr-tuple1-09972ab.json
index 318f3e83e4..a8e83fae28 100644
--- a/tests/reference/asr-tuple1-09972ab.json
+++ b/tests/reference/asr-tuple1-09972ab.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-tuple1-09972ab.stdout",
-    "stdout_hash": "d00d99e2c12d87079224d0b8bbcd0dceb40e5221dde56bddb7ad01e2",
+    "stdout_hash": "fcbdc7bd437d77534509c9da987f7b735c1bd319de51956b28924f73",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-tuple1-09972ab.stdout b/tests/reference/asr-tuple1-09972ab.stdout
index 5da2b9f7ea..d4bcbe5dad 100644
--- a/tests/reference/asr-tuple1-09972ab.stdout
+++ b/tests/reference/asr-tuple1-09972ab.stdout
@@ -259,7 +259,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr-vec_01-66ac423.json b/tests/reference/asr-vec_01-66ac423.json
index 704325f837..6d1d160941 100644
--- a/tests/reference/asr-vec_01-66ac423.json
+++ b/tests/reference/asr-vec_01-66ac423.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-vec_01-66ac423.stdout",
-    "stdout_hash": "2e8e986187946ada4375b5ebd7085a42236f836c8134fcbf6364d846",
+    "stdout_hash": "74838bb6f4aea541d2dc51c5fad4e68924a20fd02a5bb42d8f3bd582",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/asr-vec_01-66ac423.stdout b/tests/reference/asr-vec_01-66ac423.stdout
index 0785da30ab..466908a871 100644
--- a/tests/reference/asr-vec_01-66ac423.stdout
+++ b/tests/reference/asr-vec_01-66ac423.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [loop_vec]
@@ -121,7 +120,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/asr_json-modules_02-53952e6.json b/tests/reference/asr_json-modules_02-53952e6.json
index a2f86ac189..b2e68955a5 100644
--- a/tests/reference/asr_json-modules_02-53952e6.json
+++ b/tests/reference/asr_json-modules_02-53952e6.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr_json-modules_02-53952e6.stdout",
-    "stdout_hash": "894d0045c0b05a99e93d4717d7021bb0ccfc9cf41706e96436da8922",
+    "stdout_hash": "d285bece8f91160c451326d3373700dabd781e24fe022b812bff957c",
     "stderr": "asr_json-modules_02-53952e6.stderr",
     "stderr_hash": "132af04271d3bfd523848990e734bfa3c0aed6e4b85ec4eb87e66720",
     "returncode": 0
diff --git a/tests/reference/asr_json-modules_02-53952e6.stdout b/tests/reference/asr_json-modules_02-53952e6.stdout
index ef3e209ef6..ab7ae42f33 100644
--- a/tests/reference/asr_json-modules_02-53952e6.stdout
+++ b/tests/reference/asr_json-modules_02-53952e6.stdout
@@ -31,7 +31,6 @@
                                                 "module": false,
                                                 "inline": false,
                                                 "static": false,
-                                                "type_params": [],
                                                 "restrictions": [],
                                                 "is_restriction": false
                                             },
@@ -175,7 +174,6 @@
                                                 "module": false,
                                                 "inline": false,
                                                 "static": false,
-                                                "type_params": [],
                                                 "restrictions": [],
                                                 "is_restriction": false
                                             },
@@ -699,7 +697,6 @@
                                                 "module": false,
                                                 "inline": false,
                                                 "static": false,
-                                                "type_params": [],
                                                 "restrictions": [],
                                                 "is_restriction": false
                                             },
@@ -879,7 +876,6 @@
                                                 "module": false,
                                                 "inline": false,
                                                 "static": false,
-                                                "type_params": [],
                                                 "restrictions": [],
                                                 "is_restriction": false
                                             },
diff --git a/tests/reference/pass_class_constructor-structs_16-5e3508f.json b/tests/reference/pass_class_constructor-structs_16-5e3508f.json
index 2cdc74ca77..a58162305c 100644
--- a/tests/reference/pass_class_constructor-structs_16-5e3508f.json
+++ b/tests/reference/pass_class_constructor-structs_16-5e3508f.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "pass_class_constructor-structs_16-5e3508f.stdout",
-    "stdout_hash": "355b37762d2ce7b10433387aef367b7348cf9e0f87620e2e21148527",
+    "stdout_hash": "73dde106b7ff79b8752d44f573e93dda66af82b7bf92247a46e9609b",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/pass_class_constructor-structs_16-5e3508f.stdout b/tests/reference/pass_class_constructor-structs_16-5e3508f.stdout
index 4657351374..2bcc2a67fb 100644
--- a/tests/reference/pass_class_constructor-structs_16-5e3508f.stdout
+++ b/tests/reference/pass_class_constructor-structs_16-5e3508f.stdout
@@ -128,7 +128,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [test_ordering]
@@ -230,7 +229,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.json b/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.json
index 65ad3d8dcb..d64285481c 100644
--- a/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.json
+++ b/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "pass_inline_function_calls-func_inline_01-8b6a5da.stdout",
-    "stdout_hash": "7b3704e28b4c2f51c9d90f6f7c1ede3b24863026f61103a9b567e2ba",
+    "stdout_hash": "c5045bbe93cc2a62e5d20f1fce265a818ef7c619d2fc9d3499e81331",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.stdout b/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.stdout
index 7c521a33f0..4b7de2b861 100644
--- a/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.stdout
+++ b/tests/reference/pass_inline_function_calls-func_inline_01-8b6a5da.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [main]
@@ -95,7 +94,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [fib]
@@ -268,7 +266,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [fib]
diff --git a/tests/reference/pass_loop_vectorise-vec_01-be9985e.json b/tests/reference/pass_loop_vectorise-vec_01-be9985e.json
index 0f2c15c3fe..15d0fd86b0 100644
--- a/tests/reference/pass_loop_vectorise-vec_01-be9985e.json
+++ b/tests/reference/pass_loop_vectorise-vec_01-be9985e.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "pass_loop_vectorise-vec_01-be9985e.stdout",
-    "stdout_hash": "75744d4413178463dc84772683ee16762c4cf2c8289593c88e24998c",
+    "stdout_hash": "a80e2262c97da3cb451e3b7d89e900ccd67bdfeb1a38c4f6ce0998c5",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/pass_loop_vectorise-vec_01-be9985e.stdout b/tests/reference/pass_loop_vectorise-vec_01-be9985e.stdout
index 8f66292d5d..11af36475c 100644
--- a/tests/reference/pass_loop_vectorise-vec_01-be9985e.stdout
+++ b/tests/reference/pass_loop_vectorise-vec_01-be9985e.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [loop_vec]
@@ -263,7 +262,6 @@
                                                         .false.
                                                         .false.
                                                         []
-                                                        []
                                                         .false.
                                                     )
                                                     []
@@ -352,7 +350,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [vector_copy_f64f64i32@IntrinsicOptimization]
diff --git a/tests/reference/pass_print_list_tuple-print_02-09600eb.json b/tests/reference/pass_print_list_tuple-print_02-09600eb.json
index 181b61d5bf..2216199216 100644
--- a/tests/reference/pass_print_list_tuple-print_02-09600eb.json
+++ b/tests/reference/pass_print_list_tuple-print_02-09600eb.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "pass_print_list_tuple-print_02-09600eb.stdout",
-    "stdout_hash": "4bfdd2616c22d67ba78529cdbee9e24c7e0716bb9ccbc54ee88469a2",
+    "stdout_hash": "cc65ae9e783fb40e87538cbfa27b303f711d8194260b56d2bf7fc300",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/pass_print_list_tuple-print_02-09600eb.stdout b/tests/reference/pass_print_list_tuple-print_02-09600eb.stdout
index b334bb5631..0d96e40b7f 100644
--- a/tests/reference/pass_print_list_tuple-print_02-09600eb.stdout
+++ b/tests/reference/pass_print_list_tuple-print_02-09600eb.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [check]
@@ -64,7 +63,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f
@@ -497,7 +495,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -2841,7 +2838,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -4710,7 +4706,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
@@ -7577,7 +7572,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []
diff --git a/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.json b/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.json
index 4991ac52b1..0e9075b5af 100644
--- a/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.json
+++ b/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.json
@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "pass_print_list_tuple-print_list_tuple_03-195fa9c.stdout",
-    "stdout_hash": "3d00f6639709a2062949cbbe8957b52b1c0ecc37e6dfa7fb5f765d92",
+    "stdout_hash": "6b4d20ca689b187e0aa7277045a814d68ccee872510bb3d81b81b9c8",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0
diff --git a/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.stdout b/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.stdout
index 7ed89999b1..aa537e2f80 100644
--- a/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.stdout
+++ b/tests/reference/pass_print_list_tuple-print_list_tuple_03-195fa9c.stdout
@@ -27,7 +27,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     [f]
@@ -122,7 +121,6 @@
                                         .false.
                                         .false.
                                         []
-                                        []
                                         .false.
                                     )
                                     []