Comment and whitespace fixes.