Moved macros from plugins/upstream/macros to top-level.