improve macro hygiene (#271)

9 jobs for master in 19 minutes and 51 seconds (queued for 2 seconds)