diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 41ee582747ddebec052d9bdd92dc1bb2e48d0dc5..1fdd719fdbf073a256aa12e93bbcb0d706b67236 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -45,15 +45,15 @@ THE SOFTWARE.
             <j:forEach var="p" items="${app.pluginManager.plugins}">
               <tr>
                 <td class="center pane">
-                  <j:set var="state" value="${h.ifThenElse(p.enabled,'true',null)}"/>
+                  <j:set var="state" value="${p.enabled?'true':null}"/>
                   <input type="checkbox" checked="${state}" onclick="flip(event)"
                          url="plugin/${p.shortName}"
-                         original="${h.ifThenElse(p.active,'true','false')}"/>
+                         original="${p.active?'true':'false'}"/>
                 </td>
                 <td class="pane">
                   <div>
                     <a href="${p.url}">
-                      ${h.ifThenElse(p.updateInfo!=null, p.updateInfo.title, p.longName)}
+                      ${p.updateInfo.title?:p.longName}
                     </a>
                   </div>
                   <div class="excerpt">
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
index e9b90733558726b5a46cd6c24987196e580c4a87..3ccc9d85060d8e4fc74102664a560789f32bc3c9 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
@@ -67,7 +67,7 @@ THE SOFTWARE.
               var labels = new YAHOO.widget.TextNode("${%Labels}", tree.getRoot(), false);
 
               <j:forEach var="l" items="${app.labels}">
-                new YAHOO.widget.TextNode('&lt;input type="checkbox" name="label.${l.name}" id="label.${l.name}" <j:if test="${labels.contains(l)}">checked</j:if>&gt;<label for="label.${l.name}">${h.jsStringEscape(l.name)} (${h.jsStringEscape(l.description)})</label>', ${h.ifThenElse(l.isSelfLabel(),'machines','labels')}, false);
+                new YAHOO.widget.TextNode('&lt;input type="checkbox" name="label.${l.name}" id="label.${l.name}" <j:if test="${labels.contains(l)}">checked</j:if>&gt;<label for="label.${l.name}">${h.jsStringEscape(l.name)} (${h.jsStringEscape(l.description)})</label>', ${l.isSelfLabel()?'machines':'labels'}, false);
               </j:forEach>
 
               tree.draw();
diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
index 88001f5a980a31650c6452b19897afaf14c228cd..9aa3fd42883926da89a772051136042cc5e6518d 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
       <j:if test="${it.configurable}">
         <j:if test="${!it.disabled}">
           <l:task icon="images/24x24/clock.gif" href="${url}/build?delay=0sec" title="${%Build Now}"
