Clean up #1779.

The unicode literals are a time bomb, let's just be rid of them.