Move duplicate macros to macros.tex so the whole thing compiles