This leaves issues that involve actual logic changes unresolved. It also raises an issue with the `Map` class, which is defined in ES6, and so will have to be renamed.