Better handling of commented lines.