Move some macros to OFMacros.h.