Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	9 Apr 2018 18:58:32 -0000	1.19
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	24 Apr 2018 10:49:48 -0000	1.20
@@ -50,8 +50,7 @@
 
     if {$data_model_files ne ""} {
         foreach file $data_model_files {
-            set path [lindex $file 0]
-            set file_type [lindex $file 1]
+            lassign $file path file_type
             append table_rows [subst {
                 <tr>
                 <td><input type="checkbox" checked name="sql_file" value="$file_count"></td>
@@ -62,13 +61,13 @@
             incr file_count
         }
 
-        if { $version(auto-mount) eq "" 
-             && $version(package.type) eq "apm_application" 
+        if { $version(auto-mount) eq ""
+             && $version(package.type) eq "apm_application"
          } {
             set mount_html [subst {
                 <div>
-                <input type="checkbox" name="mount_packages" value="$version(package.key)" checked> 
-                Mount package under the main site at path 
+                <input type="checkbox" name="mount_packages" value="$version(package.key)" checked>
+                Mount package under the main site at path
                 <input type="text" name="mount_path.$version(package.key)" value="$version(package.key)">
                 </div>
             }]
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	7 Aug 2017 23:47:45 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	24 Apr 2018 10:49:48 -0000	1.14
@@ -1,6 +1,6 @@
-ad_page_contract { 
+ad_page_contract {
     Edits information for a version of a package.
-    
+
     @param version_id The id of the package to process.
     @author Jon Salz (jsalz@arsdigita.com)
     @author Bryan Quinn (bquinn@arsdigita.com)
@@ -14,17 +14,17 @@
     select version_id, package_key, package_uri, pretty_name, version_name,
       version_uri, auto_mount, summary, description_format, description, release_date,
       vendor, vendor_uri, enabled_p, installed_p, tagged_p, imported_p,
-      data_model_loaded_p, activation_date, tarball_length, 
+      data_model_loaded_p, activation_date, tarball_length,
       deactivation_date, distribution_uri, distribution_date, singleton_p,
       initial_install_p, implements_subsite_p, inherit_templates_p
     from apm_package_version_info where version_id = :version_id
 }
 
 set title "Edit a Version"
 set context [list \
-		 [list "/acs-admin/apm/" "Package Manager"] \
-		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
-		 $title]
+    [list "/acs-admin/apm/" "Package Manager"] \
+    [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+    $title]
 
 set body "<form action='version-edit-2' method='post'>"
 
@@ -151,7 +151,7 @@
     }
     # provide default size
     if {![dict exists $attribute size]} {
-	dict set attribute size 30
+        dict set attribute size 30
     }
     append body [subst {
 <tr>
@@ -174,14 +174,13 @@
 
 set counter 0
 foreach owner_info $owners {
-    set owner_name [lindex $owner_info 0]
-    set owner_uri [lindex $owner_info 1]
+    lassign $owner_info owner_name owner_uri
     incr counter
 
     if { $counter <= 3 } {
-	set prompt "[lindex { "" Primary Secondary Tertiary } $counter] Owner"
+        set prompt "[lindex { "" Primary Secondary Tertiary } $counter] Owner"
     } else {
-	set prompt "Owner #$counter"
+        set prompt "Owner #$counter"
     }
 
     append body [subst {