Move the output format macros into the macros.pl mechanism