Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -N -r1.39.2.3 -r1.39.2.4
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	1 Apr 2021 08:42:35 -0000	1.39.2.3
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	28 Dec 2021 11:40:24 -0000	1.39.2.4
@@ -368,9 +368,12 @@
     if { $package_id eq "" } {
         set package_id [ad_conn package_id]
     }
-    set extra_vars [ns_set create]
-    set context_id $package_id
-    oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {owner_id private_p calendar_name package_id context_id}
+    set extra_vars [ns_set create s \
+                        owner_id $owner_id \
+                        private_p $private_p \
+                        calendar_name $calendar_name \
+                        package_id $package_id \
+                        context_id $package_id]
 
     set calendar_id [package_instantiate_object -extra_vars $extra_vars calendar]