Some cleaning up of jshint issues.