Remove/add some escaping code. Closes #57