Whitespace and comment cleanups.