Unravelling the macros

Unravelling the macros