For #1694: Comments and indent
For #1694: Fix escaping after last URL