JSHint: fix the last jslint/hint failures

Change-Id: I3695d0da964ee607d91510c490793aca1ace5d58