-                  onclick="${h.ifThenElse(it.parameterized,null,'return build(this)')}" permission="${it.BUILD}" />
+                  onclick="${it.parameterized?null:'return build(this)'}" permission="${it.BUILD}" />
           <script>
             function build(a) {
               new Ajax.Request(a.href,{method:"post"});
diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly
index 327262d7a4356779112beff523c99335d9970efe..49178b059e73d911bebe4fb329787c68e8809057 100644
--- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly
+++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly
@@ -23,5 +23,5 @@ THE SOFTWARE.
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <!-- upstreamUrl added in 1.284, so handle missing value -->
-    <p>${h.ifThenElse(it.upstreamUrl!=null,"%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)",it.shortDescription)}</p>
+    <p>${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}</p>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/Hudson/configure.jelly b/core/src/main/resources/hudson/model/Hudson/configure.jelly
index 2d85979fc2166b46ba0aebd9a0801257638f34be..d4c168e532e2e9db18379d4c046edccb41ae12ef 100644
--- a/core/src/main/resources/hudson/model/Hudson/configure.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/configure.jelly
@@ -58,8 +58,8 @@ THE SOFTWARE.
                    checked="${it.slaveAgentPort &gt; 0}" onclick="$('sat.port').disabled=false"/>
           <label for="sat.fixed">${%Fixed}</label> :
           <input type="text" class="number" name="slaveAgentPort" id="sat.port"
-             value="${h.ifThenElse(it.slaveAgentPort &gt; 0, it.slaveAgentPort, null)}"
-             disabled="${h.ifThenElse(it.slaveAgentPort &gt; 0, null, 'true')}"/>
+             value   ="${it.slaveAgentPort gt 0 ? it.slaveAgentPort : null}"
+             disabled="${it.slaveAgentPort gt 0 ? null : 'true'}"/>
 
           <st:nbsp />
 
diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index be3207f000817f33e08fad526daa05cab9467047..7cbb259d2ca0c29229b715c6cb98a0f960c651b3 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -42,7 +42,7 @@ THE SOFTWARE.
         <j:arg value="150" />
       </j:invokeStatic>
       <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
-      <j:set var="offset" value="${h.ifThenElse(empty(consoleFull),it.logFile.length()-threshold*1024,0)}" />
+      <j:set var="offset" value="${empty(consoleFull) ? it.logFile.length()-threshold*1024 : 0}" />
       <j:choose>
         <j:when test="${offset > 0}">
           ${%skipSome(offset/1024,"consoleFull")}
diff --git a/core/src/main/resources/hudson/model/View/builds.jelly b/core/src/main/resources/hudson/model/View/builds.jelly
index 85df55ed05d57e252c37eaf6149f7d180f9a2c95..f7870b9c9a7bb94caaf8ad2d110a8d9a38eaee37 100644
--- a/core/src/main/resources/hudson/model/View/builds.jelly
+++ b/core/src/main/resources/hudson/model/View/builds.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
     <l:main-panel>
       <h1>
         <img src="${imagesURL}/48x48/notepad.gif" alt=""/>
-        ${%buildHistory(h.ifThenElse(it.class.name=='hudson.model.AllView',app.displayName,it.displayName))}
+        ${%buildHistory(it.class.name=='hudson.model.AllView' ? app.displayName : it.displayName)}
       </h1>
       <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>
diff --git a/core/src/main/resources/hudson/model/View/cc.xml.jelly b/core/src/main/resources/hudson/model/View/cc.xml.jelly
index 365f912d4eff46f9a361a26478b71914de191352..099f48340b3fac0008d53019d892ff486f54112d 100644
--- a/core/src/main/resources/hudson/model/View/cc.xml.jelly
+++ b/core/src/main/resources/hudson/model/View/cc.xml.jelly
@@ -35,7 +35,7 @@ THE SOFTWARE.
       <j:set var="lb" value="${p.lastCompletedBuild}"/>
       <j:if test="${lb!=null}">
         <Project  name="${p.displayName}"
-                  activity="${h.ifThenElse(p.isBuilding(),'Building','Sleeping')}"
+                  activity="${p.isBuilding() ? 'Building' : 'Sleeping'}"
                   lastBuildStatus="${h.toCCStatus(p)}"
                   lastBuildLabel="${lb.number}"
                   lastBuildTime="${lb.timestampString2}"
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index c89cfc76fcaf41b41abf1f515411239d5291c9ad..8194bd8f589fe04a3651cde174b77bc3b627ea6c 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 	<st:header name="X-Hudson" value="${servletContext.getAttribute('version')}" />
   <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
-	<l:layout title="${h.ifThenElse(it.class.name=='hudson.model.AllView','%Dashboard',it.viewName)}">
+	<l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}">
     <st:include page="sidepanel.jelly" />
 		<l:main-panel>
 		  <div id="view-message">
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index e28eb46f52388b7379bff1c381317798588e8feb..ae5fa43c24a83a3adae88fd6617184d22ab5734c 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -54,7 +54,7 @@ THE SOFTWARE.
                            title="${d.displayName}">
         <j:set var="descriptor" value="${d}"/>
         <j:set var="instance"
-               value="${h.ifThenElse(it.launcher.descriptor==d,it.launcher,null)}"/>
+               value="${it.launcher.descriptor==d ? it.launcher : null}"/>
         <tr><td>
           <input type="hidden" name="stapler-class" value="${d.clazz.name}" />
         </td></tr>
@@ -74,7 +74,7 @@ THE SOFTWARE.
                                title="${d.displayName}">
             <j:set var="descriptor" value="${d}"/>
             <j:set var="instance"
-                   value="${h.ifThenElse(it.retentionStrategy.descriptor==d,it.retentionStrategy,null)}"/>
+                   value="${it.retentionStrategy.descriptor==d ? it.retentionStrategy : null}"/>
             <tr><td>
               <input type="hidden" name="stapler-class" value="${d.clazz.name}" />
             </td></tr>
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global.jelly b/core/src/main/resources/hudson/tasks/Mailer/global.jelly
index d8f96c554c0111f133fce280868db821c0fc099f..db7003eb4061447e6b11e96d2e3f8c19eb4278e0 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/global.jelly
+++ b/core/src/main/resources/hudson/tasks/Mailer/global.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
     </f:entry>
     <f:entry title="${%Hudson URL}"
              help="/help/tasks/mailer/url.html">
