Index: openacs-4/packages/forums/lib/forums/admin-forums-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/admin-forums-chunk.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/lib/forums/admin-forums-chunk.tcl	7 Aug 2017 23:48:11 -0000	1.6
+++ openacs-4/packages/forums/lib/forums/admin-forums-chunk.tcl	15 Sep 2017 06:58:16 -0000	1.7
@@ -33,7 +33,7 @@
             label "Enabled"
             html { align center }
             display_template {
-                <if @forums.enabled_p@ true>
+                <if @forums.enabled_p;literal@ true>
                   <a href="@forums.disable_url@" title="Disable forum @forums.name@"><img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" style="background-color: white;" alt="\#forums.disable\#"></a>
                 </if>
                 <else>
Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/forums/lib/forums/forums-chunk.tcl	7 Aug 2017 23:48:11 -0000	1.15
+++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl	15 Sep 2017 06:58:16 -0000	1.16
@@ -53,11 +53,11 @@
                   </if>
                 </if>
                 <else>
-                  <if @forums.new_p@ and @forums.n_threads@ gt 0>
+                  <if @forums.new_p;literal@ true> and @forums.n_threads@ gt 0>
                     <strong>
                   </if>
                   @forums.name@
-                  <if @forums.new_p@ and @forums.n_threads@ gt 0>
+                  <if @forums.new_p;literal@ true> and @forums.n_threads@ gt 0>
                     </strong>
                   </if>
                 </else>
Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/forums/lib/message/threads-chunk.tcl	7 Aug 2017 23:48:11 -0000	1.17
+++ openacs-4/packages/forums/lib/message/threads-chunk.tcl	15 Sep 2017 06:58:16 -0000	1.18
@@ -82,13 +82,13 @@
                 <h2 class="forum-heading">
 		<a href="@messages.message_url@" title="#forums.goto_thread_subject#">
                   <if @useReadingInfo@>
-                   <if @messages.unread_p@>
+                   <if @messages.unread_p;literal@ true>
                     <b>@messages.subject@</b>
                    </if>
                    <else>@messages.subject@</else>
                   </if>
                   <else>
-                   <if @messages.new_p@>
+                   <if @messages.new_p;literal@ true>
                     <b>@messages.subject@</b>
                    </if>
                    <else>@messages.subject@</else>
Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/xinha/file-selector.tcl	7 Aug 2017 23:48:31 -0000	1.19
+++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl	15 Sep 2017 07:00:27 -0000	1.20
@@ -219,7 +219,7 @@
       name {
         label "[_ file-storage.Name]"
         display_template {
-          <if @contents.folder_p@ eq 0>
+          <if @contents.folder_p;literal@ false>
           <input type="radio" name="linktarget" value="@contents.object_id@" 
              id="oi@contents.object_id@" />
           <input type="hidden" name="@contents.object_id@_file_url" 
Index: openacs-4/packages/xowiki/www/xinha/insert-file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-file.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/xinha/insert-file.adp	7 Aug 2017 23:48:31 -0000	1.4
+++ openacs-4/packages/xowiki/www/xinha/insert-file.adp	15 Sep 2017 07:00:27 -0000	1.5
@@ -235,7 +235,7 @@
 	<table border="0" width="100%" style="margin: 0 auto; text-align: left;padding: 0px;">
 	  <tbody>
       <td valign="top" width="50%" >
-	<if @write_p@ eq 1>
+	<if @write_p;literal@ true>
 	  <fieldset style="margin-top:10px;padding-top:10px;">
 	    <legend><strong>@HTML_UploadTitle@</strong></legend>
 	    <formtemplate id="upload_form">
Index: openacs-4/packages/acs-admin/www/auth/batch-job.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/auth/batch-job.tcl	7 Aug 2017 23:47:45 -0000	1.14
+++ openacs-4/packages/acs-admin/www/auth/batch-job.tcl	15 Sep 2017 07:01:22 -0000	1.15
@@ -107,7 +107,7 @@
         success_p {
             label "\#acs-admin.Success\#"
             display_template {
-                <if @batch_actions.success_p@ eq "t">
+                <if @batch_actions.success_p;literal@ true>
                   <font color="green">\#acs-admin.Yes\#</font>
                 </if>
                 <else>
Index: openacs-4/packages/acs-admin/www/auth/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-admin/www/auth/index.tcl	7 Aug 2017 23:47:45 -0000	1.12
+++ openacs-4/packages/acs-admin/www/auth/index.tcl	15 Sep 2017 07:01:22 -0000	1.13
@@ -31,7 +31,7 @@
             label "\#acs-admin.Enabled\#"
             html { align center }
             display_template {
-                <if @authorities.enabled_p@ true>
+                <if @authorities.enabled_p;literal@ true>
                 <a href="@authorities.enabled_p_url@" title="\#acs-admin.Disable_this_authority\#"><img src="/shared/images/checkboxchecked.gif" alt="enabled" height="13" width="13" style="background-color: white; border: 0;"></a>
                 </if>
                 <else>
Index: openacs-4/packages/acs-developer-support/lib/footer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/footer.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-developer-support/lib/footer.adp	7 Aug 2017 23:47:55 -0000	1.19
+++ openacs-4/packages/acs-developer-support/lib/footer.adp	15 Sep 2017 07:04:40 -0000	1.20
@@ -1,4 +1,4 @@
-<if @show_p@ true>
+<if @show_p;literal@ true>
   <div class="developer-support-footer">
     <if @errcount@ gt 0>
       <p style="color: red">errors: @errcount@ <a href="@ds_url@send?output=@request@:error">view</a></p>
@@ -9,7 +9,7 @@
       </multiple>
       <hr>
     </if>
-    <if @user_switching_p@ true>
+    <if @user_switching_p;literal@ true>
       <form action="@set_user_url@">
         @export_vars;noquote@
         Real user: @real_user_name@ (@real_user_email@) [user_id #@real_user_id@]<br>
@@ -19,9 +19,9 @@
         <else>
           Faked user: <em>Not faking.</em><br>
         </else>
-        Change faked user: <if @search_p@ eq "0"><select name="user_id">
+        Change faked user: <if @search_p;literal@ false><select name="user_id">
           <multiple name="users">
-            <option value="@users.user_id@" <if @users.selected_p@>selected</if>>@users.name@ <if @users.email@ not nil>(@users.email@)</if></option>
+            <option value="@users.user_id@" <if @users.selected_p;literal@ true>selected</if>>@users.name@ <if @users.email@ not nil>(@users.email@)</if></option>
           </multiple>
         </select></if><else><input type="text" name="keyword"><input type="hidden" name="target" value="@target@"></else>
         <input type="submit" value="Go">
Index: openacs-4/packages/acs-developer-support/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-developer-support/lib/toolbar.adp	7 Aug 2017 23:47:55 -0000	1.21
+++ openacs-4/packages/acs-developer-support/lib/toolbar.adp	15 Sep 2017 07:04:40 -0000	1.22
@@ -1,4 +1,4 @@
-<if @show_p@ true>
+<if @show_p;literal@ true>
   <table width="100%" id="developer-toolbar">
     <tr align="center">
       <td>
Index: openacs-4/packages/acs-developer-support/www/request-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-developer-support/www/request-info.adp	3 Jul 2015 10:25:42 -0000	1.9
+++ openacs-4/packages/acs-developer-support/www/request-info.adp	15 Sep 2017 07:04:40 -0000	1.10
@@ -2,7 +2,7 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-  <if @page_fragment_cache_p@ true>
+  <if @page_fragment_cache_p;literal@ true>
     <p>
       <form name="searchfrags" action="/ds/search">
         <input type="hidden" name="request" value="@request@">
@@ -12,7 +12,7 @@
     </p></if>
 
 @body;noquote@
-<if @expired_p@ eq 0>
+<if @expired_p;literal@ false>
   <if @dbreqs:rowcount@ gt 0>
     <listfilters name="dbreqs" style="inline-filters"></listfilters>
     <listtemplate name="dbreqs"></listtemplate>
@@ -21,7 +21,7 @@
   <if @profiling:rowcount@ gt 0>
     <h3>Profiling Information</h3>
     <listtemplate name="profiling"></listtemplate>
-    <if @page_fragment_cache_p@ true>
+    <if @page_fragment_cache_p;literal@ true>
       <p>
         <form name="searchfrags" action="search">
           <input type="hidden" name="request" value="@request@">
Index: openacs-4/packages/acs-developer-support/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-developer-support/www/search.adp	7 Aug 2017 23:47:56 -0000	1.6
+++ openacs-4/packages/acs-developer-support/www/search.adp	15 Sep 2017 07:04:40 -0000	1.7
@@ -10,7 +10,7 @@
       </form>
     </p>
 
-  <if @gone_p@ false> 
+  <if @gone_p;literal@ false> 
     <if @matches:rowcount@ gt 0>
       <multiple name="matches">
         <div style="border-bottom: 1px solid black;"><p>@matches.file_links;noquote@ <strong>@matches.page@</strong> @matches.size@ bytes</p><pre>@matches.excerpt;noquote@</pre></div>