Also, I think `escapedEndSymbol` is pretty useless, maybe we can just remove it...