-      <f:textbox field="url" value="${h.ifThenElse(descriptor.url!=null,descriptor.url,h.inferHudsonURL(request))}" />
+      <f:textbox field="url" value="${descriptor.url ?: h.inferHudsonURL(request)}" />
     </f:entry>
     <f:advanced>
       <f:optionalBlock name="mailer.useSMTPAuth" title="${%Use SMTP Authentication}" checked="${descriptor.smtpAuthUserName!=null}"
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
index a46e905ca738611b7818e3af566f0816863de42e..9f62674d9248af68345db5162662f826673cda98 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/global.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
       <f:entry title="${%Max # of concurrent polling}"
                help="/help/triggers/SCMTrigger/concurrency.html">
         <input class="setting-input" name="poll_scm_threads"
-          type="text" value="${h.ifThenElse(descriptor.pollingThreadCount==0,'',descriptor.pollingThreadCount)}"/>
+          type="text" value="${descriptor.pollingThreadCount==0 ? '' : descriptor.pollingThreadCount}"/>
       </f:entry>
     </f:section>
   </j:if>
diff --git a/core/src/main/resources/hudson/views/LastDurationColumn/column.jelly b/core/src/main/resources/hudson/views/LastDurationColumn/column.jelly
index 1b2863580aaef99429705d0f4a508ce30816d454..1444b07c0bdce326f6997164011b0cf61a28c7b6 100644
--- a/core/src/main/resources/hudson/views/LastDurationColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastDurationColumn/column.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-      <td data="${h.ifThenElse(lsBuild==null,h.ifThenElse(lfBuild==null,'0',lfBuild.duration),lsBuild.duration)}">
+      <td data="${lsBuild.duration ?: lfBuild.duration ?: '0'}">
           <j:choose>
               <j:when test="${lsBuild!=null}">
                   ${lsBuild.durationString}
diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
index 5e43d504854c6c316aa529687578ee72420951a7..939f8226450abcd0f894680cd3f85f4deb725613 100644
--- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-    <td data="${h.ifThenElse(lfBuild==null,'-',lfBuild.timestampString2)}">
+    <td data="${lfBuild.timestampString2 ?: '-'}">
           <j:choose>
               <j:when test="${lfBuild!=null}">
                   ${lfBuild.timestampString}
diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
index ff301babe28fe96b1a5bd2604609a7b7e0d66202..8d860af47ea9b55fdb466cfa5a26e16ba9332602 100644
--- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-    <td data="${h.ifThenElse(lsBuild==null,'-',lsBuild.timestampString2)}">
+    <td data="${lsBuild.timestampString2 ?: '-'}">
           <j:choose>
               <j:when test="${lsBuild!=null}">
                   ${lsBuild.timestampString}
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index 167f53a3d5c39d4f167fbf21da76868304217ac9..25102e03c1ac8a10162879c6c6b14b40018314a1 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:set var="link" value="${it.baseUrl}/${build.number}/" />
-  <tr class="build-row ${h.ifThenElse(build.building,'transitive',null)}">
+  <tr class="build-row ${build.building ? 'transitive' : null}">
     <td nowrap="nowrap">
       <img width="16" height="16" src="${imagesURL}/16x16/${build.buildStatusUrl}" alt="${build.iconColor.description}" tooltip="${build.iconColor.description}" /><st:nbsp/>
       #${build.number}
@@ -53,7 +53,7 @@ THE SOFTWARE.
           <t:buildProgressBar build="${build}"/>
         </td><td style="padding:0">
           <!-- Check ABORT permission for Project, Admin permission otherwise -->
-          <j:if test="${h.ifThenElse(empty(it.owner.ABORT),h.hasPermission(app.ADMINISTER),it.owner.hasPermission(it.owner.ABORT))}">
+          <j:if test="${empty(it.owner.ABORT) ? h.hasPermission(app.ADMINISTER) : it.owner.hasPermission(it.owner.ABORT)}">
             <a href="${link}stop"><img src="${imagesURL}/16x16/stop.gif" alt="[cancel]"/></a>
           </j:if>
         </td></tr>
@@ -61,7 +61,7 @@ THE SOFTWARE.
     </td></tr>
   </j:if>
   <j:if test="${!empty build.description}">
-    <tr class="${h.ifThenElse(build.building,'transitive',null)}">
+    <tr class="${build.building ? 'transitive' : null}">
       <td></td>
       <td style="padding:0;white-space:normal">
         ${build.truncatedDescription}
diff --git a/core/src/main/resources/lib/form/descriptorList.jelly b/core/src/main/resources/lib/form/descriptorList.jelly
index 827e3a9f2e7678f95d845c2dd00dddd602b34096..96bc4183b364dd32d0bdf899d6bb5d15af53b67b 100644
--- a/core/src/main/resources/lib/form/descriptorList.jelly
+++ b/core/src/main/resources/lib/form/descriptorList.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
   </st:documentation>
 
   <j:set var="targetType" value="${h.defaulted(attrs.targetType,it.class)}"/>
