Merge pull request #2047 from stefanpenner/master

cleanup: align es6 (and other coding patterns) with ember's own
improve debug ergonomics (as I debug)

* re-using argument variables makes it quite hard to see the original value, also it has some negative performance side-effects.
* using the comma operator for long variable declarations, especially if they include method invocations makes it impossible to easily set breakpoints.