Further improvements to macro_atom