Add MODULE() info to others as well as add macros.