-  <j:set var="instances" value="${h.ifThenElse(attrs.instances!=null,attrs.instances,instance[field])}"/>
+  <j:set var="instances" value="${attrs.instances ?: instance[field]}"/>
 
   <f:section title="${attrs.title}" name="${h.defaulted(attrs.field,attrs.name)}">
     <j:if test="${attrs.field!=null}">
diff --git a/core/src/main/resources/lib/form/descriptorRadioList.jelly b/core/src/main/resources/lib/form/descriptorRadioList.jelly
index c542ce53414ceceffd4405f7ae181afd9d802423..71a632938b5dcfc626e9f7dd6d75ca04ef363b98 100644
--- a/core/src/main/resources/lib/form/descriptorRadioList.jelly
+++ b/core/src/main/resources/lib/form/descriptorRadioList.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
       <f:radioBlock name="${varName}" help="${d.helpFile}" value="${loop.index}"
         title="${d.displayName}" checked="${instance.descriptor==d}">
         <j:set var="descriptor" value="${d}" />
-	      <j:set var="instance" value="${h.ifThenElse(instance.descriptor==d,instance,null)}" />
+	      <j:set var="instance" value="${instance.descriptor==d?instance:null}" />
 	      <st:include from="${d}" page="${d.configPage}" optional="true" />
 	    </f:radioBlock>
 	  </j:forEach>
diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index 6ec14433c2fb1fa8c2358f60649190d5c72b0fdb..673167ef1aa7c060ccb39bd924249e60ce540f0b 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -75,7 +75,7 @@ THE SOFTWARE.
   </d:taglib>
 
   <j:set var="targetType" value="${h.defaulted(attrs.targetType,it.class)}"/>
-  <div class="hetero-list-container ${h.ifThenElse(attrs.hasHeader!=null,'with-drag-drop','')}">
+  <div class="hetero-list-container ${attrs.hasHeader!=null?'with-drag-drop':''}">
     <!-- display existing items -->
     <j:forEach var="i" items="${attrs.items}">
       <j:set var="descriptor" value="${i.descriptor}" />
diff --git a/core/src/main/resources/lib/form/option.jelly b/core/src/main/resources/lib/form/option.jelly
index e05b7a8c228fd80e2713f087bf36a1691f8eb636..ddbb4686493f99d9ca32e361c39543b440ccfcb4 100644
--- a/core/src/main/resources/lib/form/option.jelly
+++ b/core/src/main/resources/lib/form/option.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
       If true, the option value appears as selected.
     </st:attribute>
   </st:documentation>
-  <option value="${attrs.value}" selected="${h.ifThenElse(attrs.selected,'true',null)}">
+  <option value="${attrs.value}" selected="${attrs.selected?'true':null}">
     <d:invokeBody/>
   </option>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/password.jelly b/core/src/main/resources/lib/form/password.jelly
index 38a30bcbbc50266f17d72905f531f09946523ebe..838541ffd5b11b56b5c028166fcfb01db94b607e 100644
--- a/core/src/main/resources/lib/form/password.jelly
+++ b/core/src/main/resources/lib/form/password.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <f:prepareDatabinding />
-  <input class="setting-input ${h.ifThenElse(attrs.checkUrl!=null,'validated','')}"
+  <input class="setting-input ${attrs.checkUrl!=null?'validated':''}"
          name ="${h.defaulted(attrs.name,'_.'+attrs.field)}"
          value="${h.defaulted(attrs.value,instance[attrs.field])}"
          id="${attrs.id}"
diff --git a/core/src/main/resources/lib/form/radio.jelly b/core/src/main/resources/lib/form/radio.jelly
index b1e388390b6612f4876a8097f2457834f26fd8e7..d3e96c55f513145f9954e7d841777c17fee6b0f5 100644
--- a/core/src/main/resources/lib/form/radio.jelly
+++ b/core/src/main/resources/lib/form/radio.jelly
@@ -28,4 +28,4 @@ THE SOFTWARE.
 	Note that safari doesn't support onchange.
 -->
 <input type="radio" name="${attrs.name}" onclick="${attrs.onclick}" id="${attrs.id}" value="${attrs.value}"
-        checked="${h.ifThenElse(attrs.checked,'true',null)}"/>
\ No newline at end of file
+        checked="${attrs.checked?'true':null}"/>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/radioBlock.jelly b/core/src/main/resources/lib/form/radioBlock.jelly
index ba69c702798beff2f20643f1ab1caf221e2f4126..64631fc20b4f5d5ebfe931307b5a36bfa46b4e9d 100644
--- a/core/src/main/resources/lib/form/radioBlock.jelly
+++ b/core/src/main/resources/lib/form/radioBlock.jelly
@@ -52,7 +52,7 @@ THE SOFTWARE.
 	<tr id="rb_s${rb_id}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
 	  <td colspan="3">
 	    <input type="radio" name="${name}" value="${value}"
