Add helper macros for later patches.