The only thing that bugs me about this reformatting is that it adds lots of space to the output.  I really think we should try to put most of the formatting spaces inside #{}, but I know you don't like those forms/conventions.