More CodeMirror integration. Slight cleanup.