NEON-1251: Cleaning up some general jshint/code style issues.