copy some of Gyuris modifications back into our fork of haxe