Minor cleanup.

Change-Id: I49e5deb7ef6f21351878e430f1fd2d928972b0b0