Macros are now concatenated into a single file.