Some more jshiint cleanup.