Merge "Cleanup String.<init> handling."