White space cleanup, including one item that was an error under -tt.