Say to always brace do-while loops (Trunk and White)

I don't think this would be controversial, but if it turns out to
be this can be reverted.
Support do-while rebracing in unbrace.

The old code wasn't working anyway because it looked for a parenthesised
expression after the do.
Practice the new orthodoxy and brace do-whiles.