-             id="Rb${rb_id}" checked="${h.ifThenElse(checked,'true',null)}" />
+             id="Rb${rb_id}" checked="${checked?'true':null}" />
       <st:nbsp/>
       <label for="Rb${rb_id}">${title}</label>
     </td>
diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly
index e264e76494cdcf2fb6d7fa2a1e42fb3442baf032..d3bd8f4b51a525b3723df4dd04aeb40f7f88edb9 100644
--- a/core/src/main/resources/lib/form/repeatable.jelly
+++ b/core/src/main/resources/lib/form/repeatable.jelly
@@ -101,7 +101,7 @@ THE SOFTWARE.
       <j:set var="descriptor" value="${descriptor.getPropertyType(field).itemTypeDescriptor}" />
     </j:when>
     <j:otherwise>
-      <j:set var="name" value="${h.ifThenElse(attrs.name!=null,attrs.name,attrs.var)}"/>
+      <j:set var="name" value="${attrs.name?:attrs.var}"/>
     </j:otherwise>
   </j:choose>
 
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index c5a2d73acf939f33e5dfc200b1533321a68f1b61..6276b0aa8472f9af2d4b5f3ad86608751b5e41ec 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -44,7 +44,7 @@ THE SOFTWARE.
     <j:otherwise>
       <j:set var="id" value="${h.generateId()}" />
       <j:set var="head" value="rowGroupStart${id}"/>
-      <j:set var="ref" value="${h.ifThenElse(attrs.ref!=null, attrs.ref, head)}"/>
+      <j:set var="ref" value="${attrs.ref?:head}"/>
 
       <tr id="${head}" style="display:none" name="${attrs.name}" />
       <d:invokeBody />
diff --git a/core/src/main/resources/lib/form/textarea.jelly b/core/src/main/resources/lib/form/textarea.jelly
index 726a3822b2c68a21e6ab2e9be8a3c4ebac43af28..d4a0de5f746fe2a56f646ea4050c60bb97d52fa8 100644
--- a/core/src/main/resources/lib/form/textarea.jelly
+++ b/core/src/main/resources/lib/form/textarea.jelly
@@ -52,7 +52,7 @@ THE SOFTWARE.
   <f:prepareDatabinding />
   <textarea id="${attrs.id}" style="${attrs.style}"
             name ="${h.defaulted(attrs.name,'_.'+attrs.field)}"
-            class="setting-input ${h.ifThenElse(checkUrl!=null,'validated','')}"
+            class="setting-input ${checkUrl!=null?'validated':''}"
             checkUrl="${checkUrl}"
             rows="${h.determineRows(attrs.value)}">
     <st:out value="${h.defaulted(attrs.value,instance[attrs.field])}" />
diff --git a/core/src/main/resources/lib/form/textbox.jelly b/core/src/main/resources/lib/form/textbox.jelly
index 6ae30d8a23b8eea2b2a40e2a9ba29d5ce24efa93..bd0a314379c5e49e4c5a8681bbf572a1d6736188 100644
--- a/core/src/main/resources/lib/form/textbox.jelly
+++ b/core/src/main/resources/lib/form/textbox.jelly
@@ -49,7 +49,7 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <f:prepareDatabinding />
-  <input class="setting-input ${h.ifThenElse(attrs.checkUrl!=null,'validated','')}"
+  <input class="setting-input ${attrs.checkUrl!=null?'validated':''}"
          name ="${h.defaulted(attrs.name,'_.'+attrs.field)}"
          value="${h.defaulted(attrs.value,instance[attrs.field])}"
          id="${attrs.id}"
diff --git a/core/src/main/resources/lib/hudson/buildHealth.jelly b/core/src/main/resources/lib/hudson/buildHealth.jelly
index 1086a16dd9aa2fbd6bb18ef9ac0846515c199962..13672a59a0ee3feaa82f6ad759b0555e9ea9f261 100644
--- a/core/src/main/resources/lib/hudson/buildHealth.jelly
+++ b/core/src/main/resources/lib/hudson/buildHealth.jelly
@@ -31,13 +31,13 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <j:set var="buildHealth" value="${job.buildHealth}"/>
     <j:if test="${td}"><j:set var="useTdElement" value="x"/></j:if>
