Hygiene: Avoid string concatenation

Change-Id: I6db8e8dfd2d6f33e84dc008d3217b3f2743af802