make macros more macro-like
another fixed macro
another fixed macro