Move more macros to the macro section