Factored out macro definitions to macros.tex