Note where previous analysis said the code was outside a function, and
fix double new-line.  Also, treat end of comment as end of statement.