Minor cleanups.

Change-Id: If08c19b42a189bde53821f3f0f19712683c1748d