-    <x:element name="${h.ifThenElse(useTdElement!=null,'td','div')}">
+    <x:element name="${useTdElement!=null?'td':'div'}">
         <x:attribute name="data">${buildHealth.score}</x:attribute>
         <x:attribute name="class">healthReport</x:attribute>
         <x:attribute name="onmouseover">this.className='healthReport hover';return true;
         </x:attribute>
         <x:attribute name="onmouseout">this.className='healthReport';return true;</x:attribute>
-        <a href="${h.ifThenElse(empty(link),'#',link)}" style="${attrs.style}">
+        <a href="${empty(link)?'#':link}" style="${attrs.style}">
             <img src="${rootURL}${buildHealth.getIconUrl(iconSize)}"
                  alt="${buildHealth.score}%"/>
         </a>
diff --git a/core/src/main/resources/lib/hudson/buildLink.jelly b/core/src/main/resources/lib/hudson/buildLink.jelly
index 4014aa1e9e9af4840a3b21da11da36d7f5138253..4de7e09933b75b619e4734e837ec791d0c9696e7 100644
--- a/core/src/main/resources/lib/hudson/buildLink.jelly
+++ b/core/src/main/resources/lib/hudson/buildLink.jelly
@@ -45,7 +45,7 @@ THE SOFTWARE.
           #<!-- -->${number}
 	      </j:when>
 	      <j:otherwise>
-	        <a href="${h.ifThenElse(attrs.href!=null,href,rootURL+'/'+r.url)}">
+	        <a href="${attrs.href ?: rootURL+'/'+r.url}">
 	          <img src="${imagesURL}/16x16/${r.buildStatusUrl}"
                  alt="${r.iconColor.description}"/>${jobName_}#<!-- -->${number}</a>
 	      </j:otherwise>
diff --git a/core/src/main/resources/lib/hudson/editableDescription.jelly b/core/src/main/resources/lib/hudson/editableDescription.jelly
index 0a6ebfd8d813d0b4e7a821f783bdbd605b987d4c..65131513e9ce717a8d31fe59387b0577f1a22f18 100644
--- a/core/src/main/resources/lib/hudson/editableDescription.jelly
+++ b/core/src/main/resources/lib/hudson/editableDescription.jelly
@@ -39,7 +39,7 @@ THE SOFTWARE.
     </div>
 
     <l:hasPermission permission="${permission}">
-      <div align="right"><a href="editDescription" onclick="${h.ifThenElse(h.isAutoRefresh(request), null, 'return replaceDescription();')}">
+      <div align="right"><a href="editDescription" onclick="${h.isAutoRefresh(request) ? null : 'return replaceDescription();'}">
         <img src="${imagesURL}/16x16/notepad.gif" alt="" />
         <j:choose>
           <j:when test="${empty(it.description)}">
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index 4983e9c60f8fc32a1e154f189fc52d328e5b3872..59d990068b66012c36cc245b0708a6f0b29fb4c5 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -37,7 +37,7 @@ THE SOFTWARE.
       <j:if test="${!c.acceptingTasks}"> (${%suspended})</j:if>
     </d:tag>
   </d:taglib>
-  <j:set var="computers" value="${h.ifThenElse(attrs.computers!=null, attrs.computers, app.computers)}" />
+  <j:set var="computers" value="${attrs.computers?:app.computers}" />
 	<l:pane title="&lt;a href='${rootURL}/computer/'>${%Build Executor Status}&lt;/a>" width="3" id="executors">
 	  <j:forEach var="c" items="${computers}" varStatus="cloop">
 	    <j:choose>
@@ -111,7 +111,7 @@ THE SOFTWARE.
     <!-- schedule updates only for the full page reload -->
     <j:if test="${ajax==null and !h.isAutoRefresh(request) and h.hasPermission(app.READ)}">
       <script defer="defer">
-        refreshPart('executors',"${h.ifThenElse(h.hasView(it,'ajaxExecutors'),'.',rootURL)}/ajaxExecutors");
+        refreshPart('executors',"${h.hasView(it,'ajaxExecutors')?'.':rootURL}/ajaxExecutors");
       </script>
     </j:if>
 	</l:pane>
diff --git a/core/src/main/resources/lib/hudson/progressBar.jelly b/core/src/main/resources/lib/hudson/progressBar.jelly
index 718603dcbd931b701753530463c7653ce3ff7ecc..a4ea13eed646f332059566f60ae1555798cf28ae 100644
--- a/core/src/main/resources/lib/hudson/progressBar.jelly
+++ b/core/src/main/resources/lib/hudson/progressBar.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
     red  : if set to non-null, the progress bar will be drawn in red, to indicate that the processing is likely stuck.
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <table class="progress-bar ${h.ifThenElse(attrs.red,'red',null)}" id="${attrs.id}" tooltip="${attrs.tooltip}" href="${attrs.href}" style="${h.ifThenElse(attrs.href!=null,'cursor:pointer',null)}">
+  <table class="progress-bar ${attrs.red?'red':null}" id="${attrs.id}" tooltip="${attrs.tooltip}" href="${attrs.href}" style="${h.ifThenElse(attrs.href!=null,'cursor:pointer',null)}">
     <j:choose>
       <j:when test="${pos lt 0}">
         <!-- style sheet will fill in the progress bar image -->
