Misc code hygiene

Fix some of the warnings reported by jshint.