Move some definitions out of macros file.