Fix jslint issues with var assignments