Expand macros from the outside in. Closes #66