Better layout for core macros with paired bodies