String cleanups.

Change-Id: Ia4a9630822678a7b9ea6e5af87e58cfd0ebacff3