Handle comments in source texts correctly