Revise r8309 to use \- rather than - when trying to emit a literal U+002D;