ESLint detection of `guard-for-in` errors got better somewhere between
version 4.12.0 and 4.19.1.
This change corrects a few lint errors that may have otherwise
eventually blocked changes on lint CI.
Change-Id: Ieda10dcb68911f64c8689af4ebb9f4e9584caad8