Whitespace and comment fixes.