More radical cleanup of the jshint errors