More Haxe 3.1.0 stuff.