Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/acs-lang/www/admin/index.tcl	9 May 2018 15:33:28 -0000	1.15
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	13 Mar 2019 11:11:26 -0000	1.15.2.1
@@ -78,7 +78,7 @@
     set locale_edit_url [export_vars -base locale-edit { locale }]
     set locale_delete_url [export_vars -base locale-delete { locale }]
     set locale_make_default_url [export_vars -base locale-make-default { locale }]
-    set toggle_enabled_p [ad_decode $enabled_p "t" "f" "t"]
+    set toggle_enabled_p [expr {!$enabled_p}]
     set locale_enabled_p_url [export_vars -base locale-set-enabled-p { locale {enabled_p $toggle_enabled_p} }]
     
     set num_translated_pretty [lc_numeric $num_translated]
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.41.2.2 -r1.41.2.3
--- openacs-4/packages/acs-subsite/lib/login.tcl	24 Feb 2019 07:58:20 -0000	1.41.2.2
+++ openacs-4/packages/acs-subsite/lib/login.tcl	13 Mar 2019 11:15:23 -0000	1.41.2.3
@@ -174,7 +174,7 @@
 ad_form -extend -name login -on_request {
     # Populate fields from local vars
 
-    set persistent_p [ad_decode $default_persistent_login_p 1 "t" ""]
+    set persistent_p [expr {$default_persistent_login_p == 1 ? "t" : ""}]
 
     # One common problem with login is that people can hit the back button
     # after a user logs out and relogin by using the cached password in
Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.27 -r1.27.2.1
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	12 Aug 2018 12:12:13 -0000	1.27
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	13 Mar 2019 11:19:43 -0000	1.27.2.1
@@ -104,8 +104,9 @@
     {mode $elm_mode(email)}
 }
 
-if { [acs_user::ScreenName] ne "none" } {
-    lappend elms_list [list screen_name:text[ad_decode [acs_user::ScreenName] "solicit" ",optional" ""] \
+set screen_name [acs_user::ScreenName]
+if { $screen_name ne "none" } {
+    lappend elms_list [list screen_name:text[expr {$screen_name eq "solicit" ? ",optional" : ""}] \
                            {label "[_ acs-subsite.Screen_name]"} \
                            {html {size 50}} \
                            {mode $elm_mode(screen_name)} \