Escape some more strings correctly.
Make interfaces use our Class syntax.