Fixup simplification changes.
Fixup simplification changes.

ember-cli/ember-cli-shims,zeppelin/ember-cli-shims,ember-cli/ember-cli-shims,twokul/ember-cli-shims,twokul/ember-cli-shims,thorsteinsson/ember-cli-shims