Pre-expand macro to avoid cryptic errors