Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/file-storage/www/file-add.tcl	7 Aug 2017 23:48:11 -0000	1.21
+++ openacs-4/packages/file-storage/www/file-add.tcl	7 Apr 2018 19:13:11 -0000	1.22
@@ -103,7 +103,7 @@
     }
 }
 
-if {([info exists return_url] && $return_url ne "")} {
+if {[info exists return_url] && $return_url ne ""} {
     ad_form -extend -form {
 	{return_url:text(hidden) {value $return_url}}
     }
Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl	7 Aug 2017 23:48:11 -0000	1.8
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl	7 Apr 2018 19:13:11 -0000	1.9
@@ -64,7 +64,7 @@
     {upload_file:file {label \#file-storage.Upload_a_file\#} {html "size 30"}}
 }
 
-if {([info exists return_url] && $return_url ne "")} {
+if {[info exists return_url] && $return_url ne ""} {
     ad_form -extend -name file_add -form {
 	{return_url:text(hidden) {value $return_url}}
     }
@@ -222,7 +222,7 @@
     
 } -after_submit {
     
-    if {([info exists return_url] && $return_url ne "")} {
+    if {[info exists return_url] && $return_url ne ""} {
 	ad_returnredirect $return_url
     } else {
 	ad_returnredirect [export_vars -base ./ {folder_id}]
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/file-storage/www/index.tcl	7 Aug 2017 23:48:11 -0000	1.33
+++ openacs-4/packages/file-storage/www/index.tcl	7 Apr 2018 19:13:11 -0000	1.34
@@ -70,15 +70,15 @@
 # For now I leave it in as it is.
 
 set project_item_id [application_data_link::get_linked -from_object_id $folder_id -to_object_type "content_item"]
-if {([info exists project_item_id] && $project_item_id ne "")} {
+if {$project_item_id ne ""} {
     set project_url [pm::project::url -project_item_id $project_item_id]
     set project_name [pm::project::name -project_item_id $project_item_id]
 } else {
 
     # The folder itself was not linked. Let's try the parent folder.
     set parent_folder [content::item::get_parent_folder -item_id $folder_id]
     set project_item_id [application_data_link::get_linked -from_object_id $parent_folder -to_object_type "content_item"]
-    if {([info exists project_item_id] && $project_item_id ne "")} {
+    if {$project_item_id ne ""} {
 	set project_url [pm::project::url -project_item_id $project_item_id]
 	set project_name [pm::project::name -project_item_id $project_item_id]
     } else {
@@ -94,7 +94,7 @@
 }
 
 set up_url {}
-if { !${root_folder_p}} {
+if { !$root_folder_p} {
     if {[llength $context] == 1} {
 	set up_url [ad_conn package_url]
 	set up_name [ad_conn instance_name]