DRY up macros a little bit

Might also speed up compilation by a bit.