Sort the macros and fix typos.