Macro or no, I don't like the above change at all. I think the former is much more readable.
Yah.
this is one of the nasty places indeed. but very often indent causes code to be much more readable. Just not sure if we can just run indent and check things on or if this requires a persevering hand job.
If you want to run indent at all, do it _once_ (with all the right options! See lindent) and fix up the fallout later, whenever you stumble on it -- that's the least-effort way to go about it.
Segher