Big Whitespace Fix.

Also some minor code style things — adding braces, etc.  But mostly
converting line indentations from spaces to tabs, most of which have
crept in via pull requests.