Fix: expand all of the @@ macros for all types of file