More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a.

Change-Id: Id936946375d2be56ba10bf3aa5804f52cdbecc2d
1 file changed