Make these macros a little less specific.