More reformatting.

XXX BTW why doesn't github code view handle TABs? Silly...