Switch the 'add member to group' activity from showing the group to showing the people added to the group, make the macros that render that available to all macro's by pulling them out into separate macros.