Stop using macros.
Fix crazy spacing.