String cleanups.

Change-Id: Ibebf394d69ed4845d91176727f291187ba35ed34