Handle macro_rules! tokens consistently across crates
#73569
Merged
macro_rules! tokens consistently across crates
#73569