Reformat for readability.
More idiomatic code for group macro.