Handle comments better.