For SCL-4080 Complete statement
For SCL-5179. ScalaForStatementFixer: removed unnecessary comments.