Smoke test rewrite; jshint updates