Move conditional assignment into cljs.
Merge branch 'master' into gh-pages

* master:
  Move conditional assignment into cljs.
Use the simple-optimized version.
Remove out