Unreverting macros.tex, since f2b87c1293fd2f0fa37c821cfcbf56e8ddb166b3 broke the build.