Handling ... and more starting lines (not comments) + tests