Minor cleanup.

Change-Id: I8626c945578144d66bae4a32f2ea40a3f224f4c0