More Codemirror-related cleanup.