Get rid of `str` calls

Change-Id: I7e178bdf72cd03bafd2990933f06e8c05290283b