Avoid unsafe String constants in code