CB-6973: Fix more JSHint errors