- Use 'remove' instead of 'delete' on maps (as delete is reserved on some
platforms and messes with optimization in closure)
- Code style.