jslint-driven fixes