Minor cleanup.

BugzId: 3074