String: refactor in prep for 4.3

Change-Id: I211aae2881789416eff973db15a5cfcf84db0345