Whitespace and comment tweaks, no functional changes.