Part 2 of 2 for CodeMirror library upgrade