Fix up some jshint issues. Deal with tests next...