Fix breakage introduced in PEP8 cleanup

Change bad98d8d71441121cec62a5c0d5b1fe1eca0dc5e accidentally turned
values into tuples.

Change-Id: I05e278a6892d8990c7388b368d6366b085810031