TemplateLiterals should normalize <CR> and <CR><LF> to <LF>

Fixes #1102
This should go away in rebase...