Changes for non-capturing macros and to_str changes