Rewrite macros to use full-path types. Saves a lot of imports.