Fix missed jshint issues

I failed to spot those when I +2ed the last 2 changesets.
A couple of them look like they'd break features.

Bug: 47161
Change-Id: Idc25ba533dc7b3b7415f420e79de732708300714