diff --git a/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js b/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js
index 7901b77b906..8c4e3c31a9e 100644
--- a/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js
+++ b/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js
@@ -21,7 +21,7 @@ moduleFor('Helpers test: inline {{if}}', class extends TogglingHelperConditional
 
 });
 
-moduleFor('@glimmer Helpers test: nested {{if}} helpers (returning truthy values)', class extends TogglingHelperConditionalsTest {
+moduleFor('Helpers test: nested {{if}} helpers (returning truthy values)', class extends TogglingHelperConditionalsTest {
 
   templateFor({ cond, truthy, falsy }) {
     return `{{if (if ${cond} ${cond} false) ${truthy} ${falsy}}}`;
@@ -29,7 +29,7 @@ moduleFor('@glimmer Helpers test: nested {{if}} helpers (returning truthy values
 
 });
 
-moduleFor('@glimmer Helpers test: nested {{if}} helpers (returning falsy values)', class extends TogglingHelperConditionalsTest {
+moduleFor('Helpers test: nested {{if}} helpers (returning falsy values)', class extends TogglingHelperConditionalsTest {
 
   templateFor({ cond, truthy, falsy }) {
     return `{{if (if ${cond} true ${cond}) ${truthy} ${falsy}}}`;
@@ -37,7 +37,7 @@ moduleFor('@glimmer Helpers test: nested {{if}} helpers (returning falsy values)
 
 });
 
-moduleFor('@glimmer Helpers test: {{if}} used with another helper', class extends TogglingHelperConditionalsTest {
+moduleFor('Helpers test: {{if}} used with another helper', class extends TogglingHelperConditionalsTest {
 
   wrapperFor(templates) {
     return `{{concat ${templates.join(' ')}}}`;
diff --git a/packages/ember-htmlbars/lib/hooks/link-render-node.js b/packages/ember-htmlbars/lib/hooks/link-render-node.js
index dd661f355d7..ebdd9fe073a 100644
--- a/packages/ember-htmlbars/lib/hooks/link-render-node.js
+++ b/packages/ember-htmlbars/lib/hooks/link-render-node.js
@@ -21,14 +21,10 @@ export default function linkRenderNode(renderNode, env, scope, path, params, has
   let keyword = env.hooks.keywords[path];
   if (keyword && keyword.link) {
     keyword.link(renderNode.getState(), params, hash);
+  } else if (path === 'unbound') {
+    return true;
   } else {
-    switch (path) {
-      case 'unbound': return true;
-      case 'unless':
-      case 'if': params[0] = shouldDisplay(params[0], toBool); break;
-      case 'each': params[0] = eachParam(params[0]); break;
-      case 'with': params[0] = shouldDisplay(params[0], identity); break;
-    }
+    linkParamsFor(path, params);
   }
 
   // If there is a dot in the path, we need to subscribe to the arguments in the
@@ -65,6 +61,15 @@ export default function linkRenderNode(renderNode, env, scope, path, params, has
   return true;
 }
 
+export function linkParamsFor(path, params) {
+  switch (path) {
+  case 'unless':
+  case 'if': params[0] = shouldDisplay(params[0], toBool); break;
+  case 'each': params[0] = eachParam(params[0]); break;
+  case 'with': params[0] = shouldDisplay(params[0], identity); break;
+  }
+}
+
 function eachParam(list) {
   let listChange = getKey(list, '[]');
 
diff --git a/packages/ember-htmlbars/lib/hooks/subexpr.js b/packages/ember-htmlbars/lib/hooks/subexpr.js
index 08b61cb1397..d2b45ec28da 100644
--- a/packages/ember-htmlbars/lib/hooks/subexpr.js
+++ b/packages/ember-htmlbars/lib/hooks/subexpr.js
@@ -9,6 +9,7 @@ import {
   labelsFor,
   labelFor
 } from 'ember-metal/streams/utils';
+import { linkParamsFor } from 'ember-htmlbars/hooks/link-render-node';
 
 export default function subexpr(env, scope, helperName, params, hash) {
   // TODO: Keywords and helper invocation should be integrated into
@@ -18,6 +19,8 @@ export default function subexpr(env, scope, helperName, params, hash) {
     return keyword(null, env, scope, params, hash, null, null);
   }
 
+  linkParamsFor(helperName, params);
+
   var label = labelForSubexpr(params, hash, helperName);
   var helper = lookupHelper(helperName, scope.getSelf(), env);