Fix bug when using "correct_escapes=no".  Closes #842
Use correct comments