Minor code simplification.

Change-Id: 36dc36385c