Small cleanup.
Keep macro definitions together.