Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -r1.98 -r1.99
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	25 Apr 2018 19:23:26 -0000	1.98
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	8 May 2018 22:37:18 -0000	1.99
@@ -1365,8 +1365,7 @@
          } {
             return -code error "Expected if_no_rows as second-to-last argument"
         }
-        set code_block [lindex $args 0]
-        set if_no_rows_code_block [lindex $args 2]
+        lassign $args code_block . if_no_rows_code_block
     } else {
         return -code error "Expected 1 or 3 arguments after switches"
     }
@@ -1760,8 +1759,7 @@
          } {
             return -code error "Expected if_no_rows as second-to-last argument"
         }
-        set code_block [lindex $args 0]
-        set if_no_rows_code_block [lindex $args 2]
+        lassign $args code_block . if_no_rows_code_block
     } else {
         return -code error "Expected 1 or 3 arguments after switches"
     }