replace plain atoms with macros