Avoid uses of magic constants in closure.

Change-Id: I4449862cc295d0da8fb732bb0378873d53232d7d