Index: openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl	28 Jun 2018 15:44:56 -0000	1.16
+++ openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl	23 Jul 2018 12:46:53 -0000	1.17
@@ -151,7 +151,7 @@
     }
 
     # get initial calculations to set year, month, day
-    set calc [expr {$calc + 1524}]
+    incr calc 1524
     set calc2 [expr {floor(6680 + (($calc - 2439870) - 122.1) / 365.25)}]
     set calc3 [expr {floor($calc2 * 365.25)}]
     set calc4 [expr {floor(($calc - $calc3) / 30.6001)}]
@@ -213,15 +213,15 @@
     @return the numbers of days for the given month/year
 } {
     if {$month == 0} {
-      set month 01
+        set month 01
     } elseif {$month == 12} {
-      set year [expr {$year + 1}]
+        incr year
       set month 01
     } elseif {$month == 13} {
-      set year [expr {$year + 1}]
-      set month 02
+        incr year
+        set month 02
     } else {
-      set month [expr {$month + 1}]
+        incr month
     }
 
     return [clock format [clock scan "last day" -base [clock scan $year-$month-01]] -format %d]
@@ -244,10 +244,10 @@
     @return the ANSI date for the next month
 } {
     if {$month == 12} {
-      set year [expr {$year + 1}]
-      set month 01
+        incr year
+        set month 01
     } else {
-      set month [expr {$month + 1}]
+        incr month
     }
 
     # jarkko: added this check to avoid calendars bombing when prev month goes
@@ -287,10 +287,10 @@
     @return the ANSI date for the next month
 } {
     if {$month == 12} {
-      set year [expr {$year + 1}]
-      set month 01
+        incr year
+        set month 01
     } else {
-      set month [expr {$month + 1}]
+        incr month
     }
 
     # jarkko: added this check to avoid calendars bombing when next month goes
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	29 Jun 2018 17:27:18 -0000	1.27
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	23 Jul 2018 12:46:53 -0000	1.28
@@ -339,7 +339,7 @@
         && (![info exists formbutton_add_another_choice] || $formbutton_add_another_choice eq "")} {
         set return_url "[export_vars -base questions {assessment_id}]\&#Q$as_item_id"
     } elseif {([info exists formbutton_add_another_question] && $formbutton_add_another_question ne "")} {
-        set after [expr {$after + 1}]
+        incr after
         set return_url  "[export_vars -base item-add {after assessment_id section_id}]\#Q$as_item_id"
     }
     if {[info exists return_url] && $return_url ne ""} {
Index: openacs-4/packages/chat-includelet/lib/chat-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-includelet/lib/chat-includelet.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat-includelet/lib/chat-includelet.tcl	9 May 2018 15:33:30 -0000	1.3
+++ openacs-4/packages/chat-includelet/lib/chat-includelet.tcl	23 Jul 2018 12:46:53 -0000	1.4
@@ -7,11 +7,11 @@
 set num_rooms 0
 
 db_multirow -extend { can_see_p } rooms rooms_list {} {
-	set can_see_p 0
-	if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} {
-		set can_see_p 1
-		set num_rooms [expr $num_rooms + 1]
-	}   
+    set can_see_p 0
+    if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} {
+        set can_see_p 1
+        incr num_rooms
+    }
 }
 
 ad_return_template
Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl	29 Jun 2018 17:27:19 -0000	1.9
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl	23 Jul 2018 12:46:53 -0000	1.10
@@ -41,16 +41,16 @@
 set num_rooms 0
 
 if { $community_id eq 0 } {
-	set query_name "rooms_list_all"
+    set query_name "rooms_list_all"
 } else {
-	set query_name "rooms_list"
+    set query_name "rooms_list"
 }
 db_multirow -extend { can_see_p room_enter_url room_html_url html_text } rooms $query_name {} {
-	set can_see_p 0
-	if { $user_p || $admin_p } {
-		set can_see_p 1
-		set num_rooms [expr {$num_rooms + 1}]
-	}   
+    set can_see_p 0
+    if { $user_p || $admin_p } {
+        set can_see_p 1
+        incr num_rooms
+    }
     set room_enter_url [export_vars -base "${base_url}room-enter" {room_id {client $default_mode}}]
     set room_html_url [export_vars -base "${base_url}room-enter" {room_id {client html}}]
     set html_text [_ chat.html_client_msg]