Fix (I hope) a few macros.