Currently we have a slew of different macros; we should systematize and unify these where it makes sense.