Port to Haxe 2.11