diff --git a/core/src/main/resources/lib/hudson/progressiveText.jelly b/core/src/main/resources/lib/hudson/progressiveText.jelly
index 28fc8d072db7d2d3d64120097c63ffa842d9b8fe..ea3a5b82936333884a5dd2ffed621cb8587fba98 100644
--- a/core/src/main/resources/lib/hudson/progressiveText.jelly
+++ b/core/src/main/resources/lib/hudson/progressiveText.jelly
@@ -65,7 +65,7 @@ THE SOFTWARE.
 	      });
 	    }
 	  </j:if>
-	  $$("${idref}").fetchedBytes = ${h.ifThenElse(empty(startOffset),0,startOffset)};
+	  $$("${idref}").fetchedBytes = ${empty(startOffset)?0:startOffset};
 	  fetchNext($$("${idref}"),"${href}");
 	</script>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/config-scm.jelly b/core/src/main/resources/lib/hudson/project/config-scm.jelly
index 140cb6d2a387e702ba218a72f5a3cd2bc691546c..96da9376860718c8de4629d4836892bbc64a1fc9 100644
--- a/core/src/main/resources/lib/hudson/project/config-scm.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-scm.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
       <j:set var="descriptor" value="${scms[idx]}" />
       <j:set var="scmd" value="${descriptor}" /><!-- backward compatibility with <1.238 -->
       <f:radioBlock name="scm" value="${idx}" title="${scmd.displayName}" checked="${it.scm.descriptor==scmd}">
-        <j:set var="instance" value="${h.ifThenElse(it.scm.descriptor==descriptor, it.scm, null)}"/>
+        <j:set var="instance" value="${it.scm.descriptor==descriptor ? it.scm : null}"/>
         <j:set var="scm" value="${instance}" /><!-- backward compatibility with <1.238 -->
         <st:include from="${scmd}" page="${scmd.configPage}"/>
       </f:radioBlock>
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index 31db7ea04d9f28135de2a1acaefffbe786f02dbc..a25c2508932f4cbad14a81d49c55ac060d408610 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -49,7 +49,7 @@ THE SOFTWARE.
       <d:invokeBody/>
       <!-- project list -->
       <table id="projectstatus" class="sortable pane bigtable"
-             style="${h.ifThenElse(showViewTabs!=null,'margin-top:0px; border-top: none;',null)}">
+             style="${showViewTabs!=null?'margin-top:0px; border-top: none;':null}">
         <tr style="border-top: 0px;">
           <j:forEach var="col" items="${columnExtensions}">
              <st:include page="columnHeader.jelly" it="${col}" />
diff --git a/core/src/main/resources/lib/hudson/projectViewNested.jelly b/core/src/main/resources/lib/hudson/projectViewNested.jelly
index dcc693a729e2157fafcd5590ab8297fc153c64a4..6e76d140dd50fa6005863d06698237f4bb7a0762 100644
--- a/core/src/main/resources/lib/hudson/projectViewNested.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewNested.jelly
@@ -38,7 +38,7 @@ THE SOFTWARE.
             <!-- if nested view supports ajaxRows -->
             <a href="#">
               <img src="${imagesURL}/tree/plus.png" state="plus" width="14" height="14" alt="" class="fold-control treeview-fold-control"
-                   url="${rootURL}/${v.url}/ajaxRows?depth=${h.ifThenElse(depth!=null,depth+1,1)}"/>
+                   url="${rootURL}/${v.url}/ajaxRows?depth=${depth!=null?depth+1:1}"/>
               <st:adjunct includes="lib.hudson.projectViewNested" />
             </a>
           </j:otherwise>
diff --git a/core/src/main/resources/lib/hudson/projectViewRow.jelly b/core/src/main/resources/lib/hudson/projectViewRow.jelly
index 4d7354c640be57d289fe6f29801fff24b6f8b7cf..a495a177346663ac11d8e6ba765e67f57211cb46 100644
--- a/core/src/main/resources/lib/hudson/projectViewRow.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewRow.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <j:set var="lsBuild" value="${job.lastSuccessfulBuild}"/>
   <j:set var="lfBuild" value="${job.lastFailedBuild}"/>
