Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	7 Apr 2018 16:58:52 -0000	1.4
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	7 Apr 2018 19:25:21 -0000	1.5
@@ -294,7 +294,7 @@
 
     if {$aggregator_id eq "0"} {
         set aggregator_id [db_string lowest_aggregator ""]
-	if { ([info exists aggregator_id] && $aggregator_id ne "") } {
+	if { $aggregator_id ne "" } {
 	    news_aggregator::aggregator::set_user_default \
 	  				-user_id $user_id \
 					-aggregator_id $aggregator_id
Index: openacs-4/packages/news-aggregator/tcl/source-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/source-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/news-aggregator/tcl/source-procs.tcl	7 Apr 2018 16:58:52 -0000	1.8
+++ openacs-4/packages/news-aggregator/tcl/source-procs.tcl	7 Apr 2018 19:25:21 -0000	1.9
@@ -25,7 +25,7 @@
 
     if { [db_0or1row source {}] } {
         ns_log Debug "news_aggregator::source::new: Source exists"
-        if { ([info exists aggregator_id] && $aggregator_id ne "") } {
+        if { $aggregator_id ne "" } {
             ns_log Debug "news_aggregator::source::new: Source exists, creating new subscription"
             news_aggregator::subscription::new \
                 -aggregator_id $aggregator_id \
@@ -69,7 +69,7 @@
 
     update -source_id $source_id -feed_url $feed_url -modified ""
     
-    if { ([info exists aggregator_id] && $aggregator_id ne "") } {
+    if { $aggregator_id ne "" } {
         news_aggregator::subscription::new \
             -aggregator_id $aggregator_id \
             -source_id $source_id
@@ -103,13 +103,14 @@
     {-domain:required}
     {-description:required}
 } {
-    if { ([info exists guid] && $guid ne "") } {
+    if { $guid ne "" } {
         return guid
-    } elseif { ([info exists link] && $link ne "") && [news_aggregator::check_link \
-                                                  -link $link \
-                                                  -domain $domain] } {
+    } elseif { $link ne ""
+	       && [news_aggregator::check_link \
+		       -link $link \
+		       -domain $domain] } {
         return link
-    } elseif { ([info exists description] && $description ne "")  } {
+    } elseif { $description ne "" } {
         return description
     }
 }
Index: openacs-4/packages/news-aggregator/www/aggregator-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	7 Apr 2018 16:58:52 -0000	1.2
+++ openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	7 Apr 2018 19:25:21 -0000	1.3
@@ -17,7 +17,7 @@
     # We are deleting the user's default aggregator
     # Set user's oldest aggregator as new default
     set new_default_aggregator [db_string select_oldest_aggregator {} -default ""]
-    if { ([info exists $new_default_aggregator] && $$new_default_aggregator ne "") } {
+    if { [info exists $new_default_aggregator] && [set $new_default_aggregator] ne "" } {
         news_aggregator::aggregator::set_user_default \
             -user_id $user_id \
             -aggregator_id $new_default_aggregator
Index: openacs-4/packages/news-aggregator/www/aggregator.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/news-aggregator/www/aggregator.tcl	7 Apr 2018 16:58:52 -0000	1.5
+++ openacs-4/packages/news-aggregator/www/aggregator.tcl	7 Apr 2018 19:25:21 -0000	1.6
@@ -45,7 +45,7 @@
         -description $description \
         -public_p $public_p
     
-    if { ([info exists return_url] && $return_url ne "") } {
+    if { $return_url ne "" } {
         ad_returnredirect $return_url
     } else {
         ad_returnredirect settings
@@ -58,7 +58,7 @@
                                -description $description \
                                -public_p $public_p]
     
-    if { ([info exists return_url] && $return_url ne "") } {
+    if { $return_url ne "" } {
         ad_returnredirect $return_url
     } else {
         ad_returnredirect "[ad_conn package_url]$new_aggregator_id"
Index: openacs-4/packages/news-aggregator/www/item-blog.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/item-blog.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/www/item-blog.tcl	7 Apr 2018 16:58:52 -0000	1.2
+++ openacs-4/packages/news-aggregator/www/item-blog.tcl	7 Apr 2018 19:25:21 -0000	1.3
@@ -12,12 +12,14 @@
 
 db_1row select_item {}
 
-if { ([info exists content_encoded] && $content_encoded ne "") } {
+if { [info exists content_encoded] && $content_encoded ne "" } {
     set content $content_encoded
 } else {
     set text_only [util_remove_html_tags $item_description]
-    
-    if {([info exists item_title] && $item_title ne "") && ![string equal -nocase $item_title $text_only] } {
+
+    if {[info exists item_title] && $item_title ne ""
+        && ![string equal -nocase $item_title $text_only]
+    } {
         set content "<a href=\"$item_link\">$item_title</a>. $item_description"
     } else {
         set content $item_description
@@ -42,14 +44,14 @@
 } -on_submit {
 
     set user_id [ad_conn user_id]
-    
+
     permission::require_permission \
         -object_id $weblog_id \
         -privilege read
 
     db_1row select_weblog ""
 
-    if { ([info exists content_encoded] && $content_encoded ne "") } {
+    if { [info exists content_encoded] && $content_encoded ne "" } {
         set text $content_encoded
     } else {
         set text $item_description
@@ -61,7 +63,13 @@
                     -title $item_title \
                     -text $text \
                     -link $link]
-                    
+
     ad_returnredirect $post_url
     ad_script_abort
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/news-aggregator/www/subscription-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscription-copy.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news-aggregator/www/subscription-copy.tcl	7 Apr 2018 16:58:52 -0000	1.3
+++ openacs-4/packages/news-aggregator/www/subscription-copy.tcl	7 Apr 2018 19:25:21 -0000	1.4
@@ -18,7 +18,7 @@
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
 
-if { ([info exists copy_to] && $copy_to ne "") } {
+if { $copy_to ne "" } {
 
     foreach source_id $source_ids {
         news_aggregator::subscription::copy \
Index: openacs-4/packages/news-aggregator/www/subscription-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscription-move.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/www/subscription-move.tcl	7 Apr 2018 16:58:52 -0000	1.2
+++ openacs-4/packages/news-aggregator/www/subscription-move.tcl	7 Apr 2018 19:25:21 -0000	1.3
@@ -18,7 +18,7 @@
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
 
-if { ([info exists move_to] && $move_to ne "") } {
+if { $move_to ne "" } {
 
     foreach source_id $source_ids {
         news_aggregator::subscription::move \
Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	7 Apr 2018 16:58:52 -0000	1.9
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	7 Apr 2018 19:25:21 -0000	1.10
@@ -5,7 +5,7 @@
   @creation-date Jan 2003
 } {
     aggregator_id:integer
-    new_source_id:integer,optional
+    {new_source_id:integer,optional ""}
     {source_id:integer,multiple ""}
     {feed_url ""}
     {orderby:token ""}
@@ -35,7 +35,7 @@
     #ad_returnredirect "[ad_conn package_url]opml/$aggregator_id/mySubscriptions.opml"
     #ad_script_abort
 
-if { ([info exists source_id] && $source_id ne "") } {
+if { $source_id ne "" } {
     set delete_count 0
     foreach delete_id $source_id {
         news_aggregator::subscription::delete \
@@ -144,7 +144,7 @@
     }
 } -validate {
     {feed_url
-	{ ([info exists feed_url] && $feed_url ne "") && "http://" ne $feed_url } 
+	{ [info exists feed_url] && $feed_url ne "" && "http://" ne $feed_url } 
         { You must specify a URL }
     }
 } -new_data {