Fixed formatting of strings including comments '--' (#335).
Fixed formatting of `until` statements (fixes #335).