Simpler and/or more efficient String handling

Change-Id: Ib46973c7f67ea8345ac13d347bed0febeae43780