To be really really conscientious - for correctness let's say - I would completely wrap the whole code doing escaping (between the separator comments) with a condition testing only the value of `aria.core.environment.Environment.hasEscapeHtmlByDefault()`. Then i would leave the code as it was before.

Like this: 

```javascript
// Automatic escape ----------------------------------------

if (aria.core.environment.Environment.hasEscapeHtmlByDefault()) {
    // untouched part
}

// end of: automatic escape --------------------------------
```