NEON-12:30: More jshint cleanup