Fix up r45749: do is_string() check in the caller instead