Slight macro formatting cleanup.