Fix improper handling of concatenating strings with non-strings