Move in macros from formulas.tex to make it easier to reuse equations as is