Merge change 4084

* changes:
  Handle end-of-file inside of comments, local declarations.