Hygiene: Don't reach through objects

Just take the object you want in the first place.

Change-Id: I8282dcc5a51ecc343af95881c97775c857969491
Merge "Hygiene: Don't reach through objects"