Can't this be corrected in upstream Scintilla?  (given it isn't already)