Maybe I had the control character thing wrong after all
going through the TODOs
Account for another piece of parser output