Whitespace and comment touch-ups.