WIP Escaping is now automatically done at the end.

Refactoring, fixing and completing the tests is in progress.