Update for to_str->to_string and macro hygiene changes