More consistent macros