Better comment parsing, style fixes.