-  <tr class="${h.ifThenElse(job.disabled,'disabledJob',null)}">
+  <tr class="${job.disabled?'disabledJob':null}">
       <j:forEach var="col" items="${columnExtensions}">
           <st:include page="column.jelly" it="${col}" />
       </j:forEach>
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index fe3775f05aac06515030c10fab61716acffad40a..67f4480aad52076f0746c30812f896be264e4ca1 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -58,7 +58,7 @@ THE SOFTWARE.
           <tr>
             <td class="pane" width="100%" tooltip="${item.why}" style="white-space: normal;">
               <j:set var="stuck" value="${item.isStuck()}" />
-              <a href="${rootURL}/${item.task.url}" style="${h.ifThenElse(stuck,'color:#ef2929',null)}">
+              <a href="${rootURL}/${item.task.url}" style="${stuck?'color:#ef2929':null}">
                 ${item.task.fullDisplayName}
                 <j:if test="${stuck}"> (${%appears to be stuck})</j:if>
               </a>
@@ -75,7 +75,7 @@ THE SOFTWARE.
     <!-- schedule updates only for the full page reload -->
     <j:if test="${ajax==null and !h.isAutoRefresh(request) and h.hasPermission(app.READ)}">
       <script defer="defer">
-        refreshPart('buildQueue',"${h.ifThenElse(h.hasView(it,'ajaxBuildQueue'),'.',rootURL)}/ajaxBuildQueue");
+        refreshPart('buildQueue',"${h.hasView(it,'ajaxBuildQueue')?'.':rootURL}/ajaxBuildQueue");
       </script>
     </j:if>
   </l:pane>
diff --git a/core/src/main/resources/lib/hudson/setIconSize.jelly b/core/src/main/resources/lib/hudson/setIconSize.jelly
index 200d543f1029f7bcd6f355bd93cf9d5365c6c32c..427c1f9fbc1e26ba217cd40916826ceec545b8a7 100644
--- a/core/src/main/resources/lib/hudson/setIconSize.jelly
+++ b/core/src/main/resources/lib/hudson/setIconSize.jelly
@@ -32,5 +32,5 @@ THE SOFTWARE.
     so we try not to make the secondary icons look bigger than the icon.
     we want the user's eyes to go to balls, not the clock.
   -->
-  <j:set scope="parent" var="subIconSize" value="${h.ifThenElse(iconSize=='32x32','24x24',iconSize)}"/>
+  <j:set scope="parent" var="subIconSize" value="${iconSize=='32x32'?'24x24':iconSize}"/>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/summary.jelly b/core/src/main/resources/lib/hudson/summary.jelly
index 33c2c7dc6abf9a6ce4da18c5b2b8de79a193e0b2..eecf88189caef5bbcea169e58e1ef2399aa74f63 100644
--- a/core/src/main/resources/lib/hudson/summary.jelly
+++ b/core/src/main/resources/lib/hudson/summary.jelly
@@ -45,12 +45,12 @@ THE SOFTWARE.
       <tr>
         <td>
           <a href="${attrs.href}">
-            <img src="${h.ifThenElse(icon.startsWith('/'), rootURL+icon, imagesURL+'/48x48/'+icon)}"
+            <img src="${icon.startsWith('/') ? rootURL+icon : imagesURL+'/48x48/'+icon}"
                  alt="" width="48" height="48" style="margin-right:1em" />
           </a>
         </td>
         <td style="vertical-align:middle">
-          <a href="${h.ifThenElse(attrs.iconOnly==null,attrs.href,null)}">
+          <a href="${attrs.iconOnly==null ? attrs.href : null}">
             <d:invokeBody />
           </a>
         </td>
diff --git a/core/src/main/resources/lib/layout/task.jelly b/core/src/main/resources/lib/layout/task.jelly
index e76c2b7577b8e38134272b11a9f1adbdb6b59176..1a4f9cc6f2a1c641eddf4cabaea1fab5c9085f01 100644
--- a/core/src/main/resources/lib/layout/task.jelly
+++ b/core/src/main/resources/lib/layout/task.jelly
@@ -72,7 +72,7 @@ THE SOFTWARE.
       <j:otherwise>
         <div class="task">
           <a href="${href}" onclick="${attrs.onclick}">
-            <img width="24" height="24" style="margin: 2px;" alt="" src="${rootURL}${h.ifThenElse(icon.startsWith('images/'),h.resourcePath,'')}/${icon}"/>
+            <img width="24" height="24" style="margin: 2px;" alt="" src="${rootURL}${icon.startsWith('images/') ? h.resourcePath : '')}/${icon}"/>
           </a>
           <st:nbsp />