Updating to scintilla 3.4.4 and implementing Neil's suggestions from http://permalink.gmane.org/gmane.comp.lib.scintilla.devel/12733