Whitespace and formatting changes; no functional changes intended.