Reverted back tune up changes in codemirror-override.  Will do